X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Futils.ts;h=6c95a43b62afea04ac21c4636ce6eaecd572ff14;hb=f6d6e7f861189a4446f406efb775a29688764b48;hp=f326210f32886fd5136ee1511820cffeaed5bdd3;hpb=291e8d3eed88fe714fb74ad897ac2c67347a85ff;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/helpers/utils.ts b/server/helpers/utils.ts
index f326210f3..6c95a43b6 100644
--- a/server/helpers/utils.ts
+++ b/server/helpers/utils.ts
@@ -1,57 +1,93 @@
-import * as express from 'express'
-import * as Promise from 'bluebird'
-
-import { pseudoRandomBytesPromise } from './core-utils'
-import { CONFIG, database as db } from '../initializers'
+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'
 
-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) {
-  return pseudoRandomBytesPromise(size).then(raw => raw.toString('hex'))
-}
+async function generateRandomString (size: number) {
+  const raw = await randomBytesPromise(size)
 
-interface FormatableToJSON {
-  toFormatedJSON ()
+  return raw.toString('hex')
 }
 
-function getFormatedObjects<U, T extends FormatableToJSON> (objects: T[], objectsTotal: number) {
-  const formatedObjects: U[] = []
+interface FormattableToJSON<U, V> {
+  toFormattedJSON (args?: U): V
+}
 
-  objects.forEach(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))
 
-  const res: ResultList<U> = {
+  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}`)
+}
 
-  return res
+function getSecureTorrentName (originalName: string) {
+  return sha256(originalName) + '.torrent'
 }
 
-function isSignupAllowed () {
-  if (CONFIG.SIGNUP.ENABLED === false) {
-    return Promise.resolve(false)
+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 })
   }
 
-  // No limit and signup is enabled
-  if (CONFIG.SIGNUP.LIMIT === -1) {
-    return Promise.resolve(true)
+  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 db.User.countTotal().then(totalUsers => {
-    return totalUsers < CONFIG.SIGNUP.LIMIT
-  })
+  return ''
+}
+
+/**
+ * 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,
+  deleteFileAndCatch,
   generateRandomString,
-  getFormatedObjects,
-  isSignupAllowed
+  getFormattedObjects,
+  getSecureTorrentName,
+  getServerCommit,
+  generateVideoImportTmpPath,
+  getUUIDFromFilename
 }