diff options
author | Chocobozzz <me@florianbigard.com> | 2018-01-16 08:46:44 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-01-16 08:46:44 +0100 |
commit | 0b4204f9832d2616e87959b6b547958b5c8677fb (patch) | |
tree | b1d3019235deaa0ab6c989734fdba537418dca6a /server/helpers | |
parent | 2d13b29965482cebfd2070d5acf010af75416925 (diff) | |
download | PeerTube-0b4204f9832d2616e87959b6b547958b5c8677fb.tar.gz PeerTube-0b4204f9832d2616e87959b6b547958b5c8677fb.tar.zst PeerTube-0b4204f9832d2616e87959b6b547958b5c8677fb.zip |
Fix config storage paths
Diffstat (limited to 'server/helpers')
-rw-r--r-- | server/helpers/core-utils.ts | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/server/helpers/core-utils.ts b/server/helpers/core-utils.ts index 4981bb4ec..77547c528 100644 --- a/server/helpers/core-utils.ts +++ b/server/helpers/core-utils.ts | |||
@@ -8,7 +8,7 @@ import * as createTorrent from 'create-torrent' | |||
8 | import { pseudoRandomBytes } from 'crypto' | 8 | import { pseudoRandomBytes } from 'crypto' |
9 | import { readdir, readFile, rename, stat, Stats, unlink, writeFile } from 'fs' | 9 | import { readdir, readFile, rename, stat, Stats, unlink, writeFile } from 'fs' |
10 | import * as mkdirp from 'mkdirp' | 10 | import * as mkdirp from 'mkdirp' |
11 | import { join } from 'path' | 11 | import { isAbsolute, join } from 'path' |
12 | import * as pem from 'pem' | 12 | import * as pem from 'pem' |
13 | import * as rimraf from 'rimraf' | 13 | import * as rimraf from 'rimraf' |
14 | import { URL } from 'url' | 14 | import { URL } from 'url' |
@@ -70,6 +70,12 @@ function pageToStartAndCount (page: number, itemsPerPage: number) { | |||
70 | return { start, count: itemsPerPage } | 70 | return { start, count: itemsPerPage } |
71 | } | 71 | } |
72 | 72 | ||
73 | function buildPath (path: string) { | ||
74 | if (isAbsolute(path)) return path | ||
75 | |||
76 | return join(root(), path) | ||
77 | } | ||
78 | |||
73 | function promisify0<A> (func: (cb: (err: any, result: A) => void) => void): () => Promise<A> { | 79 | function promisify0<A> (func: (cb: (err: any, result: A) => void) => void): () => Promise<A> { |
74 | return function promisified (): Promise<A> { | 80 | return function promisified (): Promise<A> { |
75 | return new Promise<A>((resolve: (arg: A) => void, reject: (err: any) => void) => { | 81 | return new Promise<A>((resolve: (arg: A) => void, reject: (err: any) => void) => { |
@@ -136,6 +142,7 @@ export { | |||
136 | pageToStartAndCount, | 142 | pageToStartAndCount, |
137 | sanitizeUrl, | 143 | sanitizeUrl, |
138 | sanitizeHost, | 144 | sanitizeHost, |
145 | buildPath, | ||
139 | 146 | ||
140 | promisify0, | 147 | promisify0, |
141 | promisify1, | 148 | promisify1, |