syncfm-core 0.2.0__tar.gz → 0.2.1__tar.gz

{syncfm_core-0.2.0 → syncfm_core-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: syncfm-core
-Version: 0.2.0
+Version: 0.2.1
 Summary: Reusable synchronization engine and CLI for Last.fm, Libre.fm and GNU.fm networks.
 Keywords: lastfm,librefm,gnufm,scrobble,music
 Author: Hirad

{syncfm_core-0.2.0 → syncfm_core-0.2.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "syncfm-core"
-version = "0.2.0"
+version = "0.2.1"
 description = "Reusable synchronization engine and CLI for Last.fm, Libre.fm and GNU.fm networks."
 readme = "README.md"
 license = "GPL-3.0-or-later"

{syncfm_core-0.2.0 → syncfm_core-0.2.1}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "syncfm-core"
-version = "0.2.0"
+version = "0.2.1"
 description = "Reusable synchronization engine and CLI for Last.fm, Libre.fm and GNU.fm networks."
 readme = "README.md"
 license = "GPL-3.0-or-later"

{syncfm_core-0.2.0 → syncfm_core-0.2.1}/src/syncfm_core/networks/pylast_adapter.py

@@ -133,34 +133,58 @@ class PyLastNetworkAdapter:
         end_timestamp: int | None = None,
         limit: int | None = None,
     ) -> list[Scrobble]:
-        """Return scrobbles matching the supplied range or limit.
-
-        Args:
-            start_timestamp: Earliest playback timestamp to include.
-            end_timestamp: Latest playback timestamp to include.
-            limit: Maximum number of scrobbles to return.
+        """Return scrobbles within the inclusive timestamp range."""
+        api_start_timestamp = (
+            start_timestamp - 1
+            if start_timestamp is not None and start_timestamp > 0
+            else None
+        )
+        api_end_timestamp = (
+            end_timestamp + 1
+            if end_timestamp is not None
+            else None
+        )
 
-        Returns:
-            Matching playback events.
+        api_limit = (
+            None
+            if limit is not None
+            and (start_timestamp is not None or end_timestamp is not None)
+            else limit
+        )
 
-        Raises:
-            NetworkError: If pylast cannot retrieve playback history.
-            InvalidNetworkResponseError: If returned playback data is malformed.
-        """
         try:
             user = self._network.get_user(self._username)
             played_tracks = user.get_recent_tracks(
-                limit=limit,
-                time_from=start_timestamp,
-                time_to=end_timestamp,
+                limit=api_limit,
+                time_from=api_start_timestamp,
+                time_to=api_end_timestamp,
                 stream=False,
             )
-            return [
-                self._mapper.to_scrobble(played_track) for played_track in played_tracks
+            scrobbles = [
+                self._mapper.to_scrobble(played_track)
+                for played_track in played_tracks
             ]
         except pylast.PyLastError as error:
             raise self.translate_error(error) from error
 
+        filtered_scrobbles = [
+            scrobble
+            for scrobble in scrobbles
+            if (
+                start_timestamp is None
+                or scrobble.timestamp >= start_timestamp
+            )
+            and (
+                end_timestamp is None
+                or scrobble.timestamp <= end_timestamp
+            )
+        ]
+
+        if limit is not None:
+            return filtered_scrobbles[:limit]
+
+        return filtered_scrobbles
+
     def get_latest_scrobble_timestamp(self) -> int | None:
         """Return the latest scrobble timestamp, if one exists."""
         scrobbles = self.get_scrobbles(limit=1)