Merge branch 'develop' of https://github.com/Chocobozzz/PeerTube into move-utils...

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

diff --git a/server/helpers/captions-utils.ts b/server/helpers/captions-utils.ts
index 8b04f878d1273b079ab1860bf83348e2ee8efdf6..660dce65c3c5c0292dd3e680775c3356542300a7 100644 (file)
--- a/server/helpers/captions-utils.ts
+++ b/server/helpers/captions-utils.ts
@@ -1,9 +1,8 @@
-import { renamePromise, unlinkPromise } from './core-utils'
 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'
+import { createReadStream, createWriteStream, remove, rename } from 'fs-extra'
 
 async function moveAndProcessCaptionFile (physicalFile: { filename: string, path: string }, videoCaption: VideoCaptionModel) {
   const videoCaptionsDir = CONFIG.STORAGE.CAPTIONS_DIR
@@ -12,9 +11,9 @@ async function moveAndProcessCaptionFile (physicalFile: { filename: string, path
   // Convert this srt file to vtt
   if (physicalFile.path.endsWith('.srt')) {
     await convertSrtToVtt(physicalFile.path, destination)
-    await unlinkPromise(physicalFile.path)
+    await remove(physicalFile.path)
   } else { // Just move the vtt file
-    await renamePromise(physicalFile.path, destination)
+    await rename(physicalFile.path, destination)
   }
 
   // This is important in case if there is another attempt in the retry process