X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Futils.ts;h=0545e89961bf6cd2b3780fbef50077d1d2f8ecd3;hb=f461ae6f952cc98908370c4593ad499de17b34aa;hp=ad3b7949e586d6baeba36569b9f40a0faf9c9c72;hpb=610d0be13b3d01f653ef269271dd667a57c85ef2;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/helpers/utils.ts b/server/helpers/utils.ts index ad3b7949e..0545e8996 100644 --- a/server/helpers/utils.ts +++ b/server/helpers/utils.ts @@ -1,11 +1,10 @@ +import { remove } from 'fs-extra' +import { Instance as ParseTorrent } from 'parse-torrent' +import { join } from 'path' import { ResultList } from '../../shared' +import { CONFIG } from '../initializers/config' import { execPromise, execPromise2, randomBytesPromise, sha256 } from './core-utils' import { logger } from './logger' -import { join } from 'path' -import { Instance as ParseTorrent } from 'parse-torrent' -import { remove } from 'fs-extra' -import { CONFIG } from '../initializers/config' -import { isVideoFileExtnameValid } from './custom-validators/videos' function deleteFileAsync (path: string) { remove(path) @@ -31,16 +30,11 @@ function getFormattedObjects> (objects: } as ResultList } -function generateVideoImportTmpPath (target: string | ParseTorrent, extensionArg?: string) { +function generateVideoImportTmpPath (target: string | ParseTorrent, extension = '.mp4') { const id = typeof target === 'string' ? target : target.infoHash - let extension = '.mp4' - if (extensionArg && isVideoFileExtnameValid(extensionArg)) { - extension = extensionArg - } - const hash = sha256(id) return join(CONFIG.STORAGE.TMP_DIR, `${hash}-import${extension}`) }