X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Fcore-utils.ts;h=65f18d6442ac34da6d8719e15a15cc18dfc838cb;hb=73c695919c6569bfb667c36fc5a6b9b862130a0d;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..65f18d644 100644
--- a/server/helpers/core-utils.ts
+++ b/server/helpers/core-utils.ts
@@ -8,7 +8,7 @@ import * as createTorrent from 'create-torrent'
 import { pseudoRandomBytes } from 'crypto'
 import { 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'
@@ -27,7 +27,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 +50,8 @@ function root () {
 
 // Thanks: https://stackoverflow.com/a/12034334
 function escapeHTML (stringParam) {
+  if (!stringParam) return ''
+
   const entityMap = {
     '&': '&',
     '<': '&lt;',
@@ -70,6 +72,12 @@ function pageToStartAndCount (page: number, itemsPerPage: number) {
   return { start, count: itemsPerPage }
 }
 
+function buildPath (path: string) {
+  if (isAbsolute(path)) return path
+
+  return join(root(), path)
+}
+
 function promisify0<A> (func: (cb: (err: any, result: A) => void) => void): () => Promise<A> {
   return function promisified (): Promise<A> {
     return new Promise<A>((resolve: (arg: A) => void, reject: (err: any) => void) => {
@@ -136,6 +144,7 @@ export {
   pageToStartAndCount,
   sanitizeUrl,
   sanitizeHost,
+  buildPath,
 
   promisify0,
   promisify1,