import { ResultList } from '../../shared'
-import { CONFIG } from '../initializers'
import { ApplicationModel } from '../models/application/application'
import { execPromise, execPromise2, pseudoRandomBytesPromise, sha256 } from './core-utils'
import { logger } from './logger'
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) {
remove(path)
return raw.toString('hex')
}
-interface FormattableToJSON {
- toFormattedJSON (args?: any)
+interface FormattableToJSON<U, V> {
+ toFormattedJSON (args?: U): V
}
-function getFormattedObjects<U, T extends FormattableToJSON> (objects: T[], objectsTotal: number, formattedArg?: any) {
- const formattedObjects: U[] = []
-
- objects.forEach(object => {
- formattedObjects.push(object.toFormattedJSON(formattedArg))
- })
+function getFormattedObjects<U, V, T extends FormattableToJSON<U, V>> (objects: T[], objectsTotal: number, formattedArg?: U) {
+ const formattedObjects = objects.map(o => o.toFormattedJSON(formattedArg))
return {
total: objectsTotal,
data: formattedObjects
- } as ResultList<U>
+ } as ResultList<V>
}
const getServerActor = memoizee(async function () {
const application = await ApplicationModel.load()
if (!application) throw Error('Could not load Application from database.')
- return application.Account.Actor
+ const actor = application.Account.Actor
+ actor.Account = application.Account
+
+ return actor
})
-function generateVideoTmpPath (target: string | ParseTorrent) {
+function generateVideoImportTmpPath (target: string | ParseTorrent) {
const id = typeof target === 'string' ? target : target.infoHash
const hash = sha256(id)
- return join(CONFIG.STORAGE.VIDEOS_DIR, hash + '-import.mp4')
+ return join(CONFIG.STORAGE.TMP_DIR, hash + '-import.mp4')
}
function getSecureTorrentName (originalName: string) {
return sha256(originalName) + '.torrent'
}
-async function getVersion () {
+async function getServerCommit () {
try {
const tag = await execPromise2(
'[ ! -d .git ] || git name-rev --name-only --tags --no-undefined HEAD 2>/dev/null || true',
logger.debug('Cannot get version from git HEAD.', { err })
}
- return require('../../../package.json').version
+ return ''
}
/**
getFormattedObjects,
getSecureTorrentName,
getServerActor,
- getVersion,
- generateVideoTmpPath,
+ getServerCommit,
+ generateVideoImportTmpPath,
getUUIDFromFilename
}