X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Futils.ts;h=a42474417769c4aeb97f9c8b5cf0b3e8757d7afc;hb=39ba2e8e3a71961cd0087c57d25905f6a97a6b69;hp=9c08afb711af7329863d0dd385608ae7f9a46b31;hpb=075f16caac5236cb04c98ae7b3a989766d764bb3;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/helpers/utils.ts b/server/helpers/utils.ts
index 9c08afb71..a42474417 100644
--- a/server/helpers/utils.ts
+++ b/server/helpers/utils.ts
@@ -1,39 +1,66 @@
-import * as express from 'express'
-
-import { pseudoRandomBytesPromise } from './core-utils'
 import { ResultList } from '../../shared'
+import { CONFIG } from '../initializers'
+import { ApplicationModel } from '../models/application/application'
+import { pseudoRandomBytesPromise, 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 * as memoizee from 'memoizee'
 
-function badRequest (req: express.Request, res: express.Response, next: express.NextFunction) {
-  res.type('json').status(400).end()
+function deleteFileAsync (path: string) {
+  remove(path)
+    .catch(err => logger.error('Cannot delete the file %s asynchronously.', path, { err }))
 }
 
-function generateRandomString (size: number) {
-  return pseudoRandomBytesPromise(size).then(raw => raw.toString('hex'))
+async function generateRandomString (size: number) {
+  const raw = await pseudoRandomBytesPromise(size)
+
+  return raw.toString('hex')
 }
 
-interface FormatableToJSON {
-  toFormatedJSON ()
+interface FormattableToJSON {
+  toFormattedJSON (args?: any)
 }
 
-function getFormatedObjects<U, T extends FormatableToJSON> (objects: T[], objectsTotal: number) {
-  const formatedObjects: U[] = []
+function getFormattedObjects<U, T extends FormattableToJSON> (objects: T[], objectsTotal: number, formattedArg?: any) {
+  const formattedObjects: U[] = []
 
   objects.forEach(object => {
-    formatedObjects.push(object.toFormatedJSON())
+    formattedObjects.push(object.toFormattedJSON(formattedArg))
   })
 
-  const res: ResultList<U> = {
+  return {
     total: objectsTotal,
-    data: formatedObjects
-  }
+    data: formattedObjects
+  } as ResultList<U>
+}
+
+const getServerActor = memoizee(async function () {
+  const application = await ApplicationModel.load()
+  if (!application) throw Error('Could not load Application from database.')
+
+  return application.Account.Actor
+})
+
+function generateVideoTmpPath (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 res
+function getSecureTorrentName (originalName: string) {
+  return sha256(originalName) + '.torrent'
 }
 
 // ---------------------------------------------------------------------------
 
 export {
-  badRequest,
+  deleteFileAsync,
   generateRandomString,
-  getFormatedObjects
+  getFormattedObjects,
+  getSecureTorrentName,
+  getServerActor,
+  generateVideoTmpPath
 }