Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-29 18:16:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

read both

Browse Source
This commit is contained in:
barisusakli
2014-10-09 17:31:47 -04:00
parent 00ff032060
commit 97b9ba983c
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/plugins.js
View File

@@ -649,7 +649,7 @@ var fs = require('fs'),
pluginMap[plugin.name].active = plugin.active;
pluginMap[plugin.name].version = plugin.version;
getVersion(plugin.name, function(err, version) {
getVersion(plugin.id, function(err, version) {
pluginMap[plugin.name].latest = version;
pluginMap[plugin.name].outdated = version !== pluginMap[plugin.name].version;
next();
@@ -737,28 +737,38 @@ var fs = require('fs'),
async.waterfall([
function(next) {
fs.readFile(path.join(file, 'package.json'), next);
async.parallel({
packageJSON: function(next) {
fs.readFile(path.join(file, 'package.json'), next);
},
pluginJSON: function(next) {
fs.readFile(path.join(file, 'plugin.json'), next);
}
}, next);
},
function(configJSON, next) {
var config;
function(results, next) {
var packageInfo, pluginInfo;
try {
config = JSON.parse(configJSON);
packageInfo = JSON.parse(results.packageJSON);
pluginInfo = JSON.parse(results.pluginJSON);
} catch (err) {
winston.warn("Plugin: " + file + " is corrupted or invalid. Please check plugin.json for errors.");
return next(err, null);
}
Plugins.isActive(config.name, function(err, active) {
Plugins.isActive(packageInfo.name, function(err, active) {
if (err) {
next(new Error('no-active-state'));
}
delete pluginInfo.hooks;
delete pluginInfo.library;
pluginInfo.active = active;
pluginInfo.installed = true;
pluginInfo.version = packageInfo.version;
config.active = active;
config.installed = true;
next(null, config);
next(null, pluginInfo);
});
}
], function(err, config) {