tyler.durden/deezer-linux
1
0
Fork 0
mirror of https://github.com/aunetx/deezer-linux.git synced 2025-07-27 15:44:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: update patches to support radio stations. Fixes #147

Browse Source
This commit is contained in:
josselinonduty 2025-07-23 22:03:24 +02:00
parent f8295006a5
commit 63db934f26
No known key found for this signature in database
2 changed files with 56 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
patches/08-additional-metadata.patch
View File

@ -1,6 +1,6 @@
From ff697a112f235e1b973bcadb304ba21aed8dcb71 Mon Sep 17 00:00:00 2001 From 89a8e44da29ae59e04adf7122374be4f621ec2ee Mon Sep 17 00:00:00 2001
From: josselinonduty <contact@josselinonduty.fr> From: josselinonduty <contact@josselinonduty.fr>
Date: Wed, 14 May 2025 15:12:49 +0900 Date: Wed, 23 Jul 2025 20:36:49 +0200
Subject: [PATCH] feat: provide additional information to mpris (and future Subject: [PATCH] feat: provide additional information to mpris (and future
patches) patches)
@ -10,7 +10,7 @@ Subject: [PATCH] feat: provide additional information to mpris (and future
2 files changed, 60 insertions(+), 31 deletions(-) 2 files changed, 60 insertions(+), 31 deletions(-)
diff --git a/build/main.js b/build/main.js diff --git a/build/main.js b/build/main.js
index 485b953..2f616b1 100644 index 82f5c11..8332c3a 100644
--- a/build/main.js --- a/build/main.js
+++ b/build/main.js +++ b/build/main.js
@@ -1253,18 +1253,24 @@ @@ -1253,18 +1253,24 @@
@ -22,17 +22,17 @@ index 485b953..2f616b1 100644
(this.track = Object.assign(this.track, track)), (this.track = Object.assign(this.track, track)),
this.emit(MediaEvents.TrackUpdated, this.track), this.emit(MediaEvents.TrackUpdated, this.track),
(this.mprisPlayer.metadata = { (this.mprisPlayer.metadata = {
+ "mpris:length": data?.trackInfo?.song?.DURATION + ...(data?.trackInfo?.song?.DURATION && {
+ ? data.trackInfo.song.DURATION * 1000 + "mpris:length": data.trackInfo.song.DURATION * 1000,
+ : undefined, + }),
"mpris:trackid": this.mprisPlayer.objectPath("track/0"), "mpris:trackid": this.mprisPlayer.objectPath("track/0"),
"mpris:artUrl": track.coverUrl, "mpris:artUrl": track.coverUrl,
"xesam:title": track.title, "xesam:title": track.title,
"xesam:album": track.album, "xesam:album": track.album,
"xesam:artist": [track.artist], "xesam:artist": [track.artist],
+ "xesam:url": data?.trackInfo?.song + ...(data?.trackInfo?.song?.SNG_ID && {
+ ? `https://deezer.com/track/${data.trackInfo.song.SNG_ID}` + "xesam:url": `https://deezer.com/track/${data.trackInfo.song.SNG_ID}`,
+ : undefined, + }),
}); });
} }
- setPlayerInfo(player) { - setPlayerInfo(player) {
@ -103,7 +103,7 @@ index 485b953..2f616b1 100644
var application_awaiter = function (thisArg, _arguments, P, generator) { var application_awaiter = function (thisArg, _arguments, P, generator) {
return new (P || (P = Promise))(function (resolve, reject) { return new (P || (P = Promise))(function (resolve, reject) {
diff --git a/build/renderer.js b/build/renderer.js diff --git a/build/renderer.js b/build/renderer.js
index 212c12d..1f7b1b7 100644 index 9761e62..4992d17 100644
--- a/build/renderer.js --- a/build/renderer.js
+++ b/build/renderer.js +++ b/build/renderer.js
@@ -349,23 +349,31 @@ @@ -349,23 +349,31 @@
@ -180,5 +180,5 @@ index 212c12d..1f7b1b7 100644
} }
} }
-- --
2.43.0 2.48.1

80
patches/09-discord-rich-presence.patch
View File

@ -1,15 +1,15 @@
From 4108067eb498fd58f913b2830c44ea2b3e23247b Mon Sep 17 00:00:00 2001 From c53a3132b676ecaa30f8dcb30ecbaaabbbd63f76 Mon Sep 17 00:00:00 2001
From: josselinonduty <contact@josselinonduty.fr> From: josselinonduty <contact@josselinonduty.fr>
Date: Thu, 29 May 2025 00:32:47 +0900 Date: Wed, 23 Jul 2025 21:36:05 +0200
Subject: [PATCH] add discord rich presence support (w/ opt-in arg.) Subject: [PATCH] feat: add discord rich presence support (w/ opt-in arg.)
--- ---
build/main.js | 165 +++++++++++++++++++++++++++++++++++++++++++++++++- build/main.js | 175 +++++++++++++++++++++++++++++++++++++++++++++++++-
package.json | 2 + package.json | 1 +
2 files changed, 166 insertions(+), 1 deletion(-) 2 files changed, 175 insertions(+), 1 deletion(-)
diff --git a/build/main.js b/build/main.js diff --git a/build/main.js b/build/main.js
index 0155907..9ce2145 100644 index 8332c3a..aba4098 100644
--- a/build/main.js --- a/build/main.js
+++ b/build/main.js +++ b/build/main.js
@@ -93,6 +93,13 @@ @@ -93,6 +93,13 @@
@ -26,7 +26,7 @@ index 0155907..9ce2145 100644
function isPlatform(platform) { function isPlatform(platform) {
switch (platform) { switch (platform) {
case PLATFORM.WINDOWS: case PLATFORM.WINDOWS:
@@ -1229,6 +1236,160 @@ @@ -1229,6 +1236,170 @@
this.mprisPlayer.on("loopStatus", this.setRepeatMode.bind(this)); this.mprisPlayer.on("loopStatus", this.setRepeatMode.bind(this));
this.mprisPlayer.on("raise", () => this.app.getWindow().show()); this.mprisPlayer.on("raise", () => this.app.getWindow().show());
} }
@ -66,12 +66,14 @@ index 0155907..9ce2145 100644
+ +
+ if (track && data) { + if (track && data) {
+ const duration = data?.trackInfo?.song?.DURATION; + const duration = data?.trackInfo?.song?.DURATION;
+ if (!duration) return; + const livestream = data?.trackInfo?.song?.LIVE_STREAM || false;
+ +
+ external_electron_log_default().debug( + external_electron_log_default().debug(
+ "[Discord] Updating rich presence with track information." + "[Discord] Updating rich presence with track information."
+ ); + );
+ rpcStartedAt = Date.now(); + rpcStartedAt = livestream
+ ? rpcData.startTimestamp || Date.now()
+ : Date.now();
+ rpcPausedAt = null; + rpcPausedAt = null;
+ rpcData = { + rpcData = {
+ type: external_discord_rpc_namespaceObject.ActivityType.Listening, + type: external_discord_rpc_namespaceObject.ActivityType.Listening,
@ -82,16 +84,20 @@ index 0155907..9ce2145 100644
+ largeImage: track.coverUrl, + largeImage: track.coverUrl,
+ description: track.title, + description: track.title,
+ state: + state:
+ track.title === track.album + !track.album || track.title === track.album
+ ? `${track.artist}` + ? `${track.artist}`
+ : `${track.artist} - ${track.album}`, + : `${track.artist} - ${track.album}`,
+ startTimestamp: rpcStartedAt, + startTimestamp: rpcStartedAt,
+ endTimestamp: rpcStartedAt + duration * 1e3, + ...(duration && {
+ duration: duration * 1e3, + endTimestamp: rpcStartedAt + duration * 1e3,
+ button: { + duration: duration * 1e3,
+ label: "Listen on Deezer", + }),
+ url: `https://deezer.com/track/${data.trackInfo.song.SNG_ID}`, + ...(data?.trackInfo?.song?.SNG_ID && {
+ }, + button: {
+ label: "Listen on Deezer",
+ url: `https://deezer.com/track/${data.trackInfo.song.SNG_ID}`,
+ },
+ }),
+ }; + };
+ +
+ rpcClient + rpcClient
@ -108,12 +114,14 @@ index 0155907..9ce2145 100644
+ start: rpcData.startTimestamp, + start: rpcData.startTimestamp,
+ end: rpcData.endTimestamp, + end: rpcData.endTimestamp,
+ }, + },
+ buttons: [ + ...(rpcData.button && {
+ { + buttons: [
+ label: rpcData.button.label, + {
+ url: rpcData.button.url, + label: rpcData.button.label,
+ }, + url: rpcData.button.url,
+ ], + },
+ ],
+ }),
+ }) + })
+ .then(() => { + .then(() => {
+ external_electron_log_default().debug( + external_electron_log_default().debug(
@ -170,12 +178,14 @@ index 0155907..9ce2145 100644
+ start: rpcData.startTimestamp, + start: rpcData.startTimestamp,
+ end: rpcData.endTimestamp, + end: rpcData.endTimestamp,
+ }, + },
+ buttons: [ + ...(rpcData.button && {
+ { + buttons: [
+ label: rpcData.button.label, + {
+ url: rpcData.button.url, + label: rpcData.button.label,
+ }, + url: rpcData.button.url,
+ ], + },
+ ],
+ }),
+ }) + })
+ .catch((err) => { + .catch((err) => {
+ external_electron_log_default().error( + external_electron_log_default().error(
@ -187,15 +197,15 @@ index 0155907..9ce2145 100644
play() { play() {
this.ipc.send("channel-player-media-control", MediaPlayerControl.Play); this.ipc.send("channel-player-media-control", MediaPlayerControl.Play);
} }
@@ -1269,6 +1430,7 @@ @@ -1269,6 +1440,7 @@
? `https://deezer.com/track/${data.trackInfo.song.SNG_ID}` "xesam:url": `https://deezer.com/track/${data.trackInfo.song.SNG_ID}`,
: undefined, }),
}); });
+ this.updateDiscordRichPresence(track, data); + this.updateDiscordRichPresence(track, data);
} }
setPlayerInfo(player, data) { setPlayerInfo(player, data) {
(this.player = Object.assign(this.player, player)), (this.player = Object.assign(this.player, player)),
@@ -1276,7 +1438,8 @@ @@ -1276,7 +1448,8 @@
(this.mprisPlayer.playbackStatus = (this.mprisPlayer.playbackStatus =
this.player.state === "playing" this.player.state === "playing"
? external_electron_mpris_namespaceObject.PLAYBACK_STATUS_PLAYING ? external_electron_mpris_namespaceObject.PLAYBACK_STATUS_PLAYING
@ -206,7 +216,7 @@ index 0155907..9ce2145 100644
getTrackInfo() { getTrackInfo() {
return this.track; return this.track;
diff --git a/package.json b/package.json diff --git a/package.json b/package.json
index 0e91412..50c4a41 100644 index 0dd2a5c..8aedf53 100644
--- a/package.json --- a/package.json
+++ b/package.json +++ b/package.json
@@ -12,6 +12,7 @@ @@ -12,6 +12,7 @@
@ -218,5 +228,5 @@ index 0e91412..50c4a41 100644
"@jellybrick/mpris-service": "2.1.5", "@jellybrick/mpris-service": "2.1.5",
"electron-log": "^5.1.2", "electron-log": "^5.1.2",
-- --
2.43.0 2.48.1