From 8b64b70be49541d5e93b8cdd518cbe6ee30d12eb Mon Sep 17 00:00:00 2001 From: dbroqua Date: Thu, 19 Dec 2019 10:29:17 +0100 Subject: [PATCH] Added colors in verbose --- config.js | 29 ++++++++++++++++++++++++++++- index.js | 6 +++--- libs.js | 15 +++++++-------- 3 files changed, 38 insertions(+), 12 deletions(-) diff --git a/config.js b/config.js index b96d5b4..d3848cf 100644 --- a/config.js +++ b/config.js @@ -5,5 +5,32 @@ module.exports = { mastondonApi: process.env.mastondonApi || 'https://mamot.fr/api/v1/', discogsToken: process.env.discogsToken, delay: process.env.delay || 4000, - rx3List: ['Rx3', 'REAL REBEL RADIO', 'REAL REBEL RADIO homemade'] + rx3List: ['Rx3', 'REAL REBEL RADIO', 'REAL REBEL RADIO homemade'], + colors: { + Reset: '\x1b[0m', + Bright: '\x1b[1m', + Dim: '\x1b[2m', + Underscore: '\x1b[4m', + Blink: '\x1b[5m', + Reverse: '\x1b[7m', + Hidden: '\x1b[8m', + + FgBlack: '\x1b[30m', + FgRed: '\x1b[31m', + FgGreen: '\x1b[32m', + FgYellow: '\x1b[33m', + FgBlue: '\x1b[34m', + FgMagenta: '\x1b[35m', + FgCyan: '\x1b[36m', + FgWhite: '\x1b[37m', + + BgBlack: '\x1b[40m', + BgRed: '\x1b[41m', + BgGreen: '\x1b[42m', + BgYellow: '\x1b[43m', + BgBlue: '\x1b[44m', + BgMagenta: '\x1b[45m', + BgCyan: '\x1b[46m', + BgWhite: '\x1b[47m' + } } diff --git a/index.js b/index.js index 0ede917..f6f03f2 100644 --- a/index.js +++ b/index.js @@ -9,7 +9,7 @@ setInterval(() => { // On récupére en base le précédent morceau joué libs.getLastSong((err, last) => { if (err) { - console.log('[ERR] GET LAST SONG:', moment().format(), err) + console.log(config.colors.FgRed, '[ERR] GET LAST SONG:', moment().format(), err, config.colors.Reset) return false } @@ -20,14 +20,14 @@ setInterval(() => { // On sauvegarde en base le morceau en cours de diffusion libs.saveSong(currentSong, (err, savedSond) => { if (err) { - console.log('[ERR] SAVE SONG:', moment().format(), err) + console.log(config.colors.FgRed, '[ERR] SAVE SONG:', moment().format(), err, config.colors.Reset) return false } // On récupère la cover du morceau actuel libs.findCover(currentSong, (err, coverUrl) => { if (err) { - console.log('[ERR] FIND COVER:', moment().format(), err) + console.log(config.colors.FgRed, '[ERR] FIND COVER:', moment().format(), err, config.colors.Reset) return false } diff --git a/libs.js b/libs.js index a0e131d..816caa8 100644 --- a/libs.js +++ b/libs.js @@ -32,7 +32,7 @@ const saveSong = (values, callback) => { last.length === 0 || (last[0] !== undefined && last[0].id !== values.id) ) { - console.log('[INFO][saveSong] song not found:', values.title, values.artist) + console.log(config.colors.FgBlue, '[INFO][saveSong] song not found:', values.title, values.artist, config.colors.Reset) const history = new mongo.Histories(values) history.save(callback) @@ -73,7 +73,7 @@ const getRemoteCover = (song, callback) => { dis.search({ q: song.album, artist: song.artist, page: 1, per_page: 1 }, (err, res) => { if (err) { - console.log('ERR:', err) + console.log(config.colors.FgRed, 'ERR:', err, config.colors.Reset) callback(err) return false } @@ -82,7 +82,7 @@ const getRemoteCover = (song, callback) => { if (res.results && res.results.length === 1) { callback(null, res.results[0].cover_image) } else { - console.log('[INFO] No cover found for:', song.album, song.artist) + console.log(config.colors.FgBlue, '[INFO] No cover found for:', song.album, song.artist, config.colors.Reset) callback(null, null) } }) @@ -115,7 +115,7 @@ const findCover = (song, callback) => { if (metadata) { // On a déjà une pochette pour ce morceau if (metadata.cover) { - console.log('[INFO][findCover] cover exists:', metadata.cover) + console.log(config.colors.FgBlue, '[INFO][findCover] cover exists:', metadata.cover, config.colors.Reset) callback(null, metadata.cover) return true @@ -127,7 +127,7 @@ const findCover = (song, callback) => { callback(err) return false } - console.log('[INFO][findCover] cover does not exists but found on discogs:', coverUrl) + console.log(config.colors.FgBlue, '[INFO][findCover] cover does not exists but found on discogs:', coverUrl, config.colors.Reset) metadata.updateOne({ cover: coverUrl }) callback(null, coverUrl) }) @@ -137,7 +137,7 @@ const findCover = (song, callback) => { callback(err) return false } - console.log('[INFO][findCover] cover does not exists but found on discogs (2):', coverUrl) + console.log(config.colors.FgBlue, '[INFO][findCover] cover does not exists but found on discogs (2):', coverUrl, config.colors.Reset) song.cover = coverUrl const metadata = new mongo.Metadata(song) @@ -170,7 +170,6 @@ const getStream = (callback) => { } if (res !== null && res.artist !== undefined && res.title !== undefined) { - console.log('[INFO][getStream] CURRENT SONG:', res.title, res.artist) callback(null, res) } else { error = true @@ -205,7 +204,7 @@ const getMedia = (coverUrl, callback) => { callback(null, dest) }) .on('error', (error) => { - console.log('ERR:', error) + console.log(config.colors.FgRed, 'ERR:', error, config.colors.Reset) callback(error) }) }