X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Futils.ts;h=5a4fe4fdd5b27f13228b13539ab6e4d0e9bd96d6;hb=ce1b5ba78c35cfd4df123cab49aef1d14ca0f9b7;hp=07c1b3f51adffa1b01e042d211c8cba465be309c;hpb=df98563e2104b82b119c00a3cd83cd0dc1242d25;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/helpers/utils.ts b/server/helpers/utils.ts
index 07c1b3f51..5a4fe4fdd 100644
--- a/server/helpers/utils.ts
+++ b/server/helpers/utils.ts
@@ -1,45 +1,70 @@
-import * as express from 'express'
-
-import { pseudoRandomBytes } from 'crypto'
-
+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'
 
-function badRequest (req: express.Request, res: express.Response, next: express.NextFunction) {
-  res.type('json').status(400).end()
+function deleteFileAndCatch (path: string) {
+  remove(path)
+    .catch(err => logger.error('Cannot delete the file %s asynchronously.', path, { err }))
 }
 
-function generateRandomString (size: number, callback: (err: Error, randomString?: string) => void) {
-  pseudoRandomBytes(size, function (err, raw) {
-    if (err) return callback(err)
+async function generateRandomString (size: number) {
+  const raw = await randomBytesPromise(size)
 
-    callback(null, raw.toString('hex'))
-  })
+  return raw.toString('hex')
 }
 
-function createEmptyCallback () {
-  return function (err) {
-    if (err) logger.error('Error in empty callback.', { error: err })
-  }
+interface FormattableToJSON<U, V> {
+  toFormattedJSON (args?: U): V
 }
 
-function getFormatedObjects (objects: any[], objectsTotal: number) {
-  const formatedObjects = []
-
-  objects.forEach(function (object) {
-    formatedObjects.push(object.toFormatedJSON())
-  })
+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: formatedObjects
-  }
+    data: formattedObjects
+  } as ResultList<V>
+}
+
+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${extension}`)
+}
+
+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 result[0]
 }
 
 // ---------------------------------------------------------------------------
 
 export {
-  badRequest,
-  createEmptyCallback,
+  deleteFileAndCatch,
   generateRandomString,
-  getFormatedObjects
+  getFormattedObjects,
+  getSecureTorrentName,
+  generateVideoImportTmpPath,
+  getUUIDFromFilename
 }