test/rewrite test suite

mopidy_tidal/backend.py

@@ -32,7 +32,7 @@ def __init__(self, config, audio):
         # Session parameters
         self._active_session: Optional[Session] = None
         self._logged_in: bool = False
-        self.uri_schemes: [str] = ["tidal"]
+        self.uri_schemes: tuple[str] = ("tidal",)
         self._login_future: Optional[Future] = None
         self._login_url: Optional[str] = None
         self.data_dir: Path = Path(Extension.get_data_dir(self._config))

mopidy_tidal/library.py

@@ -2,6 +2,7 @@
 
 import logging
 from concurrent.futures import ThreadPoolExecutor
+from contextlib import suppress
 from typing import TYPE_CHECKING, List, Optional, Tuple, Union
 
 from mopidy import backend, models
@@ -162,38 +163,38 @@ def get_distinct(self, field, query=None) -> set[str]:
 
         if not query:  # library root
             if field in {"artist", "albumartist"}:
-                return [
+                return {
                     apply_watermark(a.name) for a in session.user.favorites.artists()
-                ]
+                }
             elif field == "album":
-                return [
+                return {
                     apply_watermark(a.name) for a in session.user.favorites.albums()
-                ]
+                }
             elif field in {"track", "track_name"}:
-                return [
+                return {
                     apply_watermark(t.name) for t in session.user.favorites.tracks()
-                ]
+                }
         else:
             if field == "artist":
-                return [
+                return {
                     apply_watermark(a.name) for a in session.user.favorites.artists()
-                ]
+                }
             elif field in {"album", "albumartist"}:
                 artists, _, _ = tidal_search(session, query=query, exact=True)
                 if len(artists) > 0:
                     artist = artists[0]
                     artist_id = artist.uri.split(":")[2]
-                    return [
+                    return {
                         apply_watermark(a.name)
                         for a in self._get_artist_albums(session, artist_id)
-                    ]
+                    }
             elif field in {"track", "track_name"}:
-                return [
+                return {
                     apply_watermark(t.name) for t in session.user.favorites.tracks()
-                ]
+                }
             pass
 
-        return []
+        return set()
 
     @login_hack
     def browse(self, uri) -> list[Ref]:
@@ -245,59 +246,64 @@ def browse(self, uri) -> list[Ref]:
         elif uri == "tidal:genres":
             return ref_models_mappers.create_genres(session.genre.get_genres())
 
-        # details
-        parts = uri.split(":")
-        nr_of_parts = len(parts)
-
-        if nr_of_parts == 3 and parts[1] == "album":
-            return ref_models_mappers.create_tracks(
-                self._get_album_tracks(session, parts[2])
-            )
-
-        if nr_of_parts == 3 and parts[1] == "artist":
-            top_10_tracks = ref_models_mappers.create_tracks(
-                self._get_artist_top_tracks(session, parts[2])[:10]
-            )
-
-            albums = ref_models_mappers.create_albums(
-                self._get_artist_albums(session, parts[2])
-            )
-
-            return albums + top_10_tracks
-
-        if nr_of_parts == 3 and parts[1] == "playlist":
-            return ref_models_mappers.create_tracks(
-                self._get_playlist_tracks(session, parts[2])
-            )
-
-        if nr_of_parts == 3 and parts[1] == "mood":
-            return ref_models_mappers.create_playlists(
-                self._get_mood_items(session, parts[2])
-            )
-
-        if nr_of_parts == 3 and parts[1] == "genre":
-            return ref_models_mappers.create_playlists(
-                self._get_genre_items(session, parts[2])
-            )
-
-        if nr_of_parts == 3 and parts[1] == "mix":
-            return ref_models_mappers.create_tracks(
-                self._get_mix_tracks(session, parts[2])
-            )
-
-        if nr_of_parts == 3 and parts[1] == "page":
-            # User page (eg. page:for_you, page:home etc)
-            return ref_models_mappers.create_mixed_directory(session.page.get(parts[2]))
-
-        if nr_of_parts == 4 and parts[2] == "category":
-            # Category nested on a page (eg. page(For You).category[0..n])
-            category = session.page.get("pages/{}".format(parts[1])).categories[
-                int(parts[3])
-            ]
+        # Category nested on a page (eg. page(For You).category[0..n])
+        # These have 3-part uris
+        with suppress(ValueError):
+            _, page_id, type, category_id = uri.split(":")
+            category = session.page.get(f"pages/{page_id}").categories[int(category_id)]
             return ref_models_mappers.create_mixed_directory(category.items)
 
