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

Added New Folder feature in Image Editor + Winston init refactor

Browse Source
This commit is contained in:
NGPixel
2016-09-28 21:58:18 -04:00
parent 993153072c
commit 90afe796ee
10 changed files with 113 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
models/config.js
View File

@@ -25,6 +25,7 @@ module.exports = (confPath) => {
title: "Requarks Wiki",
host: "http://localhost",
port: process.env.PORT,
wsPort: 8080,
db: "mongodb://localhost/wiki",
redis: null,
sessionSecret: null,

22
models/git.js
View File

@@ -72,13 +72,13 @@ module.exports = {
let self = this;
winston.info('[GIT] Checking Git repository...');
winston.info('[' + PROCNAME + '][GIT] Checking Git repository...');
//-> Check if path is accessible
return fs.mkdirAsync(self._repo.path).catch((err) => {
if(err.code !== 'EEXIST') {
winston.error('Invalid Git repository path or missing permissions.');
winston.error('[' + PROCNAME + '][GIT] Invalid Git repository path or missing permissions.');
}
}).then(() => {
@@ -116,10 +116,10 @@ module.exports = {
});
}).catch((err) => {
winston.error('Git remote error!');
winston.error('[' + PROCNAME + '][GIT] Git remote error!');
throw err;
}).then(() => {
winston.info('[GIT] Git repository is OK.');
winston.info('[' + PROCNAME + '][GIT] Git repository is OK.');
return true;
});
@@ -147,12 +147,12 @@ module.exports = {
// Fetch
winston.info('[GIT] Performing pull from remote repository...');
winston.info('[' + PROCNAME + '][GIT] Performing pull from remote repository...');
return self._git.pull('origin', self._repo.branch).then((cProc) => {
winston.info('[GIT] Pull completed.');
winston.info('[' + PROCNAME + '][GIT] Pull completed.');
})
.catch((err) => {
winston.error('Unable to fetch from git origin!');
winston.error('[' + PROCNAME + '][GIT] Unable to fetch from git origin!');
throw err;
})
.then(() => {
@@ -164,14 +164,14 @@ module.exports = {
if(_.includes(out, 'commit')) {
winston.info('[GIT] Performing push to remote repository...');
winston.info('[' + PROCNAME + '][GIT] Performing push to remote repository...');
return self._git.push('origin', self._repo.branch).then(() => {
return winston.info('[GIT] Push completed.');
return winston.info('[' + PROCNAME + '][GIT] Push completed.');
});
} else {
winston.info('[GIT] Push skipped. Repository is already in sync.');
winston.info('[' + PROCNAME + '][GIT] Push skipped. Repository is already in sync.');
}
@@ -181,7 +181,7 @@ module.exports = {
})
.catch((err) => {
winston.error('Unable to push changes to remote!');
winston.error('[' + PROCNAME + '][GIT] Unable to push changes to remote!');
throw err;
});

66
models/localdata.js
View File

@@ -1,11 +1,13 @@
"use strict";
var fs = require('fs'),
path = require('path'),
var path = require('path'),
loki = require('lokijs'),
Promise = require('bluebird'),
fs = Promise.promisifyAll(require('fs-extra')),
_ = require('lodash');
var regFolderName = new RegExp("^[a-z0-9][a-z0-9\-]*[a-z0-9]$");
/**
* Local Data Storage
*
@@ -114,36 +116,20 @@ module.exports = {
*/
createBaseDirectories(appconfig) {
winston.info('[SERVER] Create data directories if they don\'t exist...');
winston.info('[SERVER] Checking data directories...');
try {
fs.mkdirSync(appconfig.datadir.db);
fs.ensureDirSync(path.resolve(ROOTPATH, appconfig.datadir.db));
fs.ensureDirSync(path.resolve(ROOTPATH, appconfig.datadir.db, './cache'));
fs.ensureDirSync(path.resolve(ROOTPATH, appconfig.datadir.db, './thumbs'));
fs.ensureDirSync(path.resolve(ROOTPATH, appconfig.datadir.repo));
fs.ensureDirSync(path.resolve(ROOTPATH, appconfig.datadir.repo, './uploads'));
} catch (err) {
if(err.code !== 'EEXIST') {
winston.error(err);
process.exit(1);
}
winston.error(err);
}
try {
fs.mkdirSync(path.join(appconfig.datadir.db, 'cache'));
} catch (err) {
if(err.code !== 'EEXIST') {
winston.error(err);
process.exit(1);
}
}
try {
fs.mkdirSync(path.join(appconfig.datadir.db, 'thumbs'));
} catch (err) {
if(err.code !== 'EEXIST') {
winston.error(err);
process.exit(1);
}
}
winston.info('[SERVER] Data directories are OK.');
winston.info('[SERVER] Data and Repository directories are OK.');
return;
@@ -171,6 +157,32 @@ module.exports = {
return this._uploadsFolders;
},
/**
* Creates an uploads folder.
*
* @param {String} folderName The folder name
* @return {Promise} Promise of the operation
*/
createUploadsFolder(folderName) {
let self = this;
folderName = _.kebabCase(_.trim(folderName));
if(_.isEmpty(folderName) || !regFolderName.test(folderName)) {
return Promise.resolve(self.getUploadsFolders());
}
return fs.ensureDirAsync(path.join(self._uploadsPath, folderName)).then(() => {
if(!_.includes(self._uploadsFolders, folderName)) {
self._uploadsFolders.push(folderName);
self._uploadsFolders = _.sortBy(self._uploadsFolders);
}
return self.getUploadsFolders();
});
},
/**
* Sets the uploads files.
*