X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Ffiles-cache%2Fvideos-preview-cache.ts;h=48d2cb52cf4a1df62bef174ba3bf81fbd83c812b;hb=60b880acdfa85eab5c9ec09ba1283f82ae58ec85;hp=dd3a84aca60a7c8fe5d0dbf7c6a3676bea57d3aa;hpb=dc48fdbe68e9dd3a3a6028181e61d8595d98e654;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/lib/files-cache/videos-preview-cache.ts b/server/lib/files-cache/videos-preview-cache.ts index dd3a84aca..48d2cb52c 100644 --- a/server/lib/files-cache/videos-preview-cache.ts +++ b/server/lib/files-cache/videos-preview-cache.ts @@ -30,20 +30,26 @@ class VideosPreviewCache extends AbstractVideoStaticFileCache { // Key is the video UUID protected async loadRemoteFile (key: string) { - const video = await VideoModel.loadAndPopulateAccountAndServerAndTags(key) + const video = await VideoModel.loadFull(key) if (!video) return undefined if (video.isOwned()) throw new Error('Cannot load remote preview of owned video.') const preview = video.getPreview() const destPath = join(FILES_CACHE.PREVIEWS.DIRECTORY, preview.filename) - const remoteUrl = preview.getFileUrl(video) - await doRequestAndSaveToFile(remoteUrl, destPath) - logger.debug('Fetched remote preview %s to %s.', remoteUrl, destPath) + try { + await doRequestAndSaveToFile(remoteUrl, destPath) + + logger.debug('Fetched remote preview %s to %s.', remoteUrl, destPath) + + return { isOwned: false, path: destPath } + } catch (err) { + logger.info('Cannot fetch remote preview file %s.', remoteUrl, { err }) - return { isOwned: false, path: destPath } + return undefined + } } }