X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Fcache%2Fvideos-preview-cache.ts;h=ea959076d88c7614b0e4e7dac4f981029bf1eea0;hb=d50acfab69ce9e05b272dea6c4d34d52960ba14c;hp=c5bda8dd894e699471bfc50765db882f0c388555;hpb=3fd3ab2d34d512b160a5e6084d7609be7b4f4452;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/lib/cache/videos-preview-cache.ts b/server/lib/cache/videos-preview-cache.ts
index c5bda8dd8..ea959076d 100644
--- a/server/lib/cache/videos-preview-cache.ts
+++ b/server/lib/cache/videos-preview-cache.ts
@@ -33,7 +33,12 @@ class VideosPreviewCache {
     })
   }
 
-  getPreviewPath (key: string) {
+  async getPreviewPath (key: string) {
+    const video = await VideoModel.loadByUUID(key)
+    if (!video) return undefined
+
+    if (video.isOwned()) return join(CONFIG.STORAGE.PREVIEWS_DIR, video.getPreviewName())
+
     return new Promise<string>((res, rej) => {
       this.lru.get(key, (err, value) => {
         err ? rej(err) : res(value)
@@ -45,23 +50,21 @@ class VideosPreviewCache {
     const video = await VideoModel.loadByUUIDAndPopulateAccountAndServerAndTags(key)
     if (!video) return undefined
 
-    if (video.isOwned()) return join(CONFIG.STORAGE.PREVIEWS_DIR, video.getPreviewName())
-
-    const res = await this.saveRemotePreviewAndReturnPath(video)
+    if (video.isOwned()) throw new Error('Cannot load preview of owned video.')
 
-    return res
+    return this.saveRemotePreviewAndReturnPath(video)
   }
 
   private saveRemotePreviewAndReturnPath (video: VideoModel) {
-    const req = fetchRemoteVideoPreview(video)
 
     return new Promise<string>((res, rej) => {
+      const req = fetchRemoteVideoPreview(video, rej)
       const path = join(CACHE.DIRECTORIES.PREVIEWS, video.getPreviewName())
       const stream = createWriteStream(path)
 
       req.pipe(stream)
-         .on('finish', () => res(path))
-         .on('error', (err) => rej(err))
+        .on('error', (err) => rej(err))
+        .on('finish', () => res(path))
     })
   }
 }