fez5587/Superalgos
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reading Scripts From Cloud now Working

Browse Source
This commit is contained in:
Luis Fernando Molina committed 2018-05-25 07:47:23 +02:00
1 parent f334959095
commit 9a8db614ea
3 files changed
+21 -23
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Server/BotsScripts.js
+14 -14
View File
@@ -83,11 +83,11 @@
}
}
function getCommons(pDevTeam, pBot, callBack) {
function getCommons(pDevTeam, pRepo, callBack) {
let moduleName = "Commons.js";
let key = pDevTeam + "." + pBot;
let path = pDevTeam + "/" + pBot;
let key = pDevTeam + "." + pRepo;
let path = pDevTeam + "/" + pRepo;
switch (serverConfig.configAndPlugins.Location) {
@@ -95,7 +95,7 @@
if (CONSOLE_LOG === true) { console.log("[INFO] BotScripts -> retrieveScripts -> Cloud -> Entering Case."); }
storage.getStorageData(pDevTeam, pBot, moduleName, onDataArrived);
storage.getStorageData(pDevTeam, pRepo, moduleName, onDataArrived);
function onDataArrived(pData) {
@@ -110,7 +110,7 @@
data = browserify(data);
fileSystemData.set(key, data);
storageData.set(key, data);
}
@@ -183,7 +183,7 @@
data = browserify(data);
fileSystemData.set(key, data);
githubData.set(key, data);
}
@@ -199,11 +199,11 @@
}
}
function getUserBot(pDevTeam, pBot, pProcess, callBack) {
function getUserBot(pDevTeam, pRepo, pProcess, callBack) {
let moduleName = "User.Bot.js";
let key = pDevTeam + "." + pBot + "." + pProcess;
let path = pDevTeam + "/" + pBot + "/" + pProcess;
let key = pDevTeam + "." + pRepo + "." + pProcess + "/" + moduleName;
let path = pProcess + "/" + moduleName;
switch (serverConfig.configAndPlugins.Location) {
@@ -211,7 +211,7 @@
if (CONSOLE_LOG === true) { console.log("[INFO] BotScripts -> retrieveScripts -> Cloud -> Entering Case."); }
storage.getStorageData(pDevTeam, pBot, moduleName, onDataArrived);
storage.getStorageData(pDevTeam, pRepo, path, onDataArrived);
function onDataArrived(pData) {
@@ -226,7 +226,7 @@
data = browserify(data);
fileSystemData.set(key, data);
storageData.set(key, data);
}
@@ -247,7 +247,7 @@
let fs = require('fs');
try {
let fileName = '../Bots/' + path + "/" + moduleName;
let fileName = '../Bots/' + pDevTeam + pRepo + path + "/" + moduleName;
fs.readFile(fileName, onFileRead);
function onFileRead(err, pData) {
@@ -286,7 +286,7 @@
if (CONSOLE_LOG === true) { console.log("[INFO] BotScripts -> retrieveScripts -> Github -> Entering Case."); }
github.getGithubData(path, moduleName, onDataArrived);
github.getGithubData(pDevTeam, pRepo, path, onDataArrived);
function onDataArrived(pData) {
@@ -299,7 +299,7 @@
data = browserify(data);
fileSystemData.set(key, data);
githubData.set(key, data);
}
Server/Storage.js
+3 -3
View File
@@ -76,9 +76,9 @@
if (err !== null || text === null) {
console.log("[ERROR] Storage -> getStorageData -> onFileReceived -> Error Received from Storage Library. ");
console.log("[ERROR] Storage -> getStorageData -> onFileReceived -> err = " + JSON.stringify(err));
console.log("[ERROR] Storage -> getStorageData -> onFileReceived -> Returning an empty JSON object string. ");
if (CONSOLE_LOG === true) { console.log("[ERROR] Storage -> getStorageData -> onFileReceived -> Error Received from Storage Library. "); }
if (CONSOLE_LOG === true) { console.log("[ERROR] Storage -> getStorageData -> onFileReceived -> err = " + JSON.stringify(err)); }
if (CONSOLE_LOG === true) { console.log("[ERROR] Storage -> getStorageData -> onFileReceived -> Returning an empty JSON object string. "); }
callBackFunction("{}");
return;
server.js
+4 -6
View File
@@ -456,8 +456,6 @@ function onBrowserRequest(request, response) {
if (CONSOLE_LOG === true) { console.log("[INFO] server -> onBrowserRequest -> readEcosystemConfig -> Github -> Entering Case."); }
github.getGithubData(requestParameters[2], requestParameters[3], requestParameters[4], onDataArrived);
map = githubData;
break;
}
@@ -515,19 +513,19 @@ function onBrowserRequest(request, response) {
let key;
if (requestParameters[4] !== undefined) {
if (requestParameters[5] !== undefined) {
key = requestParameters[2] + "." + requestParameters[3] + "." + requestParameters[4];
key = requestParameters[2] + "." + requestParameters[3] + "." + requestParameters[4] + "/" + requestParameters[5];
} else {
key = requestParameters[2] + "." + requestParameters[3];
key = requestParameters[2] + "." + requestParameters[3] + "." + requestParameters[4];
}
let script = map.get(key);
if (script !== undefined) {
if (script !== undefined && script !== null) {
respondWithContent(script, response);