X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Fcaptions-utils.ts;h=0dad23759b1090a34eb00c2c465083e69f51799c;hb=c6c0fa6cd8fe8f752463d8982c3dbcd448739c4e;hp=2830ae01776a3cef82883f302d2510a32ea26f9e;hpb=1ca9f7c3f7afac2af4c4c25b98426731f7e789c6;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/helpers/captions-utils.ts b/server/helpers/captions-utils.ts index 2830ae017..0dad23759 100644 --- a/server/helpers/captions-utils.ts +++ b/server/helpers/captions-utils.ts @@ -2,7 +2,7 @@ import { join } from 'path' import { CONFIG } from '../initializers/config' import * as srt2vtt from 'srt-to-vtt' import { createReadStream, createWriteStream, move, remove } from 'fs-extra' -import { MVideoCaptionFormattable } from '@server/typings/models' +import { MVideoCaptionFormattable } from '@server/types/models' async function moveAndProcessCaptionFile (physicalFile: { filename: string, path: string }, videoCaption: MVideoCaptionFormattable) { const videoCaptionsDir = CONFIG.STORAGE.CAPTIONS_DIR @@ -12,7 +12,7 @@ async function moveAndProcessCaptionFile (physicalFile: { filename: string, path if (physicalFile.path.endsWith('.srt')) { await convertSrtToVtt(physicalFile.path, destination) await remove(physicalFile.path) - } else { // Just move the vtt file + } else if (physicalFile.path !== destination) { // Just move the vtt file await move(physicalFile.path, destination, { overwrite: true }) }