Merge pull request #141 from Nokse22/update-tidalapi

Update tidalapi

Author: Nokse22

build-aux/python3-tidalapi.json

@@ -2,19 +2,18 @@
     "name": "python3-tidalapi",
     "buildsystem": "simple",
     "build-commands": [
-        "pip3 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"urllib3[socks]\" --no-build-isolation",
-        "pip3 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"tidalapi\" --no-build-isolation"
+        "pip3 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"urllib3[socks]\" \"tidalapi\" --no-build-isolation"
     ],
     "sources": [
         {
             "type": "file",
-            "url": "https://files.pythonhosted.org/packages/a5/32/8f6669fc4798494966bf446c8c4a162e0b5d893dff088afddf76414f70e1/certifi-2024.12.14-py3-none-any.whl",
-            "sha256": "1275f7a45be9464efc1173084eaa30f866fe2e47d389406136d332ed4967ec56"
+            "url": "https://files.pythonhosted.org/packages/e5/48/1549795ba7742c948d2ad169c1c8cdbae65bc450d6cd753d124b17c8cd32/certifi-2025.8.3-py3-none-any.whl",
+            "sha256": "f6c12493cfb1b06ba2ff328595af9350c65d6644968e5d3a2ffd78699af217a5"
         },
         {
             "type": "file",
-            "url": "https://files.pythonhosted.org/packages/16/b0/572805e227f01586461c80e0fd25d65a2115599cc9dad142fee4b747c357/charset_normalizer-3.4.1.tar.gz",
-            "sha256": "44251f18cd68a75b56585dd00dae26183e102cd5e0f9f1466e6df5da2ed64ea3"
+            "url": "https://files.pythonhosted.org/packages/83/2d/5fd176ceb9b2fc619e63405525573493ca23441330fcdaee6bef9460e924/charset_normalizer-3.4.3.tar.gz",
+            "sha256": "6fce4b8500244f6fcb71465d4a4930d132ba9ab8e71a7859e6a5d59851068d14"
         },
         {
             "type": "file",
@@ -43,18 +42,18 @@
         },
         {
             "type": "file",
-            "url": "https://files.pythonhosted.org/packages/f9/9b/335f9764261e915ed497fcdeb11df5dfd6f7bf257d4a6a2a686d80da4d54/requests-2.32.3-py3-none-any.whl",
-            "sha256": "70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6"
+            "url": "https://files.pythonhosted.org/packages/7c/e4/56027c4a6b4ae70ca9de302488c5ca95ad4a39e190093d6c1a8ace08341b/requests-2.32.4-py3-none-any.whl",
+            "sha256": "27babd3cda2a6d50b30443204ee89830707d396671944c998b5975b031ac2b2c"
         },
         {
             "type": "file",
-            "url": "https://files.pythonhosted.org/packages/db/a6/efe5044ab4e84e945a3b84e40af3e4ff68f17de20c1fe2d58ed821b1d267/tidalapi-0.8.3-py3-none-any.whl",
-            "sha256": "b6698e308cc9f4edac4b9c1bc22773f040d4de0bbac212defcbe33a93f66b3c7"
+            "url": "https://files.pythonhosted.org/packages/7e/fc/8612dde17f43b8358e872ad2dcc23c6d295fcf030389adf4012e71f4a271/tidalapi-0.8.5-py3-none-any.whl",
+            "sha256": "208f9ca47d012563f7038764a44ae46d68ae38d6c2a527e15fab50f5670bda9f"
         },
         {
             "type": "file",
-            "url": "https://files.pythonhosted.org/packages/26/9f/ad63fc0248c5379346306f8668cda6e2e2e9c95e01216d2b8ffd9ff037d0/typing_extensions-4.12.2-py3-none-any.whl",
-            "sha256": "04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d"
+            "url": "https://files.pythonhosted.org/packages/b5/00/d631e67a838026495268c2f6884f3711a15a9a2a96cd244fdaea53b823fb/typing_extensions-4.14.1-py3-none-any.whl",
+            "sha256": "d1e1e3b58374dc93031d6eda2420a48ea44a36c2b4766a4fdeb3710755731d76"
         },
         {
             "type": "file",
@@ -63,8 +62,8 @@
         },
         {
             "type": "file",
-            "url": "https://files.pythonhosted.org/packages/c8/19/4ec628951a74043532ca2cf5d97b7b14863931476d117c471e8e2b1eb39f/urllib3-2.3.0-py3-none-any.whl",
-            "sha256": "1cee9ad369867bfdbbb48b7dd50374c0967a0bb7710050facf0dd6911440e3df"
+            "url": "https://files.pythonhosted.org/packages/a7/c2/fe1e52489ae3122415c51f387e221dd0773709bad6c6cdaa599e8a2c5185/urllib3-2.5.0-py3-none-any.whl",
+            "sha256": "e6b01673c0fa6a13e374b50871808eb3bf7046c4b125b216f6bf1cc604cff0dc"
         }
     ]
-}
+}

src/pages/generic_page.py

@@ -22,15 +22,8 @@
 from tidalapi.page import TextBlock, PageLinks, ItemList
 from tidalapi.media import Track
 
-# Import newer classes with fallback for older versions
-try:
-    from tidalapi.page import TrackList, ShortcutList
-    from tidalapi.page import HorizontalListWithContext, HorizontalList
-except ImportError:
-    TrackList = None
-    ShortcutList = None
-    HorizontalListWithContext = None
-    HorizontalList = None
+from tidalapi.page import TrackList, ShortcutList
+from tidalapi.page import HorizontalListWithContext, HorizontalList
 
 from .page import Page
 from ..widgets import HTShorcutsWidget
@@ -78,9 +71,7 @@ def _load_finish(self) -> None:
             self.set_title("")
 
         for index, category in enumerate(self.page.categories):
-            if isinstance(category.items[0], Track) or (
-                TrackList and isinstance(category, TrackList)
-            ):
+            if isinstance(category.items[0], Track) or isinstance(category, TrackList):
                 self.new_track_list_for(category.title, category.items)
             elif isinstance(category, TextBlock):
                 self.append(
@@ -99,14 +90,11 @@ def _load_finish(self) -> None:
                 self.new_link_carousel_for(
                     category.title if category.title else _("More"), category.items
                 )
-            elif ShortcutList and isinstance(category, ShortcutList):
+            elif isinstance(category, ShortcutList):
                 self.append(HTShorcutsWidget(category.items))
             elif (
                 isinstance(category, ItemList)
-                or (HorizontalList and isinstance(category, HorizontalList))
-                or (
-                    HorizontalListWithContext
-                    and isinstance(category, HorizontalListWithContext)
-                )
+                or isinstance(category, HorizontalList)
+                or isinstance(category, HorizontalListWithContext)
             ):
                 self.new_carousel_for(category.title, category.items)