X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Fcaptions-utils.ts;h=7174d4654ab9208a7fc0c93057c09e2060df3ef0;hb=b6a1dd4d1b3b0032f8b968e72cbd074f646e8827;hp=8b04f878d1273b079ab1860bf83348e2ee8efdf6;hpb=f4001cf408a99049d01a356bfb20a62342de06ea;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/helpers/captions-utils.ts b/server/helpers/captions-utils.ts index 8b04f878d..7174d4654 100644 --- 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 { CONFIG } from '../initializers/config' import { VideoCaptionModel } from '../models/video/video-caption' import * as srt2vtt from 'srt-to-vtt' -import { createReadStream, createWriteStream } from 'fs' +import { createReadStream, createWriteStream, remove, move } 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 move(physicalFile.path, destination, { overwrite: true }) } // This is important in case if there is another attempt in the retry process