-        logger.info("Unknown uri for browse request: %s", uri)
-        return []
+        # details with 2-part uris
+        try:
+            _, type, id = uri.split(":")
+
+            if type == "album":
+                return ref_models_mappers.create_tracks(
+                    self._get_album_tracks(session, id)
+                )
+
+            elif type == "artist":
+                top_10_tracks = ref_models_mappers.create_tracks(
+                    self._get_artist_top_tracks(session, id)[:10]
+                )
+
+                albums = ref_models_mappers.create_albums(
+                    self._get_artist_albums(session, id)
+                )
+
+                return albums + top_10_tracks
+
+            elif type == "playlist":
+                return ref_models_mappers.create_tracks(
+                    self._get_playlist_tracks(session, id)
+                )
+
+            elif type == "mood":
+                return ref_models_mappers.create_playlists(
+                    self._get_mood_items(session, id)
+                )
+
+            elif type == "genre":
+                return ref_models_mappers.create_playlists(
+                    self._get_genre_items(session, id)
+                )
+
+            elif type == "mix":
+                return ref_models_mappers.create_tracks(
+                    self._get_mix_tracks(session, id)
+                )
+
+            elif type == "page":
+                return ref_models_mappers.create_mixed_directory(session.page.get(id))
+            else:
+                return []
+
+        except ValueError:
+            logger.exception("Unable to parse uri '%s' for browse.", uri)
+            return []
+        except HTTPError:
+            logger.exception("Unable to retrieve object from uri '%s'", uri)
+            return []
 
     @login_hack
     def search(self, query=None, uris=None, exact=False) -> Optional[SearchResult]:

mopidy_tidal/lru_cache.py

@@ -154,9 +154,9 @@ def _check_limit(self):
 
 
 class SearchCache(LruCache):
-    def __init__(self, func):
+    def __init__(self, search_function):
         super().__init__(persist=False)
-        self._func = func
+        self._search_function = search_function
 
     def __call__(self, *args, **kwargs):
         key = str(SearchKey(**kwargs))
@@ -165,7 +165,7 @@ def __call__(self, *args, **kwargs):
             "Search cache miss" if cached_result is None else "Search cache hit"
         )
         if cached_result is None:
-            cached_result = self._func(*args, **kwargs)
+            cached_result = self._search_function(*args, **kwargs)
             self[key] = cached_result
 
         return cached_result

pyproject.toml

@@ -19,7 +19,7 @@ classifiers = [
 [tool.poetry.dependencies]
 python = "^3.9"
 Mopidy = "^3.0"
-tidalapi = "^0.7.3"
+tidalapi = {git = "https://github.com/tamland/python-tidal"}
 
 [tool.poetry.group.dev.dependencies]
 pytest = "^7.3.1"
@@ -50,10 +50,9 @@ tidal = "mopidy_tidal:Extension"
 
 [tool.pytest.ini_options]
 markers = [
-    "gt_3_7: Mark a test as requiring python > 3.7.",
-    "gt_3_8: Mark a test as requiring python > 3.8.",
-    "gt_3_9: Mark a test as requiring python > 3.9.",
     "gt_3_10: Mark a test as requiring python > 3.10.",
+    "poor_test: Mark a test in need of improvement",
+    "insufficiently_decoupled: Mark a test as insufficiently decoupled from implementation",
 ]
 filterwarnings = [
     "error::DeprecationWarning:mopidy[.*]",