import { ResultList } from '../../shared'
import { ApplicationModel } from '../models/application/application'
-import { execPromise, execPromise2, pseudoRandomBytesPromise, sha256 } from './core-utils'
+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 * as memoizee from 'memoizee'
import { CONFIG } from '../initializers/config'
+import { isVideoFileExtnameValid } from './custom-validators/videos'
function deleteFileAsync (path: string) {
remove(path)
}
async function generateRandomString (size: number) {
- const raw = await pseudoRandomBytesPromise(size)
+ const raw = await randomBytesPromise(size)
return raw.toString('hex')
}
actor.Account = application.Account
return actor
-})
+}, { promise: true })
-function generateVideoImportTmpPath (target: string | ParseTorrent) {
- const id = typeof target === 'string' ? target : target.infoHash
+function generateVideoImportTmpPath (target: string | ParseTorrent, extensionArg?: string) {
+ 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.mp4')
+ return join(CONFIG.STORAGE.TMP_DIR, `${hash}-import${extension}`)
}
function getSecureTorrentName (originalName: string) {