Generate a name for caption files

[github/Chocobozzz/PeerTube.git] / server / helpers / captions-utils.ts

diff --git a/server/helpers/captions-utils.ts b/server/helpers/captions-utils.ts
index 20c9fe5aa436efb48cb45128c1c97ec9f2d0c1f5..401f2fb7b236cb4e7b177adfc31f1c380c6c34b3 100644 (file)
--- a/server/helpers/captions-utils.ts
+++ b/server/helpers/captions-utils.ts
@@ -1,24 +1,23 @@
-import { renamePromise, unlinkPromise } from './core-utils'
+import { createReadStream, createWriteStream, move, remove } from 'fs-extra'
 import { join } from 'path'
-import { CONFIG } from '../initializers'
-import { VideoCaptionModel } from '../models/video/video-caption'
 import * as srt2vtt from 'srt-to-vtt'
-import { createReadStream, createWriteStream } from 'fs-extra'
+import { MVideoCaption } from '@server/types/models'
+import { CONFIG } from '../initializers/config'
 
-async function moveAndProcessCaptionFile (physicalFile: { filename: string, path: string }, videoCaption: VideoCaptionModel) {
+async function moveAndProcessCaptionFile (physicalFile: { filename: string, path: string }, videoCaption: MVideoCaption) {
   const videoCaptionsDir = CONFIG.STORAGE.CAPTIONS_DIR
-  const destination = join(videoCaptionsDir, videoCaption.getCaptionName())
+  const destination = join(videoCaptionsDir, videoCaption.filename)
 
   // Convert this srt file to vtt
   if (physicalFile.path.endsWith('.srt')) {
     await convertSrtToVtt(physicalFile.path, destination)
-    await unlinkPromise(physicalFile.path)
-  } else { // Just move the vtt file
-    await renamePromise(physicalFile.path, destination)
+    await remove(physicalFile.path)
+  } else if (physicalFile.path !== destination) { // Just move the vtt file
+    await move(physicalFile.path, destination, { overwrite: true })
   }
 
   // This is important in case if there is another attempt in the retry process
-  physicalFile.filename = videoCaption.getCaptionName()
+  physicalFile.filename = videoCaption.filename
   physicalFile.path = destination
 }
 
@@ -31,7 +30,7 @@ export {
 // ---------------------------------------------------------------------------
 
 function convertSrtToVtt (source: string, destination: string) {
-  return new Promise((res, rej) => {
+  return new Promise<void>((res, rej) => {
     const file = createReadStream(source)
     const converter = srt2vtt()
     const writer = createWriteStream(destination)