X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Fcore-utils.ts;h=b1a27e089110d632604e5908506cc0961baffa46;hb=cf9166cf2fb7b51a1137a259eed9338798c73500;hp=9830d41a89bdc375443d3587447d026c50c1d9f9;hpb=c9d5c64f98c1f1fe7950de60c58edeaf3ace070d;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/helpers/core-utils.ts b/server/helpers/core-utils.ts index 9830d41a8..b1a27e089 100644 --- a/server/helpers/core-utils.ts +++ b/server/helpers/core-utils.ts @@ -6,7 +6,6 @@ import * as bcrypt from 'bcrypt' import * as createTorrent from 'create-torrent' import { createHash, pseudoRandomBytes } from 'crypto' -import { copyFile, readdir, readFile, rename, stat, Stats, unlink, writeFile, mkdirp } from 'fs-extra' import { isAbsolute, join } from 'path' import * as pem from 'pem' import * as rimraf from 'rimraf' @@ -65,6 +64,10 @@ function isTestInstance () { return process.env.NODE_ENV === 'test' } +function isProdInstance () { + return process.env.NODE_ENV === 'production' +} + function root () { // We are in /helpers/utils.js const paths = [ __dirname, '..', '..' ] @@ -168,14 +171,6 @@ 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) -const writeFilePromise = promisify2WithVoid(writeFile) -const readdirPromise = promisify1(readdir) -const mkdirpPromise = promisify1(mkdirp) -// we cannot modify the Promise types, so we should make the promisify instance check mkdirp const pseudoRandomBytesPromise = promisify1(pseudoRandomBytes) const createPrivateKey = promisify1(pem.createPrivateKey) const getPublicKey = promisify1(pem.getPublicKey) @@ -183,13 +178,13 @@ const bcryptComparePromise = promisify2(bcrypt.compare) const bcryptGenSaltPromise = promisify1(bcrypt.genSalt) const bcryptHashPromise = promisify2(bcrypt.hash) const createTorrentPromise = promisify2(createTorrent) -const rimrafPromise = promisify1WithVoid(rimraf) -const statPromise = promisify1(stat) // --------------------------------------------------------------------------- export { isTestInstance, + isProdInstance, + root, escapeHTML, pageToStartAndCount, @@ -202,20 +197,11 @@ export { promisify0, promisify1, - copyFilePromise, - readdirPromise, - readFileBufferPromise, - unlinkPromise, - renamePromise, - writeFilePromise, - mkdirpPromise, pseudoRandomBytesPromise, createPrivateKey, getPublicKey, bcryptComparePromise, bcryptGenSaltPromise, bcryptHashPromise, - createTorrentPromise, - rimrafPromise, - statPromise + createTorrentPromise }