X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Fcore-utils.ts;h=443115336946150ae9363508fa3ed5ac3def52af;hb=6725d05c5f71e0cdf0deba6692220b73e42e7ffa;hp=3dae781447d300a2d665f252ae467d3e399aa629;hpb=53abc4c272be9ecc951274458d054dbaf86e594d;p=github%2FChocobozzz%2FPeerTube.git
diff --git a/server/helpers/core-utils.ts b/server/helpers/core-utils.ts
index 3dae78144..443115336 100644
--- a/server/helpers/core-utils.ts
+++ b/server/helpers/core-utils.ts
@@ -3,24 +3,14 @@
Useful to avoid circular dependencies.
*/
-import { join } from 'path'
-import { pseudoRandomBytes } from 'crypto'
-import {
- readdir,
- readFile,
- rename,
- unlink,
- writeFile,
- access,
- stat,
- Stats
-} from 'fs'
-import * as mkdirp from 'mkdirp'
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 * as mkdirp from 'mkdirp'
+import { join } from 'path'
+import * as pem from 'pem'
import * as rimraf from 'rimraf'
-import * as openssl from 'openssl-wrapper'
-import * as Promise from 'bluebird'
function isTestInstance () {
return process.env.NODE_ENV === 'test'
@@ -54,6 +44,12 @@ function escapeHTML (stringParam) {
return String(stringParam).replace(/[&<>"'`=\/]/g, s => entityMap[s])
}
+function pageToStartAndCount (page: number, itemsPerPage: number) {
+ const start = (page - 1) * itemsPerPage
+
+ return { start, count: itemsPerPage }
+}
+
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) => {
@@ -95,7 +91,6 @@ function promisify2WithVoid (func: (arg1: T, arg2: U, cb: (err: any) => vo
}
}
-const readFilePromise = promisify2(readFile)
const readFileBufferPromise = promisify1(readFile)
const unlinkPromise = promisify1WithVoid(unlink)
const renamePromise = promisify2WithVoid(rename)
@@ -103,8 +98,8 @@ const writeFilePromise = promisify2WithVoid(writeFile)
const readdirPromise = promisify1(readdir)
const mkdirpPromise = promisify1(mkdirp)
const pseudoRandomBytesPromise = promisify1(pseudoRandomBytes)
-const accessPromise = promisify1WithVoid(access)
-const opensslExecPromise = promisify2WithVoid(openssl.exec)
+const createPrivateKey = promisify1(pem.createPrivateKey)
+const getPublicKey = promisify1(pem.getPublicKey)
const bcryptComparePromise = promisify2(bcrypt.compare)
const bcryptGenSaltPromise = promisify1(bcrypt.genSalt)
const bcryptHashPromise = promisify2(bcrypt.hash)
@@ -118,19 +113,20 @@ export {
isTestInstance,
root,
escapeHTML,
+ pageToStartAndCount,
promisify0,
promisify1,
+
readdirPromise,
- readFilePromise,
readFileBufferPromise,
unlinkPromise,
renamePromise,
writeFilePromise,
mkdirpPromise,
pseudoRandomBytesPromise,
- accessPromise,
- opensslExecPromise,
+ createPrivateKey,
+ getPublicKey,
bcryptComparePromise,
bcryptGenSaltPromise,
bcryptHashPromise,