From 4206090408e93ddae8408c17dd45e10b3a895ac0 Mon Sep 17 00:00:00 2001 From: Keops Date: Sat, 11 May 2024 17:40:09 +0200 Subject: [PATCH 1/2] MPRIS management added. https://specifications.freedesktop.org/mpris-spec/latest/ --- .gitignore | 3 +- Makefile | 3 + patches/better-management-of-MPRIS.patch | 138 +++++++++++++++++++++++ 3 files changed, 143 insertions(+), 1 deletion(-) create mode 100644 patches/better-management-of-MPRIS.patch diff --git a/.gitignore b/.gitignore index 067d5d9..62823fa 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,5 @@ source app package-lock.json artifacts -package.json \ No newline at end of file +package.json +.vscode/launch.json diff --git a/Makefile b/Makefile index 9a9c8c6..b49a869 100644 --- a/Makefile +++ b/Makefile @@ -33,6 +33,7 @@ prepare: clean install_build_deps @echo "Start in tray cli option (https://github.com/SibrenVasse/deezer/pull/12)" @echo "Remove kernel version from User-Agent (https://github.com/aunetx/deezer-linux/pull/9)" @echo "Avoid to set the text/html mime type (https://github.com/aunetx/deezer-linux/issues/13)" + @echo "Add a better management of MPRIS (Media Player Controls)" $(foreach p, $(wildcard ./patches/*), patch -p1 -dapp < $(p);) @echo "Append `package-append.json` to the `package.json` of the app" @@ -40,6 +41,8 @@ prepare: clean install_build_deps @head -n -1 app/package.json > tmp.txt && mv tmp.txt app/package.json @cat package-append.json | tee -a app/package.json + @echo "Download new packages" + @npm i #! PACKAGES diff --git a/patches/better-management-of-MPRIS.patch b/patches/better-management-of-MPRIS.patch new file mode 100644 index 0000000..43d5b17 --- /dev/null +++ b/patches/better-management-of-MPRIS.patch @@ -0,0 +1,138 @@ +--- a/build/main.js 2024-05-10 19:00:37.087094880 +0200 ++++ b/build/main.js 2024-05-11 17:21:00.996945543 +0200 +@@ -72,6 +72,10 @@ + var external_url_default = __webpack_require__.n( + external_url_namespaceObject + ); ++ const external_electron_mpris_namespaceObject = require("mpris-service"); ++ var external_electron_mpris_default = __webpack_require__.n( ++ external_electron_mpris_namespaceObject ++ ); + const external_inversify_namespaceObject = require("inversify"), + external_events_namespaceObject = require("events"), + external_semver_namespaceObject = +@@ -1221,8 +1225,9 @@ + }; + }; + let MediaService = class extends external_events_namespaceObject.EventEmitter { +- constructor(ipc, user) { ++ constructor(ipc, user, app) { + super(), ++ (this.app = app), + (this.smtc = null), + (this.track = {}), + (this.player = {}), +@@ -1230,6 +1235,11 @@ + (this.debounceOptions = { leading: !0, maxWait: 500 }), + (this.ipc = ipc), + (this.user = user), ++ (this.mprisPlayer = new external_electron_mpris_namespaceObject({ ++ name: 'deezer', ++ identity: 'Deezer', ++ supportedInterfaces: ['player'] ++ })), + isPlatform(PLATFORM.LINUX) && + (this.user.addListener(UserEvents.LoggedIn, () => { + this.start(); +@@ -1237,6 +1247,19 @@ + this.user.addListener(UserEvents.LoggedOut, () => { + this.stop(); + })); ++ this.initMprisPlayerControls(); ++ } ++ initMprisPlayerControls() { ++ // Events => ['raise', 'quit', 'next', 'previous', 'pause', 'playpause', 'stop', 'play', 'seek', 'position', 'open', 'volume', 'loopStatus', 'shuffle']; ++ this.mprisPlayer.on('play', this.play.bind(this)); ++ this.mprisPlayer.on('pause', this.pause.bind(this)); ++ this.mprisPlayer.on('playpause', () => this.player.state === 'playing' ? this.pause() : this.play()); ++ this.mprisPlayer.on('stop', this.stop.bind(this)); ++ this.mprisPlayer.on('next', this.next.bind(this)); ++ this.mprisPlayer.on('previous', this.prev.bind(this)); ++ this.mprisPlayer.on('shuffle', this.setSuffle.bind(this)); ++ this.mprisPlayer.on('loopStatus', this.setRepeatMode.bind(this)); ++ this.mprisPlayer.on('raise', () => this.app.getWindow().show()); + } + play() { + this.ipc.send("channel-player-media-control", MediaPlayerControl.Play); +@@ -1264,11 +1287,22 @@ + } + setTrackInfo(track) { + (this.track = Object.assign(this.track, track)), +- this.emit(MediaEvents.TrackUpdated, this.track); ++ this.emit(MediaEvents.TrackUpdated, this.track), ++ (this.mprisPlayer.metadata = { ++ 'mpris:trackid': this.mprisPlayer.objectPath('track/0'), ++ 'mpris:artUrl': track.coverUrl, ++ 'xesam:title': track.title, ++ 'xesam:album': track.album, ++ 'xesam:artist': [track.artist] ++ }); + } + setPlayerInfo(player) { + (this.player = Object.assign(this.player, player)), + this.emit(MediaEvents.PlayerUpdated, this.player); ++ (this.mprisPlayer.playbackStatus = ++ this.player.state === 'playing' ++ ? external_electron_mpris_namespaceObject.PLAYBACK_STATUS_PLAYING ++ : external_electron_mpris_namespaceObject.PLAYBACK_STATUS_PAUSED); + } + getTrackInfo() { + return this.track; +@@ -1328,7 +1362,11 @@ + 1, + (0, external_inversify_namespaceObject.inject)(SERVICE_USER) + ), +- MediaService_metadata("design:paramtypes", [Object, Object]), ++ MediaService_param( ++ 2, ++ (0, external_inversify_namespaceObject.inject)(SERVICE_APPLICATION) ++ ), ++ MediaService_metadata("design:paramtypes", [Object, Object, Object]), + ], + MediaService + ); +@@ -2766,14 +2804,18 @@ + const PlayerIpc_ipc = main_di.get(SERVICE_IPC), + media = main_di.get(SERVICE_MEDIA), + powerSave = main_di.get(SERVICE_POWER_SAVE); ++ let powerSaveTimoutId; + PlayerIpc_ipc.on( + "channel-player-state-update", +- external_lodash_debounce_default()((event, state) => { +- media.setPlayerInfo({ state }), ++ (event, state) => { ++ media.setPlayerInfo({ state }); ++ clearTimeout(powerSaveTimoutId); ++ powerSaveTimoutId = setTimeout(()=> { + state === MediaPlayerState.Playing +- ? powerSave.start() +- : powerSave.stop(); +- }, 3e3) ++ ? powerSave.start() ++ : powerSave.stop(); ++ }, 3e3); ++ } + ), + PlayerIpc_ipc.on( + "channel-player-track-update", +@@ -2865,6 +2907,9 @@ + "autoplay-policy", + "no-user-gesture-required" + ), ++ external_electron_namespaceObject.app.commandLine.appendSwitch( ++ "disable-features", "HardwareMediaKeyHandling" ++ ), + external_electron_namespaceObject.app.on( + "second-instance", + (event, argv) => { + +--- a/package.json 2024-05-10 19:00:37.091094948 +0200 ++++ b/package.json 2024-05-10 21:54:32.411123286 +0200 +@@ -25,6 +25,7 @@ + "lodash.debounce": "^4.0.8", + "lodash.get": "^4.4.2", + "macos-version": "^5.2.1", ++ "mpris-service": "^2.1.2", + "object.assign": "^4.1.2", + "raven": "^2.6.4", + "reflect-metadata": "^0.1.13", \ No newline at end of file From 3fdb1a32e98d88eba73890e30c75e439b420d338 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Hamy?= Date: Sun, 23 Jun 2024 19:48:58 +0200 Subject: [PATCH 2/2] Update Makefile Just changed the description to match the rest of the makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b49a869..d5a8372 100644 --- a/Makefile +++ b/Makefile @@ -33,7 +33,7 @@ prepare: clean install_build_deps @echo "Start in tray cli option (https://github.com/SibrenVasse/deezer/pull/12)" @echo "Remove kernel version from User-Agent (https://github.com/aunetx/deezer-linux/pull/9)" @echo "Avoid to set the text/html mime type (https://github.com/aunetx/deezer-linux/issues/13)" - @echo "Add a better management of MPRIS (Media Player Controls)" + @echo "Add a better management of MPRIS (https://github.com/aunetx/deezer-linux/pull/61)" $(foreach p, $(wildcard ./patches/*), patch -p1 -dapp < $(p);) @echo "Append `package-append.json` to the `package.json` of the app"