X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=server%2Fhelpers%2Futils.ts;h=5a4fe4fdd5b27f13228b13539ab6e4d0e9bd96d6;hb=ce1b5ba78c35cfd4df123cab49aef1d14ca0f9b7;hp=e99a48393de493e72281936b885999a3c8fefeb0;hpb=6fcd19ba737f1f5614a56c6925adb882dea43b8d;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/helpers/utils.ts b/server/helpers/utils.ts index e99a48393..5a4fe4fdd 100644 --- a/server/helpers/utils.ts +++ b/server/helpers/utils.ts @@ -1,39 +1,70 @@ -import * as express from 'express' +import { remove } from 'fs-extra' +import { Instance as ParseTorrent } from 'parse-torrent' +import { join } from 'path' +import { sha256 } from '@shared/extra-utils' +import { ResultList } from '@shared/models' +import { CONFIG } from '../initializers/config' +import { randomBytesPromise } from './core-utils' +import { logger } from './logger' -import { pseudoRandomBytesPromise } from './core-utils' -import { ResultList } from '../../shared' +function deleteFileAndCatch (path: string) { + remove(path) + .catch(err => logger.error('Cannot delete the file %s asynchronously.', path, { err })) +} + +async function generateRandomString (size: number) { + const raw = await randomBytesPromise(size) -function badRequest (req: express.Request, res: express.Response, next: express.NextFunction) { - res.type('json').status(400).end() + return raw.toString('hex') } -function generateRandomString (size: number) { - return pseudoRandomBytesPromise(size).then(raw => raw.toString('hex')) +interface FormattableToJSON { + toFormattedJSON (args?: U): V } -interface FormatableToJSON { - toFormatedJSON () +function getFormattedObjects> (objects: T[], objectsTotal: number, formattedArg?: U) { + const formattedObjects = objects.map(o => o.toFormattedJSON(formattedArg)) + + return { + total: objectsTotal, + data: formattedObjects + } as ResultList } -function getFormatedObjects (objects: T[], objectsTotal: number) { - const formatedObjects: U[] = [] +function generateVideoImportTmpPath (target: string | ParseTorrent, extension = '.mp4') { + const id = typeof target === 'string' + ? target + : target.infoHash - objects.forEach(function (object) { - formatedObjects.push(object.toFormatedJSON()) - }) + const hash = sha256(id) + return join(CONFIG.STORAGE.TMP_DIR, `${hash}-import${extension}`) +} - const res: ResultList = { - total: objectsTotal, - data: formatedObjects - } +function getSecureTorrentName (originalName: string) { + return sha256(originalName) + '.torrent' +} + +/** + * From a filename like "ede4cba5-742b-46fa-a388-9a6eb3a3aeb3.mp4", returns + * only the "ede4cba5-742b-46fa-a388-9a6eb3a3aeb3" part. If the filename does + * not contain a UUID, returns null. + */ +function getUUIDFromFilename (filename: string) { + const regex = /[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/ + const result = filename.match(regex) + + if (!result || Array.isArray(result) === false) return null - return res + return result[0] } // --------------------------------------------------------------------------- export { - badRequest, + deleteFileAndCatch, generateRandomString, - getFormatedObjects + getFormattedObjects, + getSecureTorrentName, + generateVideoImportTmpPath, + getUUIDFromFilename }