New upstream version 44.0

1 files changed, 7 insertions, 13 deletions

diff --git a/gnomemusic/grilowrappers/grltrackerwrapper.py b/gnomemusic/grilowrappers/grltrackerwrapper.py
index 680ba409..2831b977 100644
--- a/gnomemusic/grilowrappers/grltrackerwrapper.py
+++ b/gnomemusic/grilowrappers/grltrackerwrapper.py
@@ -414,9 +414,8 @@ class GrlTrackerWrapper(GObject.GObject):
 
         :param list ids: List of Media ids to filter by or None
         """
-        if ids is None:
-            songs_filter = ""
-        else:
+        songs_filter = ""
+        if ids is not None:
             media_ids = ", ".join([f"<{media_id}>" for media_id in ids])
             songs_filter = f"FILTER ( ?song in ( {media_ids} ) )"
 
@@ -710,7 +709,7 @@ class GrlTrackerWrapper(GObject.GObject):
             'location_filter': self._tracker_wrapper.location_filter()
         }
 
-        albums: List[Grl.Media] = []
+        albums: List[str] = []
 
         def query_cb(
                 source: Grl.Source, op_id: int, media: Optional[Grl.Media],
@@ -727,15 +726,10 @@ class GrlTrackerWrapper(GObject.GObject):
                 self._notificationmanager.pop_loading()
                 return
 
-            albums.append(media)
-
-        def albums_filter(
-                corealbum: CoreAlbum, albums: List[Grl.Media]) -> bool:
-            for media in albums:
-                if media.get_id() == corealbum.props.media.get_id():
-                    return True
+            albums.append(media.get_id())
 
-            return False
+        def albums_filter(corealbum: CoreAlbum, albums: List[str]) -> bool:
+            return corealbum.props.media.get_id() in albums
 
         self.props.source.query(
             query, [Grl.METADATA_KEY_TITLE], self._fast_options, query_cb)
@@ -871,7 +865,7 @@ class GrlTrackerWrapper(GObject.GObject):
             Grl.METADATA_KEY_URL
         ]
 
-        disc_song_ids: List[int] = []
+        disc_song_ids: List[str] = []
 
         def _filter_func(coresong: CoreSong) -> bool:
             return coresong.props.grlid in disc_song_ids