tgpholly/Revolution
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #18 from tgpethan/code-order

Browse source 
Code order fix
This commit is contained in:
Ethan Stubbs 2020-01-04 15:13:11 +00:00 committed by GitHub
commit 9bd0eda811
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
index.js
View file

@ -50,17 +50,19 @@ fs.readFile('./misc/ascii.txt', function(err, data) {
if (files[i].includes(".js")) { if (files[i].includes(".js")) {
console.log(`[Modules] Found module ${files[i].toString()}`); console.log(`[Modules] Found module ${files[i].toString()}`);
global.modules[files[i].toString().replace(".js", "")] = require(`./modules/${files[i].toString()}`); global.modules[files[i].toString().replace(".js", "")] = require(`./modules/${files[i].toString()}`);
// We want to find out what the request handler module is
if (global.modules[files[i].toString().replace(".js", "")].MOD_FUNC == "handle_requests") {
// Set reqhandler to the request handler for easy getting
reqhandler = global.modules[files[i].toString().replace(".js", "")];
}
// Loop through and set the required modules flags // Loop through and set the required modules flags
for (var i1 = 0; i1 < requiredModules.length; i1++) { for (var i1 = 0; i1 < requiredModules.length; i1++) {
if (global.modules[files[i].toString().replace(".js", "")].MOD_FUNC == requiredModules[i1].name) { if (global.modules[files[i].toString().replace(".js", "")].MOD_FUNC == requiredModules[i1].name) {
requiredModules[i1].status = true; requiredModules[i1].status = true;
} }
} }
// We want to find out what the request handler module is
if (global.modules[files[i].toString().replace(".js", "")].MOD_FUNC == "handle_requests") {
// Set reqhandler to the request handler for easy getting
reqhandler = global.modules[files[i].toString().replace(".js", "")];
}
} else { } else {
if (files[i].split(".").length < 2) continue; if (files[i].split(".").length < 2) continue;
console.log(`[Modules] Found file ${files[i]}. It is not a module.`) console.log(`[Modules] Found file ${files[i]}. It is not a module.`)
@ -82,12 +84,12 @@ fs.readFile('./misc/ascii.txt', function(err, data) {
process.exit(1); process.exit(1);
} else { } else {
global.modules.consoleHelper.printInfo(emoji.wave, "Starting Revolution..."); global.modules.consoleHelper.printInfo(emoji.wave, "Starting Revolution...");
server(); frameworkServer();
} }
}); });
}); });
function server() { function frameworkServer() {
reqhandler.extras(); reqhandler.extras();
app.get('*', (req, res) => reqhandler.get(req, res)); app.get('*', (req, res) => reqhandler.get(req, res));
app.post('*', (req, res) => reqhandler.post(req, res)); app.post('*', (req, res) => reqhandler.post(req, res));