X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Fcore-utils.ts;h=7e8252aa40f3db496d367303335ad9ab39b94f63;hb=c7f36e4f485d92191b9d04c6a880724b02fa220b;hp=9771351e18733119a80dd8a51c72765635147b6a;hpb=30ff39e7f07898ebb716c938123825c678b4e5af;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/helpers/core-utils.ts b/server/helpers/core-utils.ts
index 9771351e1..7e8252aa4 100644
--- a/server/helpers/core-utils.ts
+++ b/server/helpers/core-utils.ts
@@ -4,7 +4,7 @@
 */
 
 import { createHash, HexBase64Latin1Encoding, pseudoRandomBytes } from 'crypto'
-import { isAbsolute, join } from 'path'
+import { basename, isAbsolute, join, resolve } from 'path'
 import * as pem from 'pem'
 import { URL } from 'url'
 import { truncate } from 'lodash'
@@ -136,16 +136,16 @@ function getAppNumber () {
   return process.env.NODE_APP_INSTANCE
 }
 
+let rootPath: string
 function root () {
+  if (rootPath) return rootPath
+
   // We are in /helpers/utils.js
-  const paths = [ __dirname, '..', '..' ]
+  rootPath = join(__dirname, '..', '..')
 
-  // We are under /dist directory
-  if (process.mainModule && process.mainModule.filename.endsWith('.ts') === false) {
-    paths.push('..')
-  }
+  if (basename(rootPath) === 'dist') rootPath = resolve(rootPath, '..')
 
-  return join.apply(null, paths)
+  return rootPath
 }
 
 // Thanks: https://stackoverflow.com/a/12034334
@@ -179,18 +179,15 @@ function buildPath (path: string) {
 }
 
 // Consistent with .length, lodash truncate function is not
-function peertubeTruncate (str: string, maxLength: number) {
-  const options = {
-    length: maxLength
-  }
+function peertubeTruncate (str: string, options: { length: number, separator?: RegExp, omission?: string }) {
   const truncatedStr = truncate(str, options)
 
   // The truncated string is okay, we can return it
-  if (truncatedStr.length <= maxLength) return truncatedStr
+  if (truncatedStr.length <= options.length) 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
+  options.length -= truncatedStr.length - options.length
   return truncate(str, options)
 }