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

#2111

Browse Source 
need latest version from api
This commit is contained in:
barisusakli
2014-10-09 13:50:25 -04:00
parent 206b54c35d
commit cb934acb5d
2 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/plugins.js
View File

@@ -640,19 +640,18 @@ var fs = require('fs'),
async.each(installedPlugins, function(plugin, next) { async.each(installedPlugins, function(plugin, next) {
pluginMap[plugin.id] = pluginMap[plugin.id] || {}; pluginMap[plugin.name] = pluginMap[plugin.name] || {};
pluginMap[plugin.id].id = pluginMap[plugin.id].id || plugin.id; pluginMap[plugin.name].id = pluginMap[plugin.name].id || plugin.name;
pluginMap[plugin.id].name = pluginMap[plugin.id].name || plugin.id; pluginMap[plugin.name].name = pluginMap[plugin.name].name || plugin.name;
pluginMap[plugin.id].description = plugin.description; pluginMap[plugin.name].description = plugin.description;
pluginMap[plugin.id].url = pluginMap[plugin.id].url || plugin.url; pluginMap[plugin.name].url = pluginMap[plugin.name].url || plugin.url;
pluginMap[plugin.id].installed = true; pluginMap[plugin.name].installed = true;
pluginMap[plugin.name].active = plugin.active;
pluginMap[plugin.name].version = plugin.version;
Plugins.isActive(plugin.id, function(err, active) { getVersion(plugin.name, function(err, version) {
if (err) { pluginMap[plugin.name].latest = version;
return next(err); pluginMap[plugin.name].outdated = version !== pluginMap[plugin.name].version;
}
pluginMap[plugin.id].active = active;
next(); next();
}); });
}, function(err) { }, function(err) {
@@ -683,6 +682,19 @@ var fs = require('fs'),
}); });
}; };
function getVersion(name, callback) {
var npm = require('npm');
npm.load({}, function() {
npm.commands.show([name, 'version'], true, function(err, version) {
if (err || !version) {
return callback(null, 'no version');
}
var obj = Object.keys(version);
callback(null, Array.isArray(obj) && obj.length ? obj[0] : 'no version');
});
});
}
Plugins.isInstalled = function(id, callback) { Plugins.isInstalled = function(id, callback) {
var pluginDir = path.join(__dirname, '../node_modules', id); var pluginDir = path.join(__dirname, '../node_modules', id);
@@ -725,7 +737,7 @@ var fs = require('fs'),
async.waterfall([ async.waterfall([
function(next) { function(next) {
fs.readFile(path.join(file, 'plugin.json'), next); fs.readFile(path.join(file, 'package.json'), next);
}, },
function(configJSON, next) { function(configJSON, next) {
var config; var config;
@@ -737,13 +749,12 @@ var fs = require('fs'),
return next(err, null); return next(err, null);
} }
Plugins.isActive(config.id, function(err, active) { Plugins.isActive(config.name, function(err, active) {
if (err) { if (err) {
next(new Error('no-active-state')); next(new Error('no-active-state'));
} }
delete config.library;
delete config.hooks;
config.active = active; config.active = active;
config.installed = true; config.installed = true;

1
src/views/admin/extend/plugins.tpl
View File

@@ -18,6 +18,7 @@
<!-- IF plugins.description --> <!-- IF plugins.description -->
<p>{plugins.description}</p> <p>{plugins.description}</p>
<!-- ENDIF plugins.description --> <!-- ENDIF plugins.description -->
<!-- IF plugins.outdated --><i class="fa fa-exclamation-triangle text-danger"></i> <!-- ENDIF plugins.outdated --><small>Installed <strong>{plugins.version}</strong> | Latest <strong>{plugins.latest}</strong></small>
<!-- IF plugins.url --> <!-- IF plugins.url -->
<p>For more information: <a href="{plugins.url}">{plugins.url}</a></p> <p>For more information: <a href="{plugins.url}">{plugins.url}</a></p>
<!-- ENDIF plugins.url --> <!-- ENDIF plugins.url -->