Restructuring of some code to make it more readable

pull/528/head
Egil Moeller 2012-02-24 19:02:56 +01:00
parent 38e62274bc
commit 168f481980
1 changed files with 58 additions and 44 deletions

View File

@ -30,43 +30,64 @@ exports.update = function (cb) {
}); });
} }
exports.loadFn = function (path) { exports.getPlugins = function (cb) {
var x = path.split(":"); exports.getPackages(function (er, packages) {
var fn = require(x[0]); var parts = {};
x[1].split(".").forEach(function (name) { var plugins = {};
fn = fn[name]; // Load plugin metadata pluginomatic.json
async.forEach(
Object.keys(packages),
function (plugin_name, cb) {
exports.loadPlugin(packages, plugin_name, plugins, parts, cb);
},
function (err) {
parts = exports.sortParts(parts);
var hooks = exports.extractHooks(parts);
cb(err, plugins, parts, hooks);
}
);
}); });
return fn;
} }
exports.getPlugins = function (cb) { exports.getPackages = function (cb) {
// Load list of installed NPM packages, flatten it to a list, and filter out only packages with names that // Load list of installed NPM packages, flatten it to a list, and filter out only packages with names that
// ../.. and not just .. because current dir is like ETHERPAD_ROOT/node/node_modules (!!!!) // ../.. and not just .. because current dir is like ETHERPAD_ROOT/node/node_modules (!!!!)
var dir = path.resolve(npm.dir, "../..") var dir = path.resolve(npm.dir, "../..")
readInstalled(dir, function (er, data) { readInstalled(dir, function (er, data) {
var plugins = {}; if (er) cb(er, null);
var parts = {}; var packages = {};
function flatten(deps) { function flatten(deps) {
Object.keys(deps).forEach(function (name) { Object.keys(deps).forEach(function (name) {
if (name.indexOf(exports.prefix) == 0) { if (name.indexOf(exports.prefix) == 0) {
plugins[name] = deps[name]; packages[name] = deps[name];
} }
if (deps[name].dependencies !== undefined) if (deps[name].dependencies !== undefined)
flatten(deps[name].dependencies); flatten(deps[name].dependencies);
}); });
} }
flatten([data]); flatten([data]);
cb(null, packages);
});
}
// Load plugin metadata pluginomatic.json exports.extractHooks = function (parts) {
async.forEach( var hooks = {};
Object.keys(plugins), parts.forEach(function (part) {
function (plugin_name, cb) { Object.keys(part.hooks || {}).forEach(function (hook_name) {
if (hooks[hook_name] === undefined) hooks[hook_name] = [];
var hook_fn_name = part.hooks[hook_name];
hooks[hook_name].push({"hook": exports.loadFn(part.hooks[hook_name]), "part": part});
});
});
return hooks;
}
exports.loadPlugin = function (packages, plugin_name, plugins, parts, cb) {
fs.readFile( fs.readFile(
path.resolve(plugins[plugin_name].path, "pluginomatic.json"), path.resolve(packages[plugin_name].path, "pluginomatic.json"),
function (er, data) { function (er, data) {
plugin = JSON.parse(data); var plugin = JSON.parse(data);
plugin.package = plugins[plugin_name]; plugin.package = packages[plugin_name];
plugins[plugin_name] = plugin;
plugin.parts.forEach(function (part) { plugin.parts.forEach(function (part) {
part.plugin = plugin; part.plugin = plugin;
part.full_name = plugin_name + "/" + part.name; part.full_name = plugin_name + "/" + part.name;
@ -75,22 +96,6 @@ exports.getPlugins = function (cb) {
cb(); cb();
} }
); );
},
function (err) {
parts = exports.sortParts(parts);
var hooks = {};
parts.forEach(function (part) {
Object.keys(part.hooks || {}).forEach(function (hook_name) {
if (hooks[hook_name] === undefined) hooks[hook_name] = [];
var hook_fn_name = part.hooks[hook_name];
hooks[hook_name].push({"hook": exports.loadFn(part.hooks[hook_name]), "part": part});
});
});
cb(err, plugins, parts, hooks);
}
);
});
} }
exports.partsToParentChildList = function (parts) { exports.partsToParentChildList = function (parts) {
@ -118,3 +123,12 @@ exports.sortParts = function(parts) {
function (name) { return parts[name]; } function (name) { return parts[name]; }
); );
}; };
exports.loadFn = function (path) {
var x = path.split(":");
var fn = require(x[0]);
x[1].split(".").forEach(function (name) {
fn = fn[name];
});
return fn;
}