X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Fcore-utils.ts;h=c560222d3d39fd3a39ce57c477e78c71adc1cdca;hb=0138af9237b77dd7d3a49260d164193b4048de84;hp=0c6c36d11741e0d58fcf7c00fbb5d63751a21d27;hpb=225a89c2afbbe53cf39ffa7ea0cd485095a1d5f5;p=github%2FChocobozzz%2FPeerTube.git
diff --git a/server/helpers/core-utils.ts b/server/helpers/core-utils.ts
index 0c6c36d11..c560222d3 100644
--- a/server/helpers/core-utils.ts
+++ b/server/helpers/core-utils.ts
@@ -6,12 +6,13 @@
import * as bcrypt from 'bcrypt'
import * as createTorrent from 'create-torrent'
import { pseudoRandomBytes } from 'crypto'
-import { readdir, readFile, rename, stat, Stats, unlink, writeFile } from 'fs'
+import { copyFile, readdir, readFile, rename, stat, Stats, unlink, writeFile } from 'fs'
import * as mkdirp from 'mkdirp'
-import { join } from 'path'
+import { isAbsolute, join } from 'path'
import * as pem from 'pem'
import * as rimraf from 'rimraf'
import { URL } from 'url'
+import { truncate } from 'lodash'
function sanitizeUrl (url: string) {
const urlObject = new URL(url)
@@ -27,7 +28,7 @@ function sanitizeUrl (url: string) {
// Don't import remote scheme from constants because we are in core utils
function sanitizeHost (host: string, remoteScheme: string) {
- let toRemove = remoteScheme === 'https' ? 443 : 80
+ const toRemove = remoteScheme === 'https' ? 443 : 80
return host.replace(new RegExp(`:${toRemove}$`), '')
}
@@ -50,6 +51,8 @@ function root () {
// Thanks: https://stackoverflow.com/a/12034334
function escapeHTML (stringParam) {
+ if (!stringParam) return ''
+
const entityMap = {
'&': '&',
'<': '<',
@@ -70,6 +73,28 @@ function pageToStartAndCount (page: number, itemsPerPage: number) {
return { start, count: itemsPerPage }
}
+function buildPath (path: string) {
+ if (isAbsolute(path)) return path
+
+ return join(root(), path)
+}
+
+// Consistent with .length, lodash truncate function is not
+function peertubeTruncate (str: string, maxLength: number) {
+ const options = {
+ length: maxLength
+ }
+ const truncatedStr = truncate(str, options)
+
+ // The truncated string is okay, we can return it
+ if (truncatedStr.length <= maxLength) return truncatedStr
+
+ // Lodash takes into account all UTF characters, whereas String.prototype.length does not: some characters have a length of 2
+ // We always use the .length so we need to truncate more if needed
+ options.length -= truncatedStr.length - maxLength
+ return truncate(str, options)
+}
+
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) => {
@@ -111,6 +136,7 @@ function promisify2WithVoid (func: (arg1: T, arg2: U, cb: (err: any) => vo
}
}
+const copyFilePromise = promisify2WithVoid(copyFile)
const readFileBufferPromise = promisify1(readFile)
const unlinkPromise = promisify1WithVoid(unlink)
const renamePromise = promisify2WithVoid(rename)
@@ -136,10 +162,13 @@ export {
pageToStartAndCount,
sanitizeUrl,
sanitizeHost,
+ buildPath,
+ peertubeTruncate,
promisify0,
promisify1,
+ copyFilePromise,
readdirPromise,
readFileBufferPromise,
unlinkPromise,