Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-02 20:16:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

closes #2578

Browse Source
This commit is contained in:
barisusakli
2015-01-06 23:29:48 -05:00
parent f5b758245f
commit b51127bd9c
3 changed files with 53 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/plugins/load.js
View File

@@ -12,20 +12,13 @@ var fs = require('fs'),
module.exports = function(Plugins) {
Plugins.loadPlugin = function(pluginPath, callback) {
fs.readFile(path.join(pluginPath, 'plugin.json'), function(err, data) {
Plugins.loadPluginInfo(pluginPath, function(err, pluginData) {
if (err) {
return callback(pluginPath.match('nodebb-theme') ? null : err);
}
var pluginData, staticDir;
try {
pluginData = JSON.parse(data);
} catch (err) {
var pluginDir = pluginPath.split(path.sep);
pluginDir = pluginDir[pluginDir.length -1];
winston.error('[plugins/' + pluginDir + '] Plugin not loaded - please check its plugin.json for errors');
var staticDir;
if (!pluginData) {
return callback();
}
@@ -88,7 +81,7 @@ module.exports = function(Plugins) {
}
if (!Plugins.libraries[pluginData.id]) {
Plugins.requireLibrary(pluginData, libraryPath);
Plugins.requireLibrary(pluginData.id, libraryPath);
}
if (Array.isArray(pluginData.hooks) && pluginData.hooks.length > 0) {
@@ -198,7 +191,35 @@ module.exports = function(Plugins) {
callback();
});
});
}
Plugins.loadPluginInfo = function(pluginPath, callback) {
async.parallel({
package: function(next) {
fs.readFile(path.join(pluginPath, 'package.json'), next);
},
plugin: function(next) {
fs.readFile(path.join(pluginPath, 'plugin.json'), next);
}
}, function(err, results) {
if (err) {
return callback(err);
}
try {
var pluginData = JSON.parse(results.plugin);
var packageData = JSON.parse(results.package);
var obj = utils.merge(pluginData, packageData);
obj.id = packageData.name;
callback(null, obj);
} catch(err) {
var pluginDir = pluginPath.split(path.sep);
pluginDir = pluginDir[pluginDir.length -1];
winston.error('[plugins/' + pluginDir + '] Error in plugin.json/package.json! ' + err.message);
callback();
}
});
};
};