From: Chocobozzz <me@florianbigard.com>
Date: Tue, 3 Dec 2019 09:10:14 +0000 (+0100)
Subject: Don't move the caption if it has the right name
X-Git-Tag: v2.1.0-rc.1~284
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3f6b7aa1cfa28ee02eec8c8ab16b623f2bbab928;p=oweals%2Fpeertube.git

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

diff --git a/server/controllers/api/videos/index.ts b/server/controllers/api/videos/index.ts
index 78948ff24..337795541 100644
--- a/server/controllers/api/videos/index.ts
+++ b/server/controllers/api/videos/index.ts
@@ -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()
diff --git a/server/helpers/captions-utils.ts b/server/helpers/captions-utils.ts
index 2830ae017..73b6d166d 100644
--- a/server/helpers/captions-utils.ts
+++ b/server/helpers/captions-utils.ts
@@ -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 })
   }