mirror of
https://github.com/node-red/node-red.git
synced 2025-03-01 10:36:34 +00:00
Remove add/removeNode by filename api
Only support add/remove by module name
This commit is contained in:
@@ -42,9 +42,7 @@ module.exports = {
|
||||
}
|
||||
var node = req.body;
|
||||
var promise;
|
||||
if (node.file) {
|
||||
promise = redNodes.addNode(node.file).then(server.reportAddedModules);
|
||||
} else if (node.module) {
|
||||
if (node.module) {
|
||||
var module = redNodes.getNodeModuleInfo(node.module);
|
||||
if (module) {
|
||||
res.send(400,"Module already loaded");
|
||||
@@ -116,13 +114,7 @@ module.exports = {
|
||||
if (result) {
|
||||
res.send(result);
|
||||
} else {
|
||||
// check if module is actually a node-set
|
||||
var matching = getMatchingNodes(module);
|
||||
if (matching.length > 0) {
|
||||
res.json(matching);
|
||||
} else {
|
||||
res.send(404);
|
||||
}
|
||||
res.send(404);
|
||||
}
|
||||
},
|
||||
|
||||
@@ -164,24 +156,7 @@ module.exports = {
|
||||
var mod = req.params.mod;
|
||||
var module = redNodes.getModuleInfo(mod);
|
||||
if (!module) {
|
||||
var matching = getMatchingNodes(mod);
|
||||
if (matching.length === 1) {
|
||||
// One match, assume correct
|
||||
res.json(putNode(matching[0], body.enabled));
|
||||
return;
|
||||
} else if (matching.length > 1) {
|
||||
// Multiple matches, need clarification
|
||||
result = {
|
||||
multipleMatches: true,
|
||||
matches: matching
|
||||
};
|
||||
res.json(result);
|
||||
return;
|
||||
} else {
|
||||
// Doesn't exist
|
||||
res.send(404);
|
||||
return;
|
||||
}
|
||||
return res.send(404);
|
||||
}
|
||||
|
||||
var nodes = module.nodes;
|
||||
@@ -213,20 +188,6 @@ module.exports = {
|
||||
}
|
||||
};
|
||||
|
||||
function getMatchingNodes(node) {
|
||||
var nodes = redNodes.getNodeList();
|
||||
var matching = [];
|
||||
|
||||
nodes.forEach(function(n) {
|
||||
if (n.name === node) {
|
||||
n.version = redNodes.getModuleVersion(n.module);
|
||||
matching.push(n);
|
||||
}
|
||||
});
|
||||
|
||||
return matching;
|
||||
}
|
||||
|
||||
function putNode(node, enabled) {
|
||||
var info;
|
||||
|
||||
|
@@ -111,9 +111,6 @@ module.exports = {
|
||||
getNode: flows.get,
|
||||
eachNode: flows.eachNode,
|
||||
|
||||
addNode: registry.addNode,
|
||||
removeNode: removeNode,
|
||||
|
||||
addModule: registry.addModule,
|
||||
removeModule: removeModule,
|
||||
|
||||
|
@@ -814,19 +814,6 @@ function loadNodeList(nodes) {
|
||||
});
|
||||
}
|
||||
|
||||
function addNode(file) {
|
||||
if (!settings.available()) {
|
||||
throw new Error("Settings unavailable");
|
||||
}
|
||||
var nodes = [];
|
||||
try {
|
||||
nodes.push(loadNodeConfig(file,"node-red",path.basename(file).replace(/^\d+-/,"").replace(/\.js$/,""),settings.version));
|
||||
} catch(err) {
|
||||
return when.reject(err);
|
||||
}
|
||||
return loadNodeList(nodes);
|
||||
}
|
||||
|
||||
function addModule(module) {
|
||||
if (!settings.available()) {
|
||||
throw new Error("Settings unavailable");
|
||||
@@ -866,8 +853,6 @@ module.exports = {
|
||||
getNodeConfigs: registry.getAllNodeConfigs,
|
||||
getNodeConfig: registry.getNodeConfig,
|
||||
|
||||
addNode: addNode,
|
||||
removeNode: registry.removeNode,
|
||||
enableNode: registry.enableNodeSet,
|
||||
disableNode: registry.disableNodeSet,
|
||||
|
||||
|
Reference in New Issue
Block a user