diff options
author | Chocobozzz <me@florianbigard.com> | 2019-12-03 10:10:14 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2019-12-03 10:10:14 +0100 |
commit | 3f6b7aa1cfa28ee02eec8c8ab16b623f2bbab928 (patch) | |
tree | 9c0c0c5271ad25b943bfbefe83cb9ab8227e23f5 /server | |
parent | 63472d88d1a319405752873dfc8d809d28cde583 (diff) | |
download | PeerTube-3f6b7aa1cfa28ee02eec8c8ab16b623f2bbab928.tar.gz PeerTube-3f6b7aa1cfa28ee02eec8c8ab16b623f2bbab928.tar.zst PeerTube-3f6b7aa1cfa28ee02eec8c8ab16b623f2bbab928.zip |
Don't move the caption if it has the right name
Diffstat (limited to 'server')
-rw-r--r-- | server/controllers/api/videos/index.ts | 4 | ||||
-rw-r--r-- | server/helpers/captions-utils.ts | 2 |
2 files changed, 3 insertions, 3 deletions
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 @@ | |||
1 | import * as express from 'express' | 1 | import * as express from 'express' |
2 | import { extname, join } from 'path' | 2 | import { extname } from 'path' |
3 | import { VideoCreate, VideoPrivacy, VideoState, VideoUpdate } from '../../../../shared' | 3 | import { VideoCreate, VideoPrivacy, VideoState, VideoUpdate } from '../../../../shared' |
4 | import { getVideoFileFPS, getVideoFileResolution } from '../../../helpers/ffmpeg-utils' | 4 | import { getVideoFileFPS, getVideoFileResolution } from '../../../helpers/ffmpeg-utils' |
5 | import { logger } from '../../../helpers/logger' | 5 | import { logger } from '../../../helpers/logger' |
@@ -65,7 +65,7 @@ import { VideoTranscodingPayload } from '../../../lib/job-queue/handlers/video-t | |||
65 | import { Hooks } from '../../../lib/plugins/hooks' | 65 | import { Hooks } from '../../../lib/plugins/hooks' |
66 | import { MVideoDetails, MVideoFullLight } from '@server/typings/models' | 66 | import { MVideoDetails, MVideoFullLight } from '@server/typings/models' |
67 | import { createTorrentAndSetInfoHash } from '@server/helpers/webtorrent' | 67 | import { createTorrentAndSetInfoHash } from '@server/helpers/webtorrent' |
68 | import { getVideoFilename, getVideoFilePath } from '@server/lib/video-paths' | 68 | import { getVideoFilePath } from '@server/lib/video-paths' |
69 | 69 | ||
70 | const auditLogger = auditLoggerFactory('videos') | 70 | const auditLogger = auditLoggerFactory('videos') |
71 | const videosRouter = express.Router() | 71 | 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 | |||
12 | if (physicalFile.path.endsWith('.srt')) { | 12 | if (physicalFile.path.endsWith('.srt')) { |
13 | await convertSrtToVtt(physicalFile.path, destination) | 13 | await convertSrtToVtt(physicalFile.path, destination) |
14 | await remove(physicalFile.path) | 14 | await remove(physicalFile.path) |
15 | } else { // Just move the vtt file | 15 | } else if (physicalFile.path !== destination) { // Just move the vtt file |
16 | await move(physicalFile.path, destination, { overwrite: true }) | 16 | await move(physicalFile.path, destination, { overwrite: true }) |
17 | } | 17 | } |
18 | 18 | ||