Updated 3 files (automated)

3 files changed, 43 insertions, 20 deletions

diff --git a/main.js b/main.js
index b3b1556..563e5a9 100644
--- a/main.js
+++ b/main.js
@@ -4,30 +4,42 @@ const fs = require("fs");
 const { Client } = require('@xhayper/discord-rpc');
 
 function loadDiscord() {
-    global.discord = new Client({
-        clientId: "1136028963903385610"
-    });
+    try {
+        global.discord = new Client({
+            clientId: "1136028963903385610"
+        });
 
-    discord.on("ready", () => {
-        setInterval(() => {
-            refreshDiscord(discord);
-        }, 15000);
-    });
+        discord.on("ready", () => {
+            setInterval(() => {
+                refreshDiscord(discord);
+            }, 15000);
+        });
 
-    discord.login();
+        discord.login();
+    } catch (e) {
+        loadDiscord();
+    }
 }
 
 let discordData = null;
 
 function refreshDiscord(discord) {
-    if (discordData === null) {
-        discord.user.clearActivity();
-    } else {
-        discord.user.setActivity(discordData);
+    try {
+        if (discordData === null) {
+            discord.user.clearActivity();
+        } else {
+            discord.user.setActivity(discordData);
+        }
+    } catch (e) {
+        loadDiscord();
     }
 }
 
-loadDiscord();
+try {
+    loadDiscord();
+} catch (e) {
+    loadDiscord();
+}
 
 app.disableHardwareAcceleration();
 let lastID = "";
@@ -86,20 +98,29 @@ async function refresh() {
 
         let albumArt = "https://cdn.discordapp.com/app-icons/1136028963903385610/9f14e1a37ee238abd3c5f28a8f083daf.png";
         let query = "?query=" + encodeURIComponent(`"${data.albumArtist}" "${data.album}"`) + "&limit=1&fmt=json";
+        let musicbrainzData;
 
-        let musicbrainzData = await (await fetch("https://musicbrainz.org/ws/2/release-group" + query)).json();
+        try {
+            musicbrainzData = await (await fetch("https://musicbrainz.org/ws/2/release-group" + query)).json();
+        } catch (e) {
+            musicbrainzData = {};
+        }
 
-        if (musicbrainzData['release-groups'].length > 0) {
+        if (musicbrainzData['release-groups'] && musicbrainzData['release-groups'].length > 0) {
             let id = musicbrainzData['release-groups'][0].id;
-            let coverData = await (await fetch("https://coverartarchive.org/release-group/" + id + "/")).json();
+            let coverData;
 
-            if (coverData['images'].length > 0) {
+            try {
+                coverData = await (await fetch("https://coverartarchive.org/release-group/" + id + "/")).json();
+            } catch (e) {
+                coverData = {};
+            }
+
+            if (coverData.images && coverData.images.length > 0) {
                 albumArt = coverData['images'][0]['thumbnails']['250'] ?? coverData['images'][0]['image'];
             }
         }
 
-        console.log(data);
-
         discordData = {
             details: data.name,
             state: data.artist,
@@ -110,6 +131,8 @@ async function refresh() {
 
         lastID = data['persistentID'];
     } catch (e) {
+        console.error(e);
+
         tray.setTitle("");
         tray.setImage(__dirname + "/tray/empty.png");
         lastID = null;
diff --git a/scripts/art.scpt b/scripts/art.scpt
index 0b71054..7ac5027 100644
--- a/scripts/art.scpt
+++ b/scripts/art.scpt
diff --git a/tray/16x16@2x.jpg b/tray/16x16@2x.jpg
index c96b8d5..a2215fc 100644
--- a/tray/16x16@2x.jpg
+++ b/tray/16x16@2x.jpg