aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/helpers/core-utils.ts
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2018-08-27 16:23:34 +0200
committerChocobozzz <me@florianbigard.com>2018-08-27 16:23:34 +0200
commit62689b942b71cd1dd0d050c6ed05f884a0b325c2 (patch)
treec45c35d35d7a3e32621fba06edc63646930c8efd /server/helpers/core-utils.ts
parent84b6dbcc6e8654f39ec798905e1151ba915cd1aa (diff)
downloadPeerTube-62689b942b71cd1dd0d050c6ed05f884a0b325c2.tar.gz
PeerTube-62689b942b71cd1dd0d050c6ed05f884a0b325c2.tar.zst
PeerTube-62689b942b71cd1dd0d050c6ed05f884a0b325c2.zip
Correctly migrate to fs-extra
Diffstat (limited to 'server/helpers/core-utils.ts')
-rw-r--r--server/helpers/core-utils.ts22
1 files changed, 1 insertions, 21 deletions
diff --git a/server/helpers/core-utils.ts b/server/helpers/core-utils.ts
index 9830d41a8..f5ef187fe 100644
--- a/server/helpers/core-utils.ts
+++ b/server/helpers/core-utils.ts
@@ -6,7 +6,6 @@
6import * as bcrypt from 'bcrypt' 6import * as bcrypt from 'bcrypt'
7import * as createTorrent from 'create-torrent' 7import * as createTorrent from 'create-torrent'
8import { createHash, pseudoRandomBytes } from 'crypto' 8import { createHash, pseudoRandomBytes } from 'crypto'
9import { copyFile, readdir, readFile, rename, stat, Stats, unlink, writeFile, mkdirp } from 'fs-extra'
10import { isAbsolute, join } from 'path' 9import { isAbsolute, join } from 'path'
11import * as pem from 'pem' 10import * as pem from 'pem'
12import * as rimraf from 'rimraf' 11import * as rimraf from 'rimraf'
@@ -168,14 +167,6 @@ function promisify2WithVoid<T, U> (func: (arg1: T, arg2: U, cb: (err: any) => vo
168 } 167 }
169} 168}
170 169
171const copyFilePromise = promisify2WithVoid<string, string>(copyFile)
172const readFileBufferPromise = promisify1<string, Buffer>(readFile)
173const unlinkPromise = promisify1WithVoid<string>(unlink)
174const renamePromise = promisify2WithVoid<string, string>(rename)
175const writeFilePromise = promisify2WithVoid<string, any>(writeFile)
176const readdirPromise = promisify1<string, string[]>(readdir)
177const mkdirpPromise = promisify1<string, string>(mkdirp)
178// we cannot modify the Promise types, so we should make the promisify instance check mkdirp
179const pseudoRandomBytesPromise = promisify1<number, Buffer>(pseudoRandomBytes) 170const pseudoRandomBytesPromise = promisify1<number, Buffer>(pseudoRandomBytes)
180const createPrivateKey = promisify1<number, { key: string }>(pem.createPrivateKey) 171const createPrivateKey = promisify1<number, { key: string }>(pem.createPrivateKey)
181const getPublicKey = promisify1<string, { publicKey: string }>(pem.getPublicKey) 172const getPublicKey = promisify1<string, { publicKey: string }>(pem.getPublicKey)
@@ -183,8 +174,6 @@ const bcryptComparePromise = promisify2<any, string, boolean>(bcrypt.compare)
183const bcryptGenSaltPromise = promisify1<number, string>(bcrypt.genSalt) 174const bcryptGenSaltPromise = promisify1<number, string>(bcrypt.genSalt)
184const bcryptHashPromise = promisify2<any, string | number, string>(bcrypt.hash) 175const bcryptHashPromise = promisify2<any, string | number, string>(bcrypt.hash)
185const createTorrentPromise = promisify2<string, any, any>(createTorrent) 176const createTorrentPromise = promisify2<string, any, any>(createTorrent)
186const rimrafPromise = promisify1WithVoid<string>(rimraf)
187const statPromise = promisify1<string, Stats>(stat)
188 177
189// --------------------------------------------------------------------------- 178// ---------------------------------------------------------------------------
190 179
@@ -202,20 +191,11 @@ export {
202 promisify0, 191 promisify0,
203 promisify1, 192 promisify1,
204 193
205 copyFilePromise,
206 readdirPromise,
207 readFileBufferPromise,
208 unlinkPromise,
209 renamePromise,
210 writeFilePromise,
211 mkdirpPromise,
212 pseudoRandomBytesPromise, 194 pseudoRandomBytesPromise,
213 createPrivateKey, 195 createPrivateKey,
214 getPublicKey, 196 getPublicKey,
215 bcryptComparePromise, 197 bcryptComparePromise,
216 bcryptGenSaltPromise, 198 bcryptGenSaltPromise,
217 bcryptHashPromise, 199 bcryptHashPromise,
218 createTorrentPromise, 200 createTorrentPromise
219 rimrafPromise,
220 statPromise
221} 201}