yetangitu/Peertube
1
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-10-03 17:59:37 +02:00
Code Issues Releases Wiki Activity

Fix (again) youtube import

Browse source
This commit is contained in:
Chocobozzz 2021-01-19 16:28:55 +01:00
parent d487a997c8
commit 805b8619c1
No known key found for this signature in database
GPG key ID: 583A612D890159BE
5 changed files with 53 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

16
server/helpers/utils.ts
View file

@ -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<U, V, T extends FormattableToJSON<U, V>> (objects:
} as ResultList<V>
}
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}`)
}