Don't move the caption if it has the right name

pull/2301/head
Chocobozzz 2019-12-03 10:10:14 +01:00
parent 63472d88d1
commit 3f6b7aa1cf
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 3 additions and 3 deletions

View File

@ -1,5 +1,5 @@
import * as express from 'express'
import { extname, join } from 'path'
import { extname } from 'path'
import { VideoCreate, VideoPrivacy, VideoState, VideoUpdate } from '../../../../shared'
import { getVideoFileFPS, getVideoFileResolution } from '../../../helpers/ffmpeg-utils'
import { logger } from '../../../helpers/logger'
@ -65,7 +65,7 @@ import { VideoTranscodingPayload } from '../../../lib/job-queue/handlers/video-t
import { Hooks } from '../../../lib/plugins/hooks'
import { MVideoDetails, MVideoFullLight } from '@server/typings/models'
import { createTorrentAndSetInfoHash } from '@server/helpers/webtorrent'
import { getVideoFilename, getVideoFilePath } from '@server/lib/video-paths'
import { getVideoFilePath } from '@server/lib/video-paths'
const auditLogger = auditLoggerFactory('videos')
const videosRouter = express.Router()

View File

@ -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 })
}