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 1908cfb06f12959c117ab84327aeb53a125bee34..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,8 +1,8 @@
 import { remove } from 'fs-extra'
 import { logger } from '../../helpers/logger'
-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> {
 
@@ -18,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 }))