Merge remote-tracking branch 'weblate/develop' into develop

[github/Chocobozzz/PeerTube.git] / server / lib / files-cache / abstract-video-static-file-cache.ts

diff --git a/server/lib/files-cache/abstract-video-static-file-cache.ts b/server/lib/files-cache/abstract-video-static-file-cache.ts
index 84ed74c988d33fd41927e154ca05674bf35b5eb0..a7ac88525c80be00d6d7616e7607f8f195b914f6 100644 (file)
--- a/server/lib/files-cache/abstract-video-static-file-cache.ts
+++ b/server/lib/files-cache/abstract-video-static-file-cache.ts
@@ -1,10 +1,8 @@
-import { createWriteStream, remove } from 'fs-extra'
+import { remove } from 'fs-extra'
 import { logger } from '../../helpers/logger'
-import { VideoModel } from '../../models/video/video'
-import { fetchRemoteVideoStaticFile } from '../activitypub'
-import * as memoizee from 'memoizee'
+import memoizee from 'memoizee'
 
-type GetFilePathResult = { isOwned: boolean, path: string } | undefined
+type GetFilePathResult = { isOwned: boolean, path: string, downloadName?: string } | undefined
 
 export abstract class AbstractVideoStaticFileCache <T> {
 
@@ -20,8 +18,8 @@ export abstract class AbstractVideoStaticFileCache <T> {
       maxAge,
       max,
       promise: true,
-      dispose: (result: GetFilePathResult) => {
-        if (result.isOwned !== true) {
+      dispose: (result?: GetFilePathResult) => {
+        if (result && result.isOwned !== true) {
           remove(result.path)
             .then(() => logger.debug('%s removed from %s', result.path, this.constructor.name))
             .catch(err => logger.error('Cannot remove %s from cache %s.', result.path, this.constructor.name, { err }))
@@ -29,16 +27,4 @@ export abstract class AbstractVideoStaticFileCache <T> {
       }
     })
   }
-
-  protected saveRemoteVideoFileAndReturnPath (video: VideoModel, remoteStaticPath: string, destPath: string) {
-    return new Promise<string>((res, rej) => {
-      const req = fetchRemoteVideoStaticFile(video, remoteStaticPath, rej)
-
-      const stream = createWriteStream(destPath)
-
-      req.pipe(stream)
-         .on('error', (err) => rej(err))
-         .on('finish', () => res(destPath))
-    })
-  }
 }