0.3.3: fix scrobble with stopped playback, some refacto

dbeley · Nov 20, 2023 · 729fa27 · 729fa27
1 parent c9edca5
commit 729fa27
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 9 deletions.
diff --git a/mpdscrobble/__init__.py b/mpdscrobble/__init__.py
@@ -5,6 +5,6 @@
 A simple Last.fm scrobbler for MPD.
 """
 
-__version__ = "0.3.2"
+__version__ = "0.3.3"
 
 name = "mpdscrobble"
diff --git a/mpdscrobble/__main__.py b/mpdscrobble/__main__.py
@@ -10,6 +10,7 @@
 from .utils import (
     read_config,
     create_networks,
+    get_mpdscrobble_config
 )
 from .mpdscrobble import MPDScrobbleMPDConnection, MPDScrobbleTrack, MPDScrobbleNetwork
 
@@ -28,18 +29,20 @@ def loop(
             current_song = client.mpdscrobble_currentsong()
             if current_song and cached_song:
                 logger.debug(
-                    f"Current: {current_song.debug()}\nCached: {cached_song.debug()}"
+                    "Current: %s\nCached: %s", current_song.debug(), cached_song.debug()
                 )
                 if cached_song != current_song:
                     if cached_song.percentage > constants.SCROBBLE_PERCENTAGE:
                         if not args.dry_run:
+                            logger.info("Sending scrobble for %s.", current_song)
                             networks.mpdscrobble_scrobble(cached_song)
                         else:
                             logger.warning("Dry-run mode enabled.")
                     networks.mpdscrobble_update_now_playing(current_song)
             if not current_song and cached_song:
                 if cached_song.percentage > constants.SCROBBLE_PERCENTAGE:
                     if not args.dry_run:
+                        logger.info("Sending scrobble for %s. Detected stopped playback.", current_song)
                         networks.mpdscrobble_scrobble(cached_song)
                     else:
                         logger.warning("Dry-run mode enabled")
@@ -58,13 +61,7 @@ def main():
 
     networks = create_networks(config)
 
-    host = constants.DEFAULT_HOST
-    port = constants.DEFAULT_PORT
-    if "mpdscrobble" in config:
-        if "host" in config["mpdscrobble"]:
-            host = config["mpdscrobble"]["host"]
-        if "port" in config["mpdscrobble"]:
-            port = config["mpdscrobble"]["port"]
+    host, port = get_mpdscrobble_config(config)
 
     client = MPDScrobbleMPDConnection()
     client.mpdscrobble_connect(host, port)

diff --git a/mpdscrobble/utils.py b/mpdscrobble/utils.py
@@ -2,6 +2,7 @@
 import configparser
 import os
 
+from mpdscrobble import constants
 from .mpdscrobble import (
     MPDScrobbleLastFMNetwork,
     MPDScrobbleMalojaNetwork,
@@ -19,6 +20,17 @@ def read_config(config_file: str) -> configparser.ConfigParser:
     return config
 
 
+def get_mpdscrobble_config(config: configparser.ConfigParser) -> tuple[str, int]:
+    host = constants.DEFAULT_HOST
+    port = constants.DEFAULT_PORT
+    if "mpdscrobble" in config:
+        if "host" in config["mpdscrobble"]:
+            host = config["mpdscrobble"]["host"]
+        if "port" in config["mpdscrobble"]:
+            port = int(config["mpdscrobble"]["port"])
+    return host, port
+
+
 def create_networks(config: configparser.ConfigParser) -> MPDScrobbleNetwork:
     networks = []
     for i in config.sections():