X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Ffiles-cache%2Fvideos-caption-cache.ts;h=58e2260b63bff999749ffe75b4fe6bc80a1a01e5;hb=3329325a64c21067a598ea42a5c7eb0c489aedea;hp=440c3fde81c2de19c4c763ad0d217e659e4ca4f0;hpb=97567dd81f508dd6295ac4d73d849aa2ce0a6549;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/lib/files-cache/videos-caption-cache.ts b/server/lib/files-cache/videos-caption-cache.ts
index 440c3fde8..58e2260b6 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 { fetchRemoteVideoStaticFile } from '../activitypub'
-
-type GetPathParam = { videoId: string, language: string }
 
-class VideosCaptionCache extends AbstractVideoStaticFileCache <GetPathParam> {
+class VideosCaptionCache extends AbstractVideoStaticFileCache <string> {
 
-  private static readonly KEY_DELIMITER = '%'
   private static instance: VideosCaptionCache
 
   private constructor () {
@@ -22,35 +18,30 @@ 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
 
-    // FIXME: use URL
-    const remoteStaticPath = videoCaption.getCaptionStaticPath()
-    const destPath = join(FILES_CACHE.VIDEO_CAPTIONS.DIRECTORY, videoCaption.getCaptionName())
+    const remoteUrl = videoCaption.getFileUrl(video)
+    const destPath = join(FILES_CACHE.VIDEO_CAPTIONS.DIRECTORY, videoCaption.filename)
 
-    await fetchRemoteVideoStaticFile(video, remoteStaticPath, destPath)
+    await doRequestAndSaveToFile(remoteUrl, destPath)
 
     return { isOwned: false, path: destPath }
   }