hyperzlib
/
nodebb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

closes #3663

Browse Source
v1.18.x
barisusakli 9 years ago
parent 714efd0d0e
commit ca294fc6ec
15 changed files with 129 additions and 116 deletions
Show Stats Download Patch File Download Diff File

6
app.js
Unescape Escape View File

@ -23,14 +23,14 @@
var nconf = require('nconf');
nconf.argv().env('__');
var fs = require('fs'),
url = require('url'),
var url = require('url'),
async = require('async'),
semver = require('semver'),
winston = require('winston'),
colors = require('colors'),
path = require('path'),
pkg = require('./package.json'),
file = require('./src/file'),
utils = require('./public/src/utils.js');
global.env = process.env.NODE_ENV || 'production';
@ -53,7 +53,7 @@ if (nconf.get('config')) {
configFile = path.resolve(__dirname, nconf.get('config'));
}
var configExists = fs.existsSync(configFile);
var configExists = file.existsSync(configFile);
loadConfig();

4
loader.js
Unescape Escape View File

@ -8,7 +8,7 @@ var nconf = require('nconf'),
async = require('async'),
logrotate = require('logrotate-stream'),
file = require('./src/file'),
pkg = require('./package.json');
nconf.argv().env().file({
@ -243,7 +243,7 @@ Loader.notifyWorkers = function(msg, worker_pid) {
fs.open(path.join(__dirname, 'config.json'), 'r', function(err) {
if (!err) {
if (nconf.get('daemon') !== 'false' && nconf.get('daemon') !== false) {
if (fs.existsSync(pidFilePath)) {
if (file.existsSync(pidFilePath)) {
try {
var pid = fs.readFileSync(pidFilePath, { encoding: 'utf-8' });
process.kill(pid, 0);

17
minifier.js
Unescape Escape View File

@ -4,6 +4,7 @@ var uglifyjs = require('uglify-js'),
less = require('less'),
async = require('async'),
fs = require('fs'),
file = require('./src/file'),
crypto = require('crypto'),
utils = require('./public/src/utils'),
@ -14,16 +15,16 @@ var uglifyjs = require('uglify-js'),
/* Javascript */
Minifier.js.minify = function (scripts, minify, callback) {
scripts = scripts.filter(function(file) {
return fs.existsSync(file) && file.endsWith('.js');
return file && file.endsWith('.js');
});
if (minify) {
minifyScripts(scripts, function() {
callback.apply(this, arguments);
});
} else {
concatenateScripts(scripts, callback);
}
async.filter(scripts, file.exists, function(scripts) {
if (minify) {
minifyScripts(scripts, callback);
} else {
concatenateScripts(scripts, callback);
}
});
};
process.on('message', function(payload) {

3
public/src/modules/translator.js
Unescape Escape View File

@ -264,11 +264,12 @@
var fs = require('fs'),
path = require('path'),
winston = require('winston'),
file = require('../../../src/file'),
meta = require('../../../src/meta');
language = language || meta.config.defaultLang || 'en_GB';
if (!fs.existsSync(path.join(__dirname, '../../language', language))) {
if (!file.existsSync(path.join(__dirname, '../../language', language))) {
winston.warn('[translator] Language \'' + meta.config.defaultLang + '\' not found. Defaulting to \'en_GB\'');
language = 'en_GB';
}

22
src/controllers/admin/themes.js
Unescape Escape View File

@ -1,24 +1,24 @@
'use strict';
var path = require('path');
var fs = require('fs');
var file = require('../../file');
var themesController = {};
themesController.get = function(req, res, next) {
var themeDir = path.join(__dirname, '../../../node_modules/' + req.params.theme);
fs.exists(themeDir, function(exists) {
if (exists) {
var themeConfig = require(path.join(themeDir, 'theme.json')),
screenshotPath = path.join(themeDir, themeConfig.screenshot);
if (themeConfig.screenshot && fs.existsSync(screenshotPath)) {
res.sendFile(screenshotPath);
} else {
res.sendFile(path.join(__dirname, '../../../public/images/themes/default.png'));
}
} else {
file.exists(themeDir, function(exists) {
if (!exists) {
return next();
}
var themeConfig = require(path.join(themeDir, 'theme.json')),
screenshotPath = path.join(themeDir, themeConfig.screenshot);
if (themeConfig.screenshot && file.existsSync(screenshotPath)) {
res.sendFile(screenshotPath);
} else {
res.sendFile(path.join(__dirname, '../../../public/images/themes/default.png'));
}
});
};

19
src/file.js
Unescape Escape View File

@ -8,7 +8,6 @@ var fs = require('fs'),
Magic = mmmagic.Magic,
mime = require('mime'),
meta = require('./meta'),
utils = require('../public/src/utils');
var file = {};
@ -63,6 +62,7 @@ file.isFileTypeAllowed = function(path, allowedExtensions, callback) {
};
file.allowedExtensions = function() {
var meta = require('./meta');
var allowedExtensions = (meta.config.allowedFileExtensions || '').trim();
if (!allowedExtensions) {
return [];
@ -80,4 +80,21 @@ file.allowedExtensions = function() {
return allowedExtensions;
};
file.exists = function(path, callback) {
fs.stat(path, function(err, stat) {
callback(!err && stat);
});
};
file.existsSync = function(path) {
var exists = false;
try {
exists = fs.statSync(path);
} catch(err) {
exists = false;
}
return !!exists;
};
module.exports = file;

3
src/logger.js
Unescape Escape View File

@ -10,6 +10,7 @@ var fs = require('fs'),
winston = require('winston'),
util = require('util'),
socketio = require('socket.io'),
file = require('./file'),
meta = require('./meta'),
morgan = require('morgan');
@ -76,7 +77,7 @@ var opts = {
/* Open the streams to log to: either a path or stdout */
var stream;
if(value) {
if(fs.existsSync(value)) {
if(file.existsSync(value)) {
var stats = fs.statSync(value);
if(stats) {
if(stats.isDirectory()) {

40
src/meta/css.js
Unescape Escape View File

@ -11,6 +11,7 @@ var winston = require('winston'),
plugins = require('../plugins'),
emitter = require('../emitter'),
db = require('../database'),
file = require('../file'),
utils = require('../../public/src/utils');
module.exports = function(Meta) {
@ -149,24 +150,25 @@ module.exports = function(Meta) {
Meta.css.getFromFile = function(callback) {
var cachePath = path.join(__dirname, '../../public/stylesheet.css'),
acpCachePath = path.join(__dirname, '../../public/admin.css');
fs.exists(cachePath, function(exists) {
if (exists) {
if (nconf.get('isPrimary') === 'true') {
winston.verbose('[meta/css] Reading stylesheets from file');
async.map([cachePath, acpCachePath], fs.readFile, function(err, files) {
Meta.css.cache = files[0];
Meta.css.acpCache = files[1];
emitter.emit('meta:css.compiled');
callback();
});
} else {
callback();
}
} else {
file.exists(cachePath, function(exists) {
if (!exists) {
winston.warn('[meta/css] No stylesheets found on disk, re-minifying');
Meta.css.minify.apply(Meta.css, arguments);
Meta.css.minify(callback);
return;
}
if (nconf.get('isPrimary') !== 'true') {
return callback();
}
winston.verbose('[meta/css] Reading stylesheets from file');
async.map([cachePath, acpCachePath], fs.readFile, function(err, files) {
Meta.css.cache = files[0];
Meta.css.acpCache = files[1];
emitter.emit('meta:css.compiled');
callback();
});
});
};
@ -197,10 +199,10 @@ module.exports = function(Meta) {
}
function filterMissingFiles(files) {
return files.filter(function(file) {
var exists = fs.existsSync(path.join(__dirname, '../../node_modules', file));
return files.filter(function(filePath) {
var exists = file.existsSync(path.join(__dirname, '../../node_modules', filePath));
if (!exists) {
winston.warn('[meta/css] File not found! ' + file);
winston.warn('[meta/css] File not found! ' + filePath);
}
return exists;
});

45
src/meta/js.js
Unescape Escape View File

@ -8,7 +8,7 @@ var winston = require('winston'),
os = require('os'),
nconf = require('nconf'),
fs = require('fs'),
file = require('../file'),
plugins = require('../plugins'),
emitter = require('../emitter'),
utils = require('../../public/src/utils');
@ -208,30 +208,31 @@ module.exports = function(Meta) {
var scriptPath = path.join(__dirname, '../../public/nodebb.min.js'),
mapPath = path.join(__dirname, '../../public/nodebb.min.js.map'),
paths = [scriptPath];
fs.exists(scriptPath, function(exists) {
if (exists) {
if (nconf.get('isPrimary') === 'true') {
fs.exists(mapPath, function(exists) {
if (exists) {
paths.push(mapPath);
}
file.exists(scriptPath, function(exists) {
if (!exists) {
winston.warn('[meta/js] No script file found on disk, re-minifying');
Meta.js.minify(minify, callback);
return;
}
winston.verbose('[meta/js] Reading client-side scripts from file');
async.map(paths, fs.readFile, function(err, files) {
Meta.js.cache = files[0];
Meta.js.map = files[1] || '';
if (nconf.get('isPrimary') !== 'true') {
return callback();
}
emitter.emit('meta:js.compiled');
callback();
});
});
} else {
callback();
file.exists(mapPath, function(exists) {
if (exists) {
paths.push(mapPath);
}
} else {
winston.warn('[meta/js] No script file found on disk, re-minifying');
Meta.js.minify.apply(Meta.js, arguments);
}
winston.verbose('[meta/js] Reading client-side scripts from file');
async.map(paths, fs.readFile, function(err, files) {
Meta.js.cache = files[0];
Meta.js.map = files[1] || '';
emitter.emit('meta:js.compiled');
callback();
});
});
});
};

43
src/meta/themes.js
Unescape Escape View File

@ -6,6 +6,8 @@ var nconf = require('nconf'),
fs = require('fs'),
path = require('path'),
async = require('async'),
file = require('../file'),
db = require('../database');
module.exports = function(Meta) {
@ -34,27 +36,24 @@ module.exports = function(Meta) {
async.map(themes, function (theme, next) {
var config = path.join(themePath, theme, 'theme.json');
if (fs.existsSync(config)) {
fs.readFile(config, function (err, file) {
if (err) {
return next();
} else {
var configObj = JSON.parse(file.toString());
// Minor adjustments for API output
configObj.type = 'local';
if (configObj.screenshot) {
configObj.screenshot_url = nconf.get('relative_path') + '/css/previews/' + configObj.id;
} else {
configObj.screenshot_url = nconf.get('relative_path') + '/images/themes/default.png';
}
next(err, configObj);
}
});
} else {
next();
}
fs.readFile(config, function (err, file) {
if (err) {
return next();
}
var configObj = JSON.parse(file.toString());
// Minor adjustments for API output
configObj.type = 'local';
if (configObj.screenshot) {
configObj.screenshot_url = nconf.get('relative_path') + '/css/previews/' + configObj.id;
} else {
configObj.screenshot_url = nconf.get('relative_path') + '/images/themes/default.png';
}
next(null, configObj);
});
}, function (err, themes) {
themes = themes.filter(function (theme) {
return (theme !== undefined);
@ -145,7 +144,7 @@ module.exports = function(Meta) {
if (themeObj.templates) {
themePath = path.join(nconf.get('themes_path'), themeObj.id, themeObj.templates);
} else if (fs.existsSync(fallback)) {
} else if (file.existsSync(fallback)) {
themePath = fallback;
}

3
src/middleware/index.js
Unescape Escape View File

@ -2,6 +2,7 @@
var meta = require('../meta'),
db = require('../database'),
file = require('../file'),
auth = require('../routes/authentication'),
path = require('path'),
@ -21,7 +22,7 @@ var middleware = {};
function setupFavicon(app) {
var faviconPath = path.join(__dirname, '../../', 'public', meta.config['brand:favicon'] ? meta.config['brand:favicon'] : 'favicon.ico');
if (fs.existsSync(faviconPath)) {
if (file.existsSync(faviconPath)) {
app.use(nconf.get('relative_path'), favicon(faviconPath));
}
}

3
src/plugins.js
Unescape Escape View File

@ -14,6 +14,7 @@ var fs = require('fs'),
translator = require('../public/src/modules/translator'),
utils = require('../public/src/utils'),
hotswap = require('./hotswap'),
file = require('./file'),
controllers = require('./controllers'),
app, middleware;
@ -103,7 +104,7 @@ var fs = require('fs'),
return path.join(__dirname, '../node_modules/', plugin);
});
async.filter(plugins, fs.exists, function(plugins){
async.filter(plugins, file.exists, function(plugins) {
async.eachSeries(plugins, Plugins.loadPlugin, next);
});
},

3
src/plugins/load.js
Unescape Escape View File

@ -6,6 +6,7 @@ var fs = require('fs'),
async = require('async'),
winston = require('winston'),
nconf = require('nconf'),
file = require('../file'),
utils = require('../../public/src/utils');
@ -107,7 +108,7 @@ module.exports = function(Plugins) {
var realPath = pluginData.staticDirs[mappedPath];
var staticDir = path.join(pluginPath, realPath);
fs.exists(staticDir, function(exists) {
file.exists(staticDir, function(exists) {
if (exists) {
Plugins.staticDirs[pluginData.id + '/' + mappedPath] = staticDir;
} else {

31
src/routes/plugins.js
Unescape Escape View File

@ -22,31 +22,18 @@ module.exports = function(app, middleware, controllers) {
} else {
return null;
}
}).filter(function(a) { return a; });
}).filter(Boolean);
if (matches) {
async.map(matches, function(mappedPath, next) {
var filePath = path.join(plugins.staticDirs[mappedPath], decodeURIComponent(relPath.slice(mappedPath.length)));
if (!matches) {
return next();
}
fs.exists(filePath, function(exists) {
if (exists) {
next(null, filePath);
} else {
next();
}
});
}, function(err, matches) {
if (err) {
return next(err);
}
matches = matches.filter(Boolean);
matches = matches.map(function(mappedPath) {
return path.join(plugins.staticDirs[mappedPath], decodeURIComponent(relPath.slice(mappedPath.length)));
});
if (matches.length) {
res.sendFile(matches[0]);
} else {
next();
}
});
if (matches.length) {
res.sendFile(matches[0]);
} else {
next();
}

3
src/webserver.js
Unescape Escape View File

@ -186,9 +186,10 @@ module.exports.testSocket = function(socketPath, callback) {
return callback(new Error('invalid socket path : ' + socketPath));
}
var net = require('net');
var file = require('./file');
async.series([
function(next) {
fs.exists(socketPath, function(exists) {
file.exists(socketPath, function(exists) {
if (exists) {
next();
} else {

Write Preview
Loading…
Cancel
Save