selfhosted
/
dashy
mirror of https://github.com/lissy93/dashy
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

⚡ Refactors console-out into own function

This commit is contained in:
Alicia Sykes 2021-10-24 13:31:48 +01:00
parent e0a7cbdf96
commit 4667642dbe
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
services/config-validator.js
View File

@ -19,6 +19,9 @@ const ajv = new Ajv(validatorOptions);
/* Message printed when validation was successful */ /* Message printed when validation was successful */
const successMsg = () => '\x1b[1m\x1b[32mNo issues found, your configuration is valid :)\x1b[0m\n'; const successMsg = () => '\x1b[1m\x1b[32mNo issues found, your configuration is valid :)\x1b[0m\n';
/* Just a wrapper to system's console.log */
const logToConsole = (msg) => { console.log(msg); };
/* Formats error message. ready for printing to the console */ /* Formats error message. ready for printing to the console */
const errorMsg = (output) => { const errorMsg = (output) => {
const warningFont = '\x1b[103m\x1b[34m'; const warningFont = '\x1b[103m\x1b[34m';
@ -46,14 +49,14 @@ const setIsValidVariable = (isValid) => {
/* Start the validation */ /* Start the validation */
const validate = (config) => { const validate = (config) => {
console.log('\nChecking config file against schema...'); logToConsole('\nChecking config file against schema...');
const valid = ajv.validate(schema, config); const valid = ajv.validate(schema, config);
if (valid) { if (valid) {
setIsValidVariable(true); setIsValidVariable(true);
console.log(successMsg()); logToConsole(successMsg());
} else { } else {
setIsValidVariable(false); setIsValidVariable(false);
console.log(errorMsg(ajv.errors)); logToConsole(errorMsg(ajv.errors));
} }
}; };
@ -62,11 +65,11 @@ try {
validate(config); validate(config);
} catch (e) { // Something went very wrong... } catch (e) { // Something went very wrong...
setIsValidVariable(false); setIsValidVariable(false);
console.log(bigError()); logToConsole(bigError());
console.log('Please ensure that your config file is present, ' logToConsole('Please ensure that your config file is present, '
+ 'has the correct access rights and is parsable. ' + 'has the correct access rights and is parsable. '
+ 'If this warning persists, it may be an issue with the ' + 'If this warning persists, it may be an issue with the '
+ 'validator function. Please raise an issue, and include the following stack trace:\n'); + 'validator function. Please raise an issue, and include the following stack trace:\n');
console.warn('\x1b[33mStack Trace for config-validator.js:\x1b[0m\n', e); console.warn('\x1b[33mStack Trace for config-validator.js:\x1b[0m\n', e);
console.log('\n\n'); logToConsole('\n\n');
} }

10
services/update-checker.js
View File

@ -4,6 +4,10 @@ const currentVersion = require('../package.json').version;
const packageUrl = 'https://raw.githubusercontent.com/Lissy93/dashy/master/package.json'; const packageUrl = 'https://raw.githubusercontent.com/Lissy93/dashy/master/package.json';
const logToConsole = (msg) => {
console.log(msg); // eslint-disable-line no-console
};
const makeMsg = (latestVersion) => { const makeMsg = (latestVersion) => {
const parse = (version) => parseInt(version.replace(/\./g, ''), 10); const parse = (version) => parseInt(version.replace(/\./g, ''), 10);
const difference = parse(latestVersion) - parse(currentVersion); const difference = parse(latestVersion) - parse(currentVersion);
@ -20,9 +24,9 @@ const makeMsg = (latestVersion) => {
axios.get(packageUrl).then((response) => { axios.get(packageUrl).then((response) => {
if (response && response.data && response.data.version) { if (response && response.data && response.data.version) {
console.log(`\nUsing Dashy V-${currentVersion}. Update Check Complete`); logToConsole(`\nUsing Dashy V-${currentVersion}. Update Check Complete`);
console.log(makeMsg(response.data.version)); logToConsole(makeMsg(response.data.version));
} }
}).catch(() => { }).catch(() => {
console.log('Unable to check for updates'); logToConsole('Unable to check for updates');
}); });