Refactor set info requests

Author: thrly

src/scry/cli.py

@@ -3,7 +3,7 @@
 
 from scry.db_queries import get_unique_cards
 from scry.loading import Loading
-from scry.request import find_current_release, check_date_past
+from scry.request import find_current_release, check_date_past, get_set_info
 from . import (
     get_random_card,
     insert_cards,
@@ -140,43 +140,44 @@ def handle_search(args, db_connection):
 
 
 def handle_set(args, db_connection):
-    # Search for a set of cards
+    # Searches for a specific set of cards
+
     connection = db_connection
+
+    # loading animation
+    loading = Loading().start()
+
+    # use setcode, or find setcode of "latest" set
     query_setcode = ""
     if args.set_query.lower() == "latest":
-        # Find the moce recent release and query stats for it
+        # Find the most recent release and query stats for it
         current_set = find_current_release(set_codes())
-        current_set_code = current_set.get("set_code")
-        query_setcode = str(current_set_code)
-        current_set_name = current_set.get("name")
-        print(f"Stats for {current_set_name} ({current_set_code}):")
+        query_setcode = str(current_set)
     else:
         query_setcode = str(args.set_query)
-        print(
-            f"Stats for \033[1m{lookup_set_info("name", args.set_query.upper()).upper()}\033[0m"
-        )
 
-    query = f"set:{query_setcode}"  # unique:prints includes variations within set, otherwise only unique cards
+    # request general set info from /set:code
+    set_info = get_set_info(query_setcode)
 
-    card_list = get_card_list(query) or []
-    stamp = get_timestamp()
+    set_name = set_info.get("name")
+    set_date = set_info.get("released_at")
+    set_count = set_info.get("card_count")
 
+    # request list of cards from set
+    # optionally append `unique:prints` for variations within set
+    setlist_query = f"set:{query_setcode}"
+    card_list = get_card_list(setlist_query) or []
+    stamp = get_timestamp()
     insert_cards(card_list, stamp, connection)
 
-    # loading animation
-    loading = Loading().start()
-    set_release_details = []
-    set_release_details.append(lookup_set_info("release_date", query_setcode.upper()))
-    set_release_details.append(lookup_set_info("card_count", query_setcode.upper()))
-    set_release_details.append(get_unique_cards(connection, stamp))
     loading.end()
 
-    print(
-        f"""
-\x1b[3m  Released: {set_release_details[0]}
-  {set_release_details[1]} cards in set
-  (Showing {set_release_details[2]} unique cards only)\n \033[0m"""
-    )
+    print(f"Stats for \033[1m{set_name} ({query_setcode.upper()})\033[0m")
+    print(f"\x1b[3m  Released: {set_date}")
+    print(f"  {set_count} cards in set")
+    print(f"  Showing {get_unique_cards(connection,stamp)} unique cards\n \033[0m")
+
+    # finally show stats for the set
     print_stats(connection, stamp)
 
 
@@ -232,9 +233,11 @@ def format_set_info(set_details) -> str:
 
 
 def lookup_set_info(info: str, set_code: str) -> str:
+    # TODO: don't call set codes every time!!
     setlist = set_codes()
     for s in setlist:
         if set_code == s["set_code"]:
+            print(s[info])
             return s[info]
     return "Set info not found. Check the setcode is correct. You can request name, card_count, release_date"
 

src/scry/request.py

@@ -208,3 +208,30 @@ def set_codes(include_all_sets=False) -> list:
     except requests.exceptions.RequestException as err:
         print("Setlist ERROR: ", err)
         return []
+
+
+def get_set_info(set_code: str) -> dict:
+    endpoint = "/sets/"
+
+    sleep(0.1)  # just in case we ever call this in a loop
+
+    try:
+        req_url = url + endpoint + set_code
+        res = requests.get(req_url, headers=headers, timeout=TIMEOUT)
+        res.raise_for_status()
+
+        response = res.json()
+
+        show_warnings(response)
+
+        if res.status_code == 200:
+            return response
+        else:
+            print(
+                "Something may have gone wrong getting info about the set. Status Code: ",
+                res.status_code,
+            )
+            return {}
+    except requests.exceptions.RequestException as err:
+        print("Setlist ERROR: ", err)
+        return {}