+import { remove } from 'fs-extra'
+import { Instance as ParseTorrent } from 'parse-torrent'
+import { join } from 'path'
import { ResultList } from '../../shared'
-import { ApplicationModel } from '../models/application/application'
+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 * as memoizee from 'memoizee'
-import { CONFIG } from '../initializers/config'
-function deleteFileAsync (path: string) {
+function deleteFileAndCatch (path: string) {
remove(path)
.catch(err => logger.error('Cannot delete the file %s asynchronously.', path, { err }))
}
} as ResultList<V>
}
-const getServerActor = memoizee(async function () {
- const application = await ApplicationModel.load()
- if (!application) throw Error('Could not load Application from database.')
-
- const actor = application.Account.Actor
- 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, extension = '.mp4') {
+ const id = typeof target === 'string'
+ ? target
+ : target.infoHash
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) {
// ---------------------------------------------------------------------------
export {
- deleteFileAsync,
+ deleteFileAndCatch,
generateRandomString,
getFormattedObjects,
getSecureTorrentName,
- getServerActor,
getServerCommit,
generateVideoImportTmpPath,
getUUIDFromFilename