From 9f1ddd249652c1e35b45db33885a00a005f9b059 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 8 Oct 2018 16:50:56 +0200 Subject: Change a little bit optimize-old-videos logic --- server/lib/video-transcoding.ts | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'server/lib') diff --git a/server/lib/video-transcoding.ts b/server/lib/video-transcoding.ts index 04cadf74b..a78de61e5 100644 --- a/server/lib/video-transcoding.ts +++ b/server/lib/video-transcoding.ts @@ -1,5 +1,5 @@ import { CONFIG } from '../initializers' -import { join, extname, basename } from 'path' +import { extname, join } from 'path' import { getVideoFileFPS, getVideoFileResolution, transcode } from '../helpers/ffmpeg-utils' import { copy, remove, rename, stat } from 'fs-extra' import { logger } from '../helpers/logger' @@ -7,16 +7,12 @@ import { VideoResolution } from '../../shared/models/videos' import { VideoFileModel } from '../models/video/video-file' import { VideoModel } from '../models/video/video' -async function optimizeVideofile (video: VideoModel, videoInputPath?: string) { +async function optimizeVideofile (video: VideoModel, inputVideoFileArg?: VideoFileModel) { const videosDirectory = CONFIG.STORAGE.VIDEOS_DIR const newExtname = '.mp4' - let inputVideoFile = null - if (videoInputPath == null) { - inputVideoFile = video.getOriginalFile() - videoInputPath = join(videosDirectory, video.getVideoFilename(inputVideoFile)) - } else { - inputVideoFile = basename(videoInputPath) - } + + const inputVideoFile = inputVideoFileArg ? inputVideoFileArg : video.getOriginalFile() + const videoInputPath = join(videosDirectory, video.getVideoFilename(inputVideoFile)) const videoTranscodedPath = join(videosDirectory, video.id + '-transcoded' + newExtname) const transcodeOptions = { -- cgit v1.2.3