Fixed issue #13

zotify/__init__.py

@@ -252,6 +252,7 @@ class ApiClient(LibrespotApiClient):
         params: dict[str, Any] = {},
         limit: int = 20,
         offset: int = 0,
+        raw_url: bool = False,
     ) -> dict[str, Any]:
         """
         Requests data from API
@@ -269,10 +270,13 @@ class ApiClient(LibrespotApiClient):
             "Accept-Language": self.__session.language(),
             "app-platform": "WebPlayer",
         }
-        params["limit"] = limit
+        if not raw_url:
-        params["offset"] = offset
+            params["limit"] = limit
+            params["offset"] = offset
 
-        response = get(API_URL + url, headers=headers, params=params)
+            response = get(API_URL + url, headers=headers, params=params)
+        else:
+            response = get(url, headers=headers)
         data = response.json()
 
         try:

zotify/app.py

@@ -44,64 +44,112 @@ class Selection:
             "episode",
         ],
     ) -> list[str]:
+        offset = 0
         categories = ",".join(category)
-        with Loader("Searching..."):
+        ids = []
-            country = self.__session.api().invoke_url("me")["country"]
+        while True:
-            resp = self.__session.api().invoke_url(
+            with Loader("Searching..."):
-                "search",
+                country = self.__session.api().invoke_url("me")["country"]
-                {
+                resp = self.__session.api().invoke_url(
-                    "q": search_text,
+                    "search",
-                    "type": categories,
+                    {
-                    "include_external": "audio",
+                        "q": search_text,
-                    "market": country,
+                        "type": categories,
-                },
+                        "include_external": "audio",
-                limit=10,
+                        "market": country,
-                offset=0,
+                    },
-            )
+                    limit=10,
+                    offset=offset,
+                )
 
-        print(f'Search results for "{search_text}"')
+            print(f'Search results for "{search_text}"')
-        count = 0
+            count = 0
-        for cat in categories.split(","):
+            next_page = {}
-            label = cat + "s"
+            self.__items = []
-            items = resp[label]["items"]
+            for cat in categories.split(","):
-            if len(items) > 0:
+                label = cat + "s"
-                print(f"\n{label.capitalize()}:")
+                items = resp[label]["items"]
-                try:
+                next_page[label] = resp[label]["next"]
-                    self.__print(count, items, *self.__print_labels[cat])
+                if len(items) > 0:
-                except KeyError:
+                    print(f"\n{label.capitalize()}:")
-                    self.__print(count, items, "name")
+                    try:
-                count += len(items)
+                        self.__print(count, items, *self.__print_labels[cat])
-                self.__items.extend(items)
+                    except KeyError:
-        return self.__get_selection()
+                        self.__print(count, items, "name")
+                    count += len(items)
+                    self.__items.extend(items)
+
+            for id in self.__get_selection(allow_empty=True):
+                ids.append(id)
+
+            next_flag = False
+            for page in next_page.values():
+                if page is not None and next_flag is False:
+                    next_flag = True
+                    params = page.split("?", 1)[1]
+                    page_offset = int(params.split("&")[0].split("=")[1])
+                    offset = page_offset
+                    break
+
+            if not next_flag:
+                break
+
+            get_next = self.__get_next_prompt()
+            if get_next.lower() == "n":
+                break
+
+        return ids
 
     def get(self, category: str, name: str = "", content: str = "") -> list[str]:
         with Loader("Fetching items..."):
             r = self.__session.api().invoke_url(f"me/{category}", limit=50)
+
+        ids = []
+        while True:
             if content != "":
                 r = r[content]
             resp = r["items"]
 
-        for i in range(len(resp)):
+            self.__items = []
-            try:
+            for i in range(len(resp)):
-                item = resp[i][name]
+                try:
-            except KeyError:
+                    item = resp[i][name]
-                item = resp[i]
+                except KeyError:
-            self.__items.append(item)
+                    item = resp[i]
-            print(
+                self.__items.append(item)
-                "{:<2} {:<38}".format(i + 1, self.__fix_string_length(item["name"], 38))
+                print(
-            )
+                    "{:<2} {:<38}".format(
-        return self.__get_selection()
+                        i + 1, self.__fix_string_length(item["name"], 38)
+                    )
+                )
+
+            for id in self.__get_selection():
+                ids.append(id)
+
+            if r["next"] is None:
+                break
+
+            get_next = self.__get_next_prompt()
+            if get_next.lower() == "n":
+                break
+
+            with Loader("Fetching items..."):
+                r = self.__session.api().invoke_url(r["next"], raw_url=True)
+
+        return ids
 
     @staticmethod
     def from_file(file_path: Path) -> list[str]:
         with open(file_path, "r", encoding="utf-8") as f:
             return [line.strip() for line in f.readlines()]
 
-    def __get_selection(self) -> list[str]:
+    def __get_selection(self, allow_empty: bool = False) -> list[str]:
         print("\nResults to save (eg: 1,2,5 1-3)")
         selection = ""
         while len(selection) == 0:
             selection = input("==> ")
+            if len(selection) == 0 and allow_empty:
+                return []
         ids = []
         selections = selection.split(",")
         for i in selections:
@@ -149,6 +197,16 @@ class Selection:
             return text[: max_length - 3] + "..."
         return text
 
+    def __get_next_prompt(self) -> str:
+        print("\nGet next page? Y/n")
+        get_next = None
+        while get_next not in ["Y", "y", "N", "n"]:
+            get_next = input("==> ")
+            if len(get_next) == 0:
+                get_next = "y"
+
+        return get_next
+
 
 class App:
     def __init__(self, args: Namespace):