import { remove } from 'fs-extra'
import { Instance as ParseTorrent } from 'parse-torrent'
import { join } from 'path'
-import { ResultList } from '../../shared'
+import { sha256 } from '@shared/extra-utils'
+import { ResultList } from '@shared/models'
import { CONFIG } from '../initializers/config'
-import { execPromise, execPromise2, randomBytesPromise, sha256 } from './core-utils'
+import { randomBytesPromise } from './core-utils'
import { logger } from './logger'
-function deleteFileAsync (path: string) {
+function deleteFileAndCatch (path: string) {
remove(path)
.catch(err => logger.error('Cannot delete the file %s asynchronously.', path, { err }))
}
return sha256(originalName) + '.torrent'
}
-async function getServerCommit () {
- try {
- const tag = await execPromise2(
- '[ ! -d .git ] || git name-rev --name-only --tags --no-undefined HEAD 2>/dev/null || true',
- { stdio: [ 0, 1, 2 ] }
- )
-
- if (tag) return tag.replace(/^v/, '')
- } catch (err) {
- logger.debug('Cannot get version from git tags.', { err })
- }
-
- try {
- const version = await execPromise('[ ! -d .git ] || git rev-parse --short HEAD')
-
- if (version) return version.toString().trim()
- } catch (err) {
- logger.debug('Cannot get version from git HEAD.', { err })
- }
-
- return ''
-}
-
/**
* From a filename like "ede4cba5-742b-46fa-a388-9a6eb3a3aeb3.mp4", returns
* only the "ede4cba5-742b-46fa-a388-9a6eb3a3aeb3" part. If the filename does
// ---------------------------------------------------------------------------
export {
- deleteFileAsync,
+ deleteFileAndCatch,
generateRandomString,
getFormattedObjects,
getSecureTorrentName,
- getServerCommit,
generateVideoImportTmpPath,
getUUIDFromFilename
}