liz/wikijs-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: use dataPath variable as given in file config (#1118)

Browse Source 
* Actually use path variables as given in default config

* Drop paths.content, avoid populating the global WIKI object
This commit is contained in:
Justin Kromlinger
2019-10-26 00:20:02 +02:00
committed by Nicolas Giard
parent 5b36988d6d
commit 8000ebec8f
10 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/models/pages.js
View File

@@ -728,7 +728,7 @@ module.exports = class Page extends Model {
* @returns {Promise} Promise with no value
*/
static async savePageToCache(page) {
const cachePath = path.join(process.cwd(), `data/cache/${page.hash}.bin`)
const cachePath = path.resolve(WIKI.ROOTPATH, WIKI.config.dataPath, `cache/${page.hash}.bin`)
await fs.outputFile(cachePath, WIKI.models.pages.cacheSchema.encode({
id: page.id,
authorId: page.authorId,
@@ -757,7 +757,7 @@ module.exports = class Page extends Model {
*/
static async getPageFromCache(opts) {
const pageHash = pageHelper.generateHash({ path: opts.path, locale: opts.locale, privateNS: opts.isPrivate ? 'TODO' : '' })
const cachePath = path.join(process.cwd(), `data/cache/${pageHash}.bin`)
const cachePath = path.resolve(WIKI.ROOTPATH, WIKI.config.dataPath, `cache/${pageHash}.bin`)
try {
const pageBuffer = await fs.readFile(cachePath)
@@ -785,14 +785,14 @@ module.exports = class Page extends Model {
* @returns {Promise} Promise with no value
*/
static async deletePageFromCache(page) {
return fs.remove(path.join(process.cwd(), `data/cache/${page.hash}.bin`))
return fs.remove(path.resolve(WIKI.ROOTPATH, WIKI.config.dataPath, `cache/${page.hash}.bin`))
}
/**
* Flush the contents of the Cache
*/
static async flushCache() {
return fs.emptyDir(path.join(process.cwd(), `data/cache`))
return fs.emptyDir(path.resolve(WIKI.ROOTPATH, WIKI.config.dataPath, `cache`))
}
/**