X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Fcore-utils.ts;h=b1e9af0a17a61325b7d8241814ad294498692799;hb=e1a1f9c623bfbbc7e38b36047926338f2e1c61d9;hp=224e4fe92fc9c249224e4674ff01c154d8aecae0;hpb=729bb184819ddda1d7313da0c30b3397e5689721;p=github%2FChocobozzz%2FPeerTube.git
diff --git a/server/helpers/core-utils.ts b/server/helpers/core-utils.ts
index 224e4fe92..b1e9af0a1 100644
--- a/server/helpers/core-utils.ts
+++ b/server/helpers/core-utils.ts
@@ -12,6 +12,24 @@ import { URL } from 'url'
import { truncate } from 'lodash'
import { exec } from 'child_process'
+const objectConverter = (oldObject: any, keyConverter: (e: string) => string, valueConverter: (e: any) => any) => {
+ if (!oldObject || typeof oldObject !== 'object') {
+ return valueConverter(oldObject)
+ }
+
+ if (Array.isArray(oldObject)) {
+ return oldObject.map(e => objectConverter(e, keyConverter, valueConverter))
+ }
+
+ const newObject = {}
+ Object.keys(oldObject).forEach(oldKey => {
+ const newKey = keyConverter(oldKey)
+ newObject[ newKey ] = objectConverter(oldObject[ oldKey ], keyConverter, valueConverter)
+ })
+
+ return newObject
+}
+
const timeTable = {
ms: 1,
second: 1000,
@@ -21,7 +39,8 @@ const timeTable = {
week: 3600000 * 24 * 7,
month: 3600000 * 24 * 30
}
-export function parseDuration (duration: number | string): number {
+
+export function parseDurationToMs (duration: number | string): number {
if (typeof duration === 'number') return duration
if (typeof duration === 'string') {
@@ -38,7 +57,54 @@ export function parseDuration (duration: number | string): number {
}
}
- throw new Error('Duration could not be properly parsed')
+ throw new Error(`Duration ${duration} could not be properly parsed`)
+}
+
+export function parseBytes (value: string | number): number {
+ if (typeof value === 'number') return value
+
+ const tgm = /^(\d+)\s*TB\s*(\d+)\s*GB\s*(\d+)\s*MB$/
+ const tg = /^(\d+)\s*TB\s*(\d+)\s*GB$/
+ const tm = /^(\d+)\s*TB\s*(\d+)\s*MB$/
+ const gm = /^(\d+)\s*GB\s*(\d+)\s*MB$/
+ const t = /^(\d+)\s*TB$/
+ const g = /^(\d+)\s*GB$/
+ const m = /^(\d+)\s*MB$/
+ const b = /^(\d+)\s*B$/
+ let match
+
+ if (value.match(tgm)) {
+ match = value.match(tgm)
+ return parseInt(match[1], 10) * 1024 * 1024 * 1024 * 1024
+ + parseInt(match[2], 10) * 1024 * 1024 * 1024
+ + parseInt(match[3], 10) * 1024 * 1024
+ } else if (value.match(tg)) {
+ match = value.match(tg)
+ return parseInt(match[1], 10) * 1024 * 1024 * 1024 * 1024
+ + parseInt(match[2], 10) * 1024 * 1024 * 1024
+ } else if (value.match(tm)) {
+ match = value.match(tm)
+ return parseInt(match[1], 10) * 1024 * 1024 * 1024 * 1024
+ + parseInt(match[2], 10) * 1024 * 1024
+ } else if (value.match(gm)) {
+ match = value.match(gm)
+ return parseInt(match[1], 10) * 1024 * 1024 * 1024
+ + parseInt(match[2], 10) * 1024 * 1024
+ } else if (value.match(t)) {
+ match = value.match(t)
+ return parseInt(match[1], 10) * 1024 * 1024 * 1024 * 1024
+ } else if (value.match(g)) {
+ match = value.match(g)
+ return parseInt(match[1], 10) * 1024 * 1024 * 1024
+ } else if (value.match(m)) {
+ match = value.match(m)
+ return parseInt(match[1], 10) * 1024 * 1024
+ } else if (value.match(b)) {
+ match = value.match(b)
+ return parseInt(match[1], 10) * 1024
+ } else {
+ return parseInt(value, 10)
+ }
}
function sanitizeUrl (url: string) {
@@ -68,6 +134,10 @@ function isProdInstance () {
return process.env.NODE_ENV === 'production'
}
+function getAppNumber () {
+ return process.env.NODE_APP_INSTANCE
+}
+
function root () {
// We are in /helpers/utils.js
const paths = [ __dirname, '..', '..' ]
@@ -126,10 +196,14 @@ function peertubeTruncate (str: string, maxLength: number) {
return truncate(str, options)
}
-function sha256 (str: string, encoding: HexBase64Latin1Encoding = 'hex') {
+function sha256 (str: string | Buffer, encoding: HexBase64Latin1Encoding = 'hex') {
return createHash('sha256').update(str).digest(encoding)
}
+function sha1 (str: string | Buffer, encoding: HexBase64Latin1Encoding = 'hex') {
+ return createHash('sha1').update(str).digest(encoding)
+}
+
function promisify0 (func: (cb: (err: any, result: A) => void) => void): () => Promise {
return function promisified (): Promise {
return new Promise((resolve: (arg: A) => void, reject: (err: any) => void) => {
@@ -186,7 +260,9 @@ const execPromise = promisify1(exec)
export {
isTestInstance,
isProdInstance,
+ getAppNumber,
+ objectConverter,
root,
escapeHTML,
pageToStartAndCount,
@@ -194,7 +270,9 @@ export {
sanitizeHost,
buildPath,
peertubeTruncate,
+
sha256,
+ sha1,
promisify0,
promisify1,