Generate a name for caption files

5 files changed, 33 insertions, 24 deletions

diff --git a/server/lib/activitypub/playlist.ts b/server/lib/activitypub/playlist.ts
index 8b54a001a..53298e968 100644
--- a/server/lib/activitypub/playlist.ts
+++ b/server/lib/activitypub/playlist.ts
@@ -99,8 +99,6 @@ async function createOrUpdateVideoPlaylist (playlistObject: PlaylistObject, byAc
     return Promise.resolve()
   })
 
-  logger.info('toto', { playlist, id: playlist.id })
-
   const refreshedPlaylist = await VideoPlaylistModel.loadWithAccountAndChannel(playlist.id, null)
 
   if (playlistObject.icon) {
diff --git a/server/lib/activitypub/videos.ts b/server/lib/activitypub/videos.ts
index b5a199e67..201ef0302 100644
--- a/server/lib/activitypub/videos.ts
+++ b/server/lib/activitypub/videos.ts
@@ -56,6 +56,7 @@ import {
   MVideoAccountLightBlacklistAllFiles,
   MVideoAP,
   MVideoAPWithoutCaption,
+  MVideoCaption,
   MVideoFile,
   MVideoFullLight,
   MVideoId,
@@ -90,7 +91,7 @@ async function federateVideoIfNeeded (videoArg: MVideoAPWithoutCaption, isNewVid
     // Fetch more attributes that we will need to serialize in AP object
     if (isArray(video.VideoCaptions) === false) {
       video.VideoCaptions = await video.$get('VideoCaptions', {
-        attributes: [ 'language' ],
+        attributes: [ 'filename', 'language' ],
         transaction
       })
     }
@@ -423,7 +424,14 @@ async function updateVideoFromAP (options: {
         await VideoCaptionModel.deleteAllCaptionsOfRemoteVideo(videoUpdated.id, t)
 
         const videoCaptionsPromises = videoObject.subtitleLanguage.map(c => {
-          return VideoCaptionModel.insertOrReplaceLanguage(videoUpdated.id, c.identifier, c.url, t)
+          const caption = new VideoCaptionModel({
+            videoId: videoUpdated.id,
+            filename: VideoCaptionModel.generateCaptionName(c.identifier),
+            language: c.identifier,
+            fileUrl: c.url
+          }) as MVideoCaption
+
+          return VideoCaptionModel.insertOrReplaceLanguage(caption, t)
         })
         await Promise.all(videoCaptionsPromises)
       }
@@ -629,7 +637,14 @@ async function createVideo (videoObject: VideoObject, channel: MChannelAccountLi
 
     // Process captions
     const videoCaptionsPromises = videoObject.subtitleLanguage.map(c => {
-      return VideoCaptionModel.insertOrReplaceLanguage(videoCreated.id, c.identifier, c.url, t)
+      const caption = new VideoCaptionModel({
+        videoId: videoCreated.id,
+        filename: VideoCaptionModel.generateCaptionName(c.identifier),
+        language: c.identifier,
+        fileUrl: c.url
+      }) as MVideoCaption
+
+      return VideoCaptionModel.insertOrReplaceLanguage(caption, t)
     })
     await Promise.all(videoCaptionsPromises)
 
diff --git a/server/lib/files-cache/videos-caption-cache.ts b/server/lib/files-cache/videos-caption-cache.ts
index 26ab3bd0d..ee0447010 100644
--- a/server/lib/files-cache/videos-caption-cache.ts
+++ b/server/lib/files-cache/videos-caption-cache.ts
@@ -1,17 +1,13 @@
 import { join } from 'path'
+import { doRequestAndSaveToFile } from '@server/helpers/requests'
+import { CONFIG } from '../../initializers/config'
 import { FILES_CACHE } from '../../initializers/constants'
 import { VideoModel } from '../../models/video/video'
 import { VideoCaptionModel } from '../../models/video/video-caption'
 import { AbstractVideoStaticFileCache } from './abstract-video-static-file-cache'
-import { CONFIG } from '../../initializers/config'
-import { logger } from '../../helpers/logger'
-import { doRequestAndSaveToFile } from '@server/helpers/requests'
 
-type GetPathParam = { videoId: string, language: string }
+class VideosCaptionCache extends AbstractVideoStaticFileCache <string> {
 
-class VideosCaptionCache extends AbstractVideoStaticFileCache <GetPathParam> {
-
-  private static readonly KEY_DELIMITER = '%'
   private static instance: VideosCaptionCache
 
   private constructor () {
@@ -22,32 +18,28 @@ class VideosCaptionCache extends AbstractVideoStaticFileCache <GetPathParam> {
     return this.instance || (this.instance = new this())
   }
 
-  async getFilePathImpl (params: GetPathParam) {
-    const videoCaption = await VideoCaptionModel.loadByVideoIdAndLanguage(params.videoId, params.language)
+  async getFilePathImpl (filename: string) {
+    const videoCaption = await VideoCaptionModel.loadWithVideoByFilename(filename)
     if (!videoCaption) return undefined
 
-    if (videoCaption.isOwned()) return { isOwned: true, path: join(CONFIG.STORAGE.CAPTIONS_DIR, videoCaption.getCaptionName()) }
+    if (videoCaption.isOwned()) return { isOwned: true, path: join(CONFIG.STORAGE.CAPTIONS_DIR, videoCaption.filename) }
 
-    const key = params.videoId + VideosCaptionCache.KEY_DELIMITER + params.language
-    return this.loadRemoteFile(key)
+    return this.loadRemoteFile(filename)
   }
 
+  // Key is the caption filename
   protected async loadRemoteFile (key: string) {
-    logger.debug('Loading remote caption file %s.', key)
-
-    const [ videoId, language ] = key.split(VideosCaptionCache.KEY_DELIMITER)
-
-    const videoCaption = await VideoCaptionModel.loadByVideoIdAndLanguage(videoId, language)
+    const videoCaption = await VideoCaptionModel.loadWithVideoByFilename(key)
     if (!videoCaption) return undefined
 
     if (videoCaption.isOwned()) throw new Error('Cannot load remote caption of owned video.')
 
     // Used to fetch the path
-    const video = await VideoModel.loadAndPopulateAccountAndServerAndTags(videoId)
+    const video = await VideoModel.loadAndPopulateAccountAndServerAndTags(videoCaption.videoId)
     if (!video) return undefined
 
     const remoteUrl = videoCaption.getFileUrl(video)
-    const destPath = join(FILES_CACHE.VIDEO_CAPTIONS.DIRECTORY, videoCaption.getCaptionName())
+    const destPath = join(FILES_CACHE.VIDEO_CAPTIONS.DIRECTORY, videoCaption.filename)
 
     await doRequestAndSaveToFile({ uri: remoteUrl }, destPath)
 
diff --git a/server/lib/files-cache/videos-preview-cache.ts b/server/lib/files-cache/videos-preview-cache.ts
index 51146d718..47488da74 100644
--- a/server/lib/files-cache/videos-preview-cache.ts
+++ b/server/lib/files-cache/videos-preview-cache.ts
@@ -28,6 +28,7 @@ class VideosPreviewCache extends AbstractVideoStaticFileCache <string> {
     return this.loadRemoteFile(thumbnail.Video.uuid)
   }
 
+  // Key is the video UUID
   protected async loadRemoteFile (key: string) {
     const video = await VideoModel.loadAndPopulateAccountAndServerAndTags(key)
     if (!video) return undefined
diff --git a/server/lib/thumbnail.ts b/server/lib/thumbnail.ts
index 740b83acb..33aa7159c 100644
--- a/server/lib/thumbnail.ts
+++ b/server/lib/thumbnail.ts
@@ -166,6 +166,9 @@ async function createThumbnailFromFunction (parameters: {
 }) {
   const { thumbnailCreator, filename, width, height, type, existingThumbnail, automaticallyGenerated = null, fileUrl = null } = parameters
 
+  // Remove old file
+  if (existingThumbnail) await existingThumbnail.removeThumbnail()
+
   const thumbnail = existingThumbnail || new ThumbnailModel()
 
   thumbnail.filename = filename