Release 0.5.5 (#63)

- Song recognition: match using song title and artist (avoid spurious scrobbles if more servers are configured)

Author: GioF71

.vscode/settings.json

@@ -1,9 +1,9 @@
 {
     "flake8.args": [
         "--max-line-length=140",
-        "--ignore=E128,E701,E704,W504,W718,C0116,C0321"
+        "--ignore=E128,E701,E704,W504,W718,C0116,C0321,E1136"
     ],
     "pylint.args": [
         "--max-line-length=140",
-        "--disable=C0111,W0718,C0321"]
+        "--disable=C0111,W0718,C0321,E1136"]
 }

README.md

@@ -158,6 +158,10 @@ In order to avoid issues with password, which might contain special characters,
 
 ## Releases
 
+### Release 0.5.5
+
+- Song recognition: match using song title and artist (avoid spurious scrobbles if more servers are configured)
+
 ### Release 0.5.4
 
 - Introduced caching against subsonic servers

mpd_subsonic_scrobbler/scrobbler.py

@@ -1,4 +1,6 @@
 import time
+import socket
+import importlib.metadata
 
 import mpd_util
 import subsonic_util
@@ -15,9 +17,6 @@
 from context import Context
 from subsonic_track_id import SubsonicTrackId
 
-import socket
-import importlib.metadata
-
 
 def execute_scrobbling(
         context: Context,
@@ -235,7 +234,8 @@ def main():
         mpd_index: int
         for mpd_index in range(len(mpd_list)):
             imposed_sleep_iteration_count: int = mpd_util.must_sleep_for(context=context, mpd_index=mpd_index)
-            if imposed_sleep_iteration_count and imposed_sleep_iteration_count > 0: continue
+            if imposed_sleep_iteration_count and imposed_sleep_iteration_count > 0:
+                continue
             delete_elapsed_stats(context=context, index=mpd_index)
             last_state: str = context.get(context_key=ContextKey.MPD_LAST_STATE, index=mpd_index)
             current_state: str = None

mpd_subsonic_scrobbler/subsonic_util.py

@@ -1,6 +1,8 @@
 from subsonic_server_config import SubsonicServerConfig
 from context import Context
 from mpd_util import get_mpd_current_song_file
+from mpd_util import get_mpd_current_song_title
+from mpd_util import get_mpd_current_song_artist
 
 from urllib.parse import urlparse
 from urllib.parse import parse_qs
@@ -83,8 +85,11 @@ def __get_subsonic_track_id_for_config(
                 except URLError:
                     # server is probably unavailable
                     pass
-                except Exception as anyExc:
+                except Exception as any_exc:
                     print("__get_subsonic_track_id_for_config failed on "
                           f"[{subsonic_server_config.get_friendly_name()}] "
-                          f"[{type(anyExc)}] [{anyExc}]")
-                return right if song else None
+                          f"[{type(any_exc)}] [{any_exc}]")
+                # check if the song is the one that is playing.
+                song_title: str = get_mpd_current_song_title(context=context, index=index)
+                song_artist: str = get_mpd_current_song_artist(context=context, index=index)
+                return right if song and song_title == song.getTitle() and song_artist == song.getArtist() else None

pyproject.toml

@@ -2,7 +2,7 @@
 name = "mpd-subsonic-scrobbler"
 description = "A Subsonic Scrobbler for Music Player Daemon"
 license = {text = "MIT License"}
-version = "0.5.4"
+version = "0.5.5"
 authors = [
   {name = "Giovanni Fulco"}
 ]