zydronium/enigma-bbs
1
0
Fork 0
mirror of https://github.com/NuSkooler/enigma-bbs.git synced 2025-06-06 20:55:30 +02:00
Code Issues Projects Releases Packages Wiki Activity

* Fix bug causing private mail to be skipped during new scan

Browse source 
* Some code cleanup: spaces -> indents
* Resolve TODO removing Message.MetaCategories: Just use string names
* Misc ES5 -> ES6
* Fix bug in module loader when require() fails
* Some DRY in new_scan.js
This commit is contained in:
Bryan Ashby 2016-04-12 22:38:32 -06:00
parent 51e4dccbfe
commit f0919b5227
5 changed files with 116 additions and 134 deletions
Download patch file Download diff file Expand all files Collapse all files

35
core/module_util.js
View file

@ -2,15 +2,14 @@
'use strict';
// ENiGMA½
let Config = require('./config.js').config;
let miscUtil = require('./misc_util.js');
const Config = require('./config.js').config;
// standard/deps
let fs = require('fs');
let paths = require('path');
let _ = require('lodash');
let assert = require('assert');
let async = require('async');
// deps
const fs = require('fs');
const paths = require('path');
const _ = require('lodash');
const assert = require('assert');
const async = require('async');
// exports
exports.loadModuleEx = loadModuleEx;
@ -25,25 +24,22 @@ function loadModuleEx(options, cb) {
const modConfig = _.isObject(Config[options.category]) ? Config[options.category][options.name] : null;
if(_.isObject(modConfig) && false === modConfig.enabled) {
cb(new Error('Module "' + options.name + '" is disabled'));
return;
return cb(new Error('Module "' + options.name + '" is disabled'));
}
var mod;
try {
let mod;
try {
mod = require(paths.join(options.path, options.name + '.js'));
} catch(e) {
cb(e);
return cb(e);
}
if(!_.isObject(mod.moduleInfo)) {
cb(new Error('Module is missing "moduleInfo" section'));
return;
return cb(new Error('Module is missing "moduleInfo" section'));
}
if(!_.isFunction(mod.getModule)) {
cb(new Error('Invalid or missing "getModule" method for module!'));
return;
return cb(new Error('Invalid or missing "getModule" method for module!'));
}
// Ref configuration, if any, for convience to the module
@ -53,11 +49,10 @@ function loadModuleEx(options, cb) {
}
function loadModule(name, category, cb) {
var path = Config.paths[category];
const path = Config.paths[category];
if(!_.isString(path)) {
cb(new Error('Not sure where to look for "' + name + '" of category "' + category + '"'));
return;
return cb(new Error(`Not sure where to look for "${name}" of category "${category}"`));
}
loadModuleEx( { name : name, path : path, category : category }, function loaded(err, mod) {