Improve message handling

Inrixia · Jun 20, 2024 · fe67c34 · fe67c34
1 parent c2bff0e
commit fe67c34
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 17 deletions.
diff --git a/lib/messageLogging.ts b/lib/messageLogging.ts
@@ -1,8 +1,9 @@
 import { actions } from "@neptune";
 
-export const messageError = (message: string) => {
-	console.error(message);
-	actions.message.messageError({ message, category: "OTHER", severity: "ERROR" });
+export const messageError = (message: string) => (error?: Error) => {
+	console.error(message, error);
+	const errMessage = error ? `${message} - ${error.message}` : message;
+	actions.message.messageError({ message: errMessage, category: "OTHER", severity: "ERROR" });
 };
 export const messageWarn = (message: string) => {
 	console.warn(message);

diff --git a/plugins/LastFM/src/index.ts b/plugins/LastFM/src/index.ts
@@ -27,7 +27,7 @@ const updateNowPlaying = async (playbackContext?: PlaybackContext) => {
 	const nowPlayingParams = await getTrackParams(currentTrack);
 	console.log("[last.fm] updatingNowPlaying", nowPlayingParams);
 	return LastFM.updateNowPlaying(nowPlayingParams)
-		.catch((err) => messageError(`last.fm - Failed to updateNowPlaying! ${err}`))
+		.catch(messageError(`last.fm - Failed to updateNowPlaying!`))
 		.then((res) => console.log("[last.fm] updatedNowPlaying", res));
 };
 
@@ -56,14 +56,13 @@ const intercepters = [
 				getTrackParams(currentTrack).then((scrobbleParams) => {
 					console.log("[last.fm] scrobbling", scrobbleParams);
 					LastFM.scrobble(scrobbleParams)
-						.catch((err) => messageError(`last.fm - Failed to scrobble! ${err}`))
+						.catch(messageError(`last.fm - Failed to scrobble!`))
 						.then((res) => console.log("[last.fm] scrobbled", res));
 				});
 			} else {
 				const trackTitle = currentTrack.extTrackItem.trackItem()?.title;
 				const noScrobbleMessage = `skipped scrobbling ${trackTitle} - Listened for ${(totalPlayTime / 1000).toFixed(0)}s, need ${(minPlayTime / 1000).toFixed(0)}s`;
-				console.log(`[last.fm] ${noScrobbleMessage}`);
-				if (storage.displaySkippedScrobbles) messageInfo(`last.fm - ${noScrobbleMessage}`);
+				if (storage.displaySkippedScrobbles) messageInfo(`[last.fm] - ${noScrobbleMessage}`);
 			}
 		}
 

diff --git a/plugins/RealMAX/plugin.json b/plugins/RealMAX/plugin.json
@@ -1,6 +1,6 @@
 {
   "name": "RealMAX",
-  "description": "Always ensure that the highest quality available of a track  is played",
+  "description": "Always ensure that the highest quality available of a track is played",
   "author": "Inrixia",
   "main": "./src/index.js"
 }
diff --git a/plugins/Shazam/src/index.ts b/plugins/Shazam/src/index.ts
@@ -74,7 +74,7 @@ const handleDrop = async (event: DragEvent) => {
 				messageWarn(`No matches for ${file.name}`);
 			});
 		} catch (err) {
-			messageError(`Failed to recognize ${file.name}: ${(<Error>err).message}`);
+			messageError(`Failed to recognize ${file.name}`)(<Error>err);
 		}
 	}
 };

diff --git a/plugins/SongDownloader/src/index.ts b/plugins/SongDownloader/src/index.ts
@@ -121,10 +121,7 @@ const downloadItems = (items: (TrackItem | VideoItem)[]) =>
 			prep();
 			for (const trackItem of trackItems) {
 				if (trackItem.id === undefined) continue;
-				await downloadTrack(trackItem, { trackId: trackItem.id, desiredQuality: storage.desiredDownloadQuality }, { onProgress }).catch((err) => {
-					messageError(err.message);
-					console.error(err);
-				});
+				await downloadTrack(trackItem, { trackId: trackItem.id, desiredQuality: storage.desiredDownloadQuality }, { onProgress }).catch(messageError("Error downloading track"));
 			}
 			clear();
 		});

diff --git a/plugins/TidalTags/src/setFLACInfo.ts b/plugins/TidalTags/src/setFLACInfo.ts
@@ -114,13 +114,15 @@ export const setFLACInfo = async ([{ playbackContext }]: [{ playbackContext?: Pl
 		flacInfoElem.style.border = "solid 1px red";
 		const errorText = (<Error>err).message.substring(0, 64);
 		if (flacInfoElem.textContent.includes(Loading_Bitrate)) {
-			const errMsg = `Error Loading Bitrate - ${errorText}`;
+			const errHeader = `Error Loading Bitrate`;
+			const errMsg = `${errHeader} - ${errorText}`;
 			flacInfoElem.textContent = flacInfoElem.textContent?.replace(Loading_Bitrate, errMsg) ?? "";
-			messageError(errMsg);
+			messageError(errHeader)(<Error>err);
 		} else {
-			const errMsg = `Error Loading TrackInfo - ${errorText}`;
+			const errHeader = `Error Loading TrackInfo`;
+			const errMsg = `${errHeader} - ${errorText}`;
 			flacInfoElem.textContent = errMsg;
-			messageError(errMsg);
+			messageError(errHeader)(<Error>err);
 		}
 	}