1 files changed, 50 insertions, 41 deletions

diff --git a/scripts/optimize-old-videos.ts b/scripts/optimize-old-videos.ts
index 9e66105dd..245e4cf28 100644
--- a/scripts/optimize-old-videos.ts
+++ b/scripts/optimize-old-videos.ts
@@ -1,15 +1,18 @@
 import { registerTSPaths } from '../server/helpers/register-ts-paths'
 registerTSPaths()
 
-import { getDurationFromVideoFile, getVideoFileBitrate, getVideoFileFPS, getVideoFileResolution } from '../server/helpers/ffprobe-utils'
-import { VideoModel } from '../server/models/video/video'
-import { optimizeOriginalVideofile } from '../server/lib/transcoding/video-transcoding'
-import { initDatabaseModels } from '../server/initializers/database'
-import { basename, dirname } from 'path'
 import { copy, move, remove } from 'fs-extra'
+import { basename, dirname } from 'path'
 import { createTorrentAndSetInfoHash } from '@server/helpers/webtorrent'
-import { getVideoFilePath } from '@server/lib/video-paths'
+import { CONFIG } from '@server/initializers/config'
+import { processMoveToObjectStorage } from '@server/lib/job-queue/handlers/move-to-object-storage'
+import { VideoPathManager } from '@server/lib/video-path-manager'
 import { getMaxBitrate } from '@shared/core-utils'
+import { MoveObjectStoragePayload } from '@shared/models'
+import { getDurationFromVideoFile, getVideoFileBitrate, getVideoFileFPS, getVideoFileResolution } from '../server/helpers/ffprobe-utils'
+import { initDatabaseModels } from '../server/initializers/database'
+import { optimizeOriginalVideofile } from '../server/lib/transcoding/video-transcoding'
+import { VideoModel } from '../server/models/video/video'
 
 run()
   .then(() => process.exit(0))
@@ -39,43 +42,49 @@ async function run () {
     currentVideoId = video.id
 
     for (const file of video.VideoFiles) {
-      currentFilePath = getVideoFilePath(video, file)
-
-      const [ videoBitrate, fps, dataResolution ] = await Promise.all([
-        getVideoFileBitrate(currentFilePath),
-        getVideoFileFPS(currentFilePath),
-        getVideoFileResolution(currentFilePath)
-      ])
-
-      const maxBitrate = getMaxBitrate({ ...dataResolution, fps })
-      const isMaxBitrateExceeded = videoBitrate > maxBitrate
-      if (isMaxBitrateExceeded) {
-        console.log(
-          'Optimizing video file %s with bitrate %s kbps (max: %s kbps)',
-          basename(currentFilePath), videoBitrate / 1000, maxBitrate / 1000
-        )
-
-        const backupFile = `${currentFilePath}_backup`
-        await copy(currentFilePath, backupFile)
-
-        await optimizeOriginalVideofile(video, file)
-        // Update file path, the video filename changed
-        currentFilePath = getVideoFilePath(video, file)
-
-        const originalDuration = await getDurationFromVideoFile(backupFile)
-        const newDuration = await getDurationFromVideoFile(currentFilePath)
-
-        if (originalDuration === newDuration) {
-          console.log('Finished optimizing %s', basename(currentFilePath))
-          await remove(backupFile)
-          continue
+      await VideoPathManager.Instance.makeAvailableVideoFile(video, file, async path => {
+        currentFilePath = path
+
+        const [ videoBitrate, fps, dataResolution ] = await Promise.all([
+          getVideoFileBitrate(currentFilePath),
+          getVideoFileFPS(currentFilePath),
+          getVideoFileResolution(currentFilePath)
+        ])
+
+        const maxBitrate = getMaxBitrate({ ...dataResolution, fps })
+        const isMaxBitrateExceeded = videoBitrate > maxBitrate
+        if (isMaxBitrateExceeded) {
+          console.log(
+            'Optimizing video file %s with bitrate %s kbps (max: %s kbps)',
+            basename(currentFilePath), videoBitrate / 1000, maxBitrate / 1000
+          )
+
+          const backupFile = `${currentFilePath}_backup`
+          await copy(currentFilePath, backupFile)
+
+          await optimizeOriginalVideofile(video, file)
+          // Update file path, the video filename changed
+          currentFilePath = VideoPathManager.Instance.getFSVideoFileOutputPath(video, file)
+
+          const originalDuration = await getDurationFromVideoFile(backupFile)
+          const newDuration = await getDurationFromVideoFile(currentFilePath)
+
+          if (originalDuration === newDuration) {
+            console.log('Finished optimizing %s', basename(currentFilePath))
+            await remove(backupFile)
+            return
+          }
+
+          console.log('Failed to optimize %s, restoring original', basename(currentFilePath))
+          await move(backupFile, currentFilePath, { overwrite: true })
+          await createTorrentAndSetInfoHash(video, file)
+          await file.save()
         }
+      })
+    }
 
-        console.log('Failed to optimize %s, restoring original', basename(currentFilePath))
-        await move(backupFile, currentFilePath, { overwrite: true })
-        await createTorrentAndSetInfoHash(video, file)
-        await file.save()
-      }
+    if (CONFIG.OBJECT_STORAGE.ENABLED === true) {
+      await processMoveToObjectStorage({ data: { videoUUID: video.uuid } as MoveObjectStoragePayload } as any)
     }
   }