Skip to content
This repository has been archived by the owner on Aug 27, 2018. It is now read-only.

More reload fixes/additions #79

Merged
merged 3 commits into from
Nov 25, 2016
Merged

More reload fixes/additions #79

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
29d4707
Command Reload - removed useless msg variables
UnseenFaith Nov 25, 2016
8576cf0
Function Reload - Now able to load new pieces
UnseenFaith Nov 25, 2016
4459fd7
Fixed Bitwise and bumped no-nested-tern to warning
UnseenFaith Nov 25, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions commands/System/reload.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,46 +2,46 @@ exports.run = (client, msg, [type, name]) => {
switch (type) {
case "function":
msg.channel.sendMessage(`Attemping to reload function ${name}`).then((m) => {
client.funcs.reload.function(client, msg, client.clientBaseDir, name).then(() => {
m.edit(`:white_check_mark: Succesfully reloaded function ${name}`);
client.funcs.reload.function(client, client.clientBaseDir, name).then((message) => {
m.edit(`:white_check_mark: ${message}`);
}).catch((e) => {
m.edit(e);
m.edit(`:x: ${e}`);
});
});
break;
case "inhibitor":
msg.channel.sendMessage(`Attempting to reload inhibitor ${name}`).then((m) => {
client.funcs.reload.inhibitor(client, msg, client.clientBaseDir, name).then(() => {
m.edit(`:white_check_mark: Succesfully reloaded inhibitor ${name}`);
client.funcs.reload.inhibitor(client, client.clientBaseDir, name).then((message) => {
m.edit(`:white_check_mark: ${message}`);
}).catch((e) => {
m.edit(e);
m.edit(`:x: ${e}`);
});
});
break;
case "monitor":
msg.channel.sendMessage(`Attempting to reload monitor ${name}`).then((m) => {
client.funcs.reload.monitor(client, msg, client.clientBaseDir, name).then(() => {
m.edit(`:white_check_mark: Succesfully reloaded monitor ${name}`);
client.funcs.reload.monitor(client, client.clientBaseDir, name).then((message) => {
m.edit(`:white_check_mark: ${message}`);
}).catch((e) => {
m.edit(e);
m.edit(`:x: ${e}`);
});
});
break;
case "provider":
msg.channel.sendMessage(`Attempting to reload provider ${name}`).then((m) => {
client.funcs.reload.provider(client, msg, client.clientBaseDir, name).then(() => {
m.edit(`:white_check_mark: Succesfully reloaded provider ${name}`);
client.funcs.reload.provider(client, client.clientBaseDir, name).then((message) => {
m.edit(`:white_check_mark: ${message}`);
}).catch((e) => {
m.edit(e);
m.edit(`:x: ${e}`);
});
});
break;
case "event":
msg.channel.sendMessage(`Attempting to reload event ${name}`).then((m) => {
client.funcs.reload.event(client, msg, name).then(() => {
m.edit(`:white_check_mark: Succesfully reloaded event ${name}`);
client.funcs.reload.event(client, name).then((message) => {
m.edit(`:white_check_mark: ${message}`);
}).catch((e) => {
m.edit(e);
m.edit(`:x: ${e}`);
});
});
break;
Expand All @@ -53,10 +53,10 @@ exports.run = (client, msg, [type, name]) => {
break;
default:
msg.channel.sendMessage(`Attempting to reload command ${name}`).then((m) => {
client.funcs.reload.command(client, msg, client.clientBaseDir, name).then(() => {
m.edit(`:white_check_mark: Succesfully reloaded command ${name}`);
client.funcs.reload.command(client, client.clientBaseDir, name).then((message) => {
m.edit(`:white_check_mark: ${message}`);
}).catch((e) => {
m.edit(e);
m.edit(`:x: ${e}`);
});
});
break;
Expand Down
203 changes: 153 additions & 50 deletions functions/reload.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,36 +1,61 @@
const path = require("path");

exports.function = (client, msg, dir, funcName) => new Promise((resolve, reject) => {
if (client.funcs.hasOwnProperty(funcName)) {
client.funcs.getFileListing(client, dir, "functions").then((files) => {
exports.function = (client, dir, funcName) => new Promise((resolve, reject) => {
client.funcs.getFileListing(client, dir, "functions").then((files) => {
if (client.funcs.hasOwnProperty(funcName)) {
const oldFunction = files.filter(f => f.name === funcName);
if (oldFunction[0]) {
client.funcs[funcName] = "";
try {
oldFunction.forEach((file) => {
client.funcs[funcName] = "";
delete require.cache[require.resolve(`${file.path}${path.sep}${file.base}`)];
client.funcs[funcName] = require(`${file.path}${path.sep}${file.base}`);
if (client.funcs[funcName].init) {
client.funcs[funcName].init(client);
}
});
} catch (error) {
reject(`:x: ${error}`);
reject(error);
return;
}
resolve();
resolve(`Succesfully reloaded the function ${funcName}.`);
} else {
reject(`:x: The function **${funcName}** does not reside in ${dir}functions`);
reject(`The function **${funcName}** does not reside in ${dir}functions`);
}
});
} else {
reject(`:x: The function **${funcName}** does not seem to exist!`);
}
} else {
const newFunction = files.filter(f => f.name === funcName);
if (newFunction[0]) {
try {
newFunction.forEach((file) => {
client.funcs[funcName] = require(`${file.path}${path.sep}${file.base}`);
if (client.funcs[funcName].init) {
client.funcs[funcName].init(client);
}
});
resolve(`Succesfully loaded a new function called ${funcName}.`);
} catch (error) {
if (error.code === "MODULE_NOT_FOUND") {
const module = /'[^']+'/g.exec(error.toString());
client.funcs.installNPM(module[0].slice(1, -1)).then(() => {
client.funcs.reload.function(client, dir, funcName);
}).catch((e) => {
console.error(e);
process.exit();
});
} else {
reject(`Could not load new function data: ${error}`);
}
}
} else {
reject(`Could not locate a new function ${funcName} in ${dir}functions`);
}
}
});
});

exports.inhibitor = (client, msg, dir, inhibName) => new Promise((resolve, reject) => {
if (client.commandInhibitors.has(inhibName)) {
client.funcs.getFileListing(client, dir, "inhibitors").then((files) => {
exports.inhibitor = (client, dir, inhibName) => new Promise((resolve, reject) => {
client.funcs.getFileListing(client, dir, "inhibitors").then((files) => {
if (client.commandInhibitors.has(inhibName)) {
const oldInhibitor = files.filter(f => f.name === inhibName);
if (oldInhibitor[0]) {
try {
Expand All @@ -44,22 +69,48 @@ exports.inhibitor = (client, msg, dir, inhibName) => new Promise((resolve, rejec
}
});
} catch (error) {
reject(`:x: ${error}`);
reject(error);
return;
}
resolve();
resolve(`Succesfully reloaded the inhibitor ${inhibName}`);
} else {
reject(`:x: The inhibitor **${inhibName}** does not seem to reside in ${dir}inhibitors`);
reject(`The inhibitor **${inhibName}** does not seem to reside in ${dir}inhibitors`);
}
});
} else {
reject(`:x: The inhibitor **${inhibName}** does not seem to exist!`);
}
} else {
const newInhibitor = files.filter(f => f.name === inhibName);
if (newInhibitor[0]) {
try {
newInhibitor.forEach((file) => {
const props = require(`${file.path}${path.sep}${file.base}`);
client.commandInhibitors.set(file.name, props);
if (props.init) {
props.init(client);
}
});
resolve(`Succesfully loaded a new inhibitor called ${inhibName}.`);
} catch (error) {
if (error.code === "MODULE_NOT_FOUND") {
const module = /'[^']+'/g.exec(error.toString());
client.funcs.installNPM(module[0].slice(1, -1)).then(() => {
client.funcs.reload.inhibitor(client, dir, inhibName);
}).catch((e) => {
console.error(e);
process.exit();
});
} else {
reject(`Could not load new inhibitor data: ${error}`);
}
}
} else {
reject(`Could not locate a new inhibitor ${inhibName} in ${dir}inhibitors`);
}
}
});
});

exports.monitor = (client, msg, dir, monitName) => new Promise((resolve, reject) => {
if (client.commandMonitors.has(monitName)) {
client.funcs.getFileListing(client, dir, "monitors").then((files) => {
exports.monitor = (client, dir, monitName) => new Promise((resolve, reject) => {
client.funcs.getFileListing(client, dir, "monitors").then((files) => {
if (client.commandMonitors.has(monitName)) {
const oldMonitor = files.filter(f => f.name === monitName);
if (oldMonitor[0]) {
try {
Expand All @@ -73,22 +124,48 @@ exports.monitor = (client, msg, dir, monitName) => new Promise((resolve, reject)
}
});
} catch (error) {
reject(`:x: ${error}`);
reject(error);
return;
}
resolve();
resolve(`Succesfully reloaded the monitor ${monitName}.`);
} else {
reject(`:x: The monitor **${monitName}** does not reside in ${dir}monitors`);
reject(`The monitor **${monitName}** does not reside in ${dir}monitors`);
}
});
} else {
reject(`:x: The monitor **${monitName}** does not seem to exist!`);
}
} else {
const newMonitor = files.filter(f => f.name === monitName);
if (newMonitor[0]) {
try {
newMonitor.forEach((file) => {
const props = require(`${file.path}${path.sep}${file.base}`);
client.commandMonitors.set(file.name, props);
if (props.init) {
props.init(client);
}
});
resolve(`Succesfully loaded a new monitor called ${monitName}.`);
} catch (error) {
if (error.code === "MODULE_NOT_FOUND") {
const module = /'[^']+'/g.exec(error.toString());
client.funcs.installNPM(module[0].slice(1, -1)).then(() => {
client.funcs.reload.monitor(client, dir, monitName);
}).catch((e) => {
console.error(e);
process.exit();
});
} else {
reject(`Could not load new monitor data: ${error}`);
}
}
} else {
reject(`Could not locate a new monitor ${monitName} in ${dir}monitors`);
}
}
});
});

exports.provider = (client, msg, dir, providerName) => new Promise((resolve, reject) => {
if (client.dataProviders.has(providerName)) {
client.funcs.getFileListing(client, dir, "dataProviders").then((files) => {
exports.provider = (client, dir, providerName) => new Promise((resolve, reject) => {
client.funcs.getFileListing(client, dir, "dataProviders").then((files) => {
if (client.dataProviders.has(providerName)) {
const oldProvider = files.filter(f => f.name === providerName);
if (oldProvider[0]) {
try {
Expand All @@ -102,20 +179,46 @@ exports.provider = (client, msg, dir, providerName) => new Promise((resolve, rej
}
});
} catch (error) {
reject(`:x: ${error}`);
reject(error);
return;
}
resolve();
resolve(`Succesfully reloaded the provider ${providerName}.`);
} else {
reject(`:x: The provider **${providerName}** does not seem to reside in ${dir}dataProviders`);
reject(`The provider **${providerName}** does not seem to reside in ${dir}dataProviders`);
}
});
} else {
reject(`:x: The provider **${providerName}** does not seem to exist!`);
}
} else {
const newProvider = files.filter(f => f.name === providerName);
if (newProvider[0]) {
try {
newProvider.forEach((file) => {
const props = require(`${file.path}${path.sep}${file.base}`);
client.dataProviders.set(file.name, props);
if (props.init) {
props.init(client);
}
});
resolve(`Succesfully loaded a new provider called ${providerName}.`);
} catch (error) {
if (error.code === "MODULE_NOT_FOUND") {
const module = /'[^']+'/g.exec(error.toString());
client.funcs.installNPM(module[0].slice(1, -1)).then(() => {
client.funcs.reload.provider(client, dir, providerName);
}).catch((e) => {
console.error(e);
process.exit();
});
} else {
reject(`Could not load new provider data: ${error}`);
}
}
} else {
reject(`Could not locate a new provider ${providerName} in ${dir}providers`);
}
}
});
});

exports.event = (client, msg, eventName) => new Promise((resolve, reject) => {
exports.event = (client, eventName) => new Promise((resolve, reject) => {
client.funcs.getFileListing(client, client.clientBaseDir, "events").then((files) => {
const oldEvent = files.filter(f => f.name === eventName);
if (oldEvent[0] && oldEvent[0].name === eventName) {
Expand All @@ -132,17 +235,17 @@ exports.event = (client, msg, eventName) => new Promise((resolve, reject) => {
client.on(file.name, (...args) => require(`${file.path}${path.sep}${file.base}`).run(client, ...args));
});
} catch (error) {
reject(`:x: ${error}`);
reject(error);
return;
}
resolve();
resolve(`Sucesfully reloaded the event ${eventName}`);
} else {
reject(`:x: The event **${eventName}** does not seem to exist!`);
reject(`The event **${eventName}** does not seem to exist!`);
}
});
});

exports.command = (client, msg, commandName) => new Promise((resolve, reject) => {
exports.command = (client, dir, commandName) => new Promise((resolve, reject) => {
let command;
if (client.commands.has(commandName)) {
command = commandName;
Expand All @@ -156,18 +259,18 @@ exports.command = (client, msg, commandName) => new Promise((resolve, reject) =>
newCommands.forEach((file) => {
client.funcs.loadSingleCommand(client, command, false, `${file.path}${path.sep}${file.base}`)
.catch((e) => {
reject(`:x: ${e}`);
reject(e);
});
});
});
resolve();
resolve(`Succesully loaded a new command called ${commandName}`);
} else {
client.funcs.loadSingleCommand(client, command, true)
.then(() => {
resolve();
resolve(`Succesfully reloaded the command ${commandName}`);
})
.catch((e) => {
reject(`:x: ${e}`);
reject(e);
});
}
});