tbr-deal-finder 0.1.3__py3-none-any.whl → 0.1.5__py3-none-any.whl

tbr_deal_finder/cli.py

@@ -1,5 +1,6 @@
 import asyncio
 import os
+import sys
 from datetime import timedelta
 from textwrap import dedent
 from typing import Union
@@ -13,7 +14,14 @@ from tbr_deal_finder.migrations import make_migrations
 from tbr_deal_finder.book import get_deals_found_at, print_books, get_active_deals
 from tbr_deal_finder.retailer import RETAILER_MAP
 from tbr_deal_finder.retailer_deal import get_latest_deals
-from tbr_deal_finder.utils import get_duckdb_conn, get_query_by_name, execute_query
+from tbr_deal_finder.utils import (
+    echo_err,
+    echo_info,
+    echo_success,
+    execute_query,
+    get_duckdb_conn,
+    get_query_by_name
+)
 
 
 @click.group()
@@ -31,12 +39,12 @@ def _add_path(existing_paths: list[str]) -> Union[str, None]:
     try:
         new_path = os.path.expanduser(click.prompt("What is the new path"))
         if new_path in existing_paths:
-            click.echo(f"{new_path} is already being tracked.\n")
+            echo_info(f"{new_path} is already being tracked.\n")
             return None
         elif os.path.exists(new_path):
             return new_path
         else:
-            click.echo(f"Could not find {new_path}. Please try again.\n")
+            echo_err(f"Could not find {new_path}. Please try again.\n")
             return _add_path(existing_paths)
     except (KeyError, KeyboardInterrupt, TypeError):
         return None
@@ -116,14 +124,21 @@ def _set_locale(config: Config):
 
 
 def _set_tracked_retailers(config: Config):
-    config.set_tracked_retailers(
-        questionary.checkbox(
-            "Select the retailers you want to check deals for. "
-            "Tip: Chirp doesn't have a subscription and can have good deals. I'd recommend checking it.",
+    while True:
+        user_response = questionary.checkbox(
+            "Select the retailers you want to check deals for.\n"
+            "Tip: Chirp doesn't have a subscription and can have good deals. I'd recommend checking it.\n",
             choices=[
                 questionary.Choice(retailer, checked=retailer in config.tracked_retailers)
                 for retailer in RETAILER_MAP.keys()
-            ]).ask()
+        ]).ask()
+        if len(user_response) > 1:
+            break
+        else:
+            echo_err("You must track deals for at least one retailer.")
+
+    config.set_tracked_retailers(
+        user_response
     )
 
 
@@ -133,10 +148,14 @@ def _set_config() -> Config:
     except FileNotFoundError:
         config = Config(library_export_paths=[], tracked_retailers=list(RETAILER_MAP.keys()))
 
-    # Setting these config values are a little more involved,
-    #   so they're broken out into their own functions
-    _set_library_export_paths(config)
-    _set_tracked_retailers(config)
+    try:
+        # Config attrs that requires a user provided value
+        _set_library_export_paths(config)
+        _set_tracked_retailers(config)
+    except (KeyError, KeyboardInterrupt, TypeError):
+        echo_err("Config setup cancelled.")
+        sys.exit(0)
+
     _set_locale(config)
 
     config.max_price = click.prompt(
@@ -151,7 +170,7 @@ def _set_config() -> Config:
     )
 
     config.save()
-    click.echo("Configuration saved!")
+    echo_success("Configuration saved!")
 
     return config
 
@@ -182,7 +201,7 @@ def latest_deals():
         except Exception as e:
             ran_successfully = False
             details = f"Error getting deals: {e}"
-            click.echo(details)
+            echo_err(details)
         else:
             ran_successfully = True
             details = ""
@@ -198,7 +217,7 @@ def latest_deals():
             return
 
     else:
-        click.echo(dedent("""
+        echo_info(dedent("""
         To prevent abuse lastest deals can only be pulled every 8 hours.
         Fetching most recent deal results.\n
         """))
@@ -207,7 +226,7 @@ def latest_deals():
     if books := get_deals_found_at(config.run_time):
         print_books(books)
     else:
-        click.echo("No new deals found.")
+        echo_info("No new deals found.")
 
 
 @cli.command()
@@ -216,7 +235,7 @@ def active_deals():
     if books := get_active_deals():
         print_books(books)
     else:
-        click.echo("No deals found.")
+        echo_info("No deals found.")
 
 
 if __name__ == '__main__':

tbr_deal_finder/retailer/audible.py

@@ -7,7 +7,7 @@ import readline  # type: ignore
 
 import audible
 import click
-from audible.login import playwright_external_login_url_callback
+from audible.login import build_init_cookies
 
 from tbr_deal_finder import TBR_DEALS_PATH
 from tbr_deal_finder.config import Config
@@ -19,10 +19,41 @@ _AUTH_PATH = TBR_DEALS_PATH.joinpath("audible.json")
 
 def login_url_callback(url: str) -> str:
     """Helper function for login with external browsers."""
+
     try:
-        return playwright_external_login_url_callback(url)
+        from playwright.sync_api import sync_playwright  # type: ignore
+        use_playwright = True
     except ImportError:
-        pass
+        use_playwright = False
+
+    if use_playwright:
+        with sync_playwright() as p:
+            iphone = p.devices["iPhone 12 Pro"]
+            browser = p.webkit.launch(headless=False)
+            context = browser.new_context(
+                **iphone
+            )
+            cookies = []
+            for name, value in build_init_cookies().items():
+                cookies.append(
+                    {
+                        "name": name,
+                        "value": value,
+                        "url": url
+                    }
+                )
+            context.add_cookies(cookies)
+            page = browser.new_page()
+            page.goto(url)
+
+            while True:
+                page.wait_for_timeout(600)
+                if "/ap/maplanding" in page.url:
+                    response_url = page.url
+                    break
+
+            browser.close()
+        return response_url
 
     message = f"""\
         Please copy the following url and insert it into a web browser of your choice to log into Amazon.

tbr_deal_finder/retailer/chirp.py

@@ -21,18 +21,19 @@ class Chirp(Retailer):
     ) -> Book:
         title = target.title
         authors = target.authors
+        async with semaphore:
+            async with aiohttp.ClientSession() as http_client:
+                response = await http_client.request(
+                    "POST",
+                    self._url,
+                    json={
+                        "query": "fragment audiobookFields on Audiobook{id averageRating coverUrl displayAuthors displayTitle ratingsCount url allAuthors{name slug url}} fragment audiobookWithShoppingCartAndUserAudiobookFields on Audiobook{...audiobookFields currentUserShoppingCartItem{id}currentUserWishlistItem{id}currentUserUserAudiobook{id}currentUserHasAuthorFollow{id}} fragment productFields on Product{discountPrice id isFreeListing listingPrice purchaseUrl savingsPercent showListingPrice timeLeft bannerType} query AudiobookSearch($query:String!,$promotionFilter:String,$filter:String,$page:Int,$pageSize:Int){audiobooks(query:$query,promotionFilter:$promotionFilter,filter:$filter,page:$page,pageSize:$pageSize){totalCount objects(page:$page,pageSize:$pageSize){... on Audiobook{...audiobookWithShoppingCartAndUserAudiobookFields futureSaleDate currentProduct{...productFields}}}}}",
+                        "variables": {"query": title, "filter": "all", "page": 1, "promotionFilter": "default"},
+                        "operationName": "AudiobookSearch"
+                    }
+                )
+                response_body = await response.json()
 
-        async with aiohttp.ClientSession() as http_client:
-            response = await http_client.request(
-                "POST",
-                self._url,
-                json={
-                    "query": "fragment audiobookFields on Audiobook{id averageRating coverUrl displayAuthors displayTitle ratingsCount url allAuthors{name slug url}} fragment audiobookWithShoppingCartAndUserAudiobookFields on Audiobook{...audiobookFields currentUserShoppingCartItem{id}currentUserWishlistItem{id}currentUserUserAudiobook{id}currentUserHasAuthorFollow{id}} fragment productFields on Product{discountPrice id isFreeListing listingPrice purchaseUrl savingsPercent showListingPrice timeLeft bannerType} query AudiobookSearch($query:String!,$promotionFilter:String,$filter:String,$page:Int,$pageSize:Int){audiobooks(query:$query,promotionFilter:$promotionFilter,filter:$filter,page:$page,pageSize:$pageSize){totalCount objects(page:$page,pageSize:$pageSize){... on Audiobook{...audiobookWithShoppingCartAndUserAudiobookFields futureSaleDate currentProduct{...productFields}}}}}",
-                    "variables": {"query": title, "filter": "all", "page": 1, "promotionFilter": "default"},
-                    "operationName": "AudiobookSearch"
-                }
-            )
-            response_body = await response.json()
             audiobooks = response_body["data"]["audiobooks"]["objects"]
             if not audiobooks:
                 return Book(

tbr_deal_finder/retailer/librofm.py

@@ -77,15 +77,17 @@ class LibroFM(Retailer):
 
     async def get_book_isbn(self, book: Book, semaphore: asyncio.Semaphore) -> Union[str, None]:
         title = book.title
-        response = await self.make_request(
-            f"api/v10/explore/search",
-            "GET",
-            params={
-                "q": title,
-                "searchby": "titles",
-                "sortby": "relevance#results",
-            },
-        )
+
+        async with semaphore:
+            response = await self.make_request(
+                f"api/v10/explore/search",
+                "GET",
+                params={
+                    "q": title,
+                    "searchby": "titles",
+                    "sortby": "relevance#results",
+                },
+            )
 
         for b in response["audiobook_collection"]["audiobooks"]:
             if title == b["title"] and book.normalized_authors == get_normalized_authors(b["authors"]):
@@ -108,10 +110,12 @@ class LibroFM(Retailer):
                 format=BookFormat.AUDIOBOOK,
                 exists=False,
             )
-        response = await self.make_request(
-            f"api/v10/explore/audiobook_details/{target.audiobook_isbn}",
-            "GET"
-        )
+
+        async with semaphore:
+            response = await self.make_request(
+                f"api/v10/explore/audiobook_details/{target.audiobook_isbn}",
+                "GET"
+            )
 
         if response:
             return Book(

tbr_deal_finder/retailer_deal.py

@@ -11,7 +11,7 @@ from tbr_deal_finder.config import Config
 from tbr_deal_finder.library_exports import get_tbr_books
 from tbr_deal_finder.retailer import RETAILER_MAP
 from tbr_deal_finder.retailer.models import Retailer
-from tbr_deal_finder.utils import get_duckdb_conn
+from tbr_deal_finder.utils import get_duckdb_conn, echo_warning, echo_info
 
 
 def update_retailer_deal_table(config: Config, new_deals: list[Book]):
@@ -41,7 +41,7 @@ def update_retailer_deal_table(config: Config, new_deals: list[Book]):
     # Any remaining values in active_deal_map mean that
     # it wasn't found and should be marked for deletion
     for deal in active_deal_map.values():
-        click.echo(f"{str(deal)} is no longer active")
+        echo_warning(f"{str(deal)} is no longer active")
         deal.timepoint = config.run_time
         deal.deleted = True
         df_data.append(deal.dict())
@@ -101,12 +101,12 @@ async def _get_books(config, retailer: Retailer, books: list[Book]) -> list[Book
             unresolved_books.append(book)
 
     if retry_books := _retry_books(response, books):
-        click.echo("Attempting to find missing books with alternate title")
+        echo_info("Attempting to find missing books with alternate title")
         response.extend(await _get_books(config, retailer, retry_books))
     elif unresolved_books:
         click.echo()
         for book in unresolved_books:
-            click.echo(f"{book.title} by {book.authors} not found")
+            echo_info(f"{book.title} by {book.authors} not found")
 
     return response
 
@@ -168,7 +168,7 @@ async def get_latest_deals(config: Config):
         retailer = RETAILER_MAP[retailer_str]()
         await retailer.set_auth()
 
-        click.echo(f"Getting deals from {retailer.name}")
+        echo_info(f"Getting deals from {retailer.name}")
         click.echo("\n---------------")
         books.extend(await _get_books(config, retailer, tbr_books))
         click.echo("---------------\n")

tbr_deal_finder/utils.py

@@ -1,6 +1,7 @@
 import re
 from typing import Optional
 
+import click
 import duckdb
 
 from tbr_deal_finder import TBR_DEALS_PATH, QUERY_PATH
@@ -38,3 +39,19 @@ def execute_query(
 
 def get_query_by_name(file_name: str) -> str:
     return QUERY_PATH.joinpath(file_name).read_text()
+
+
+def echo_err(message):
+    click.secho(f'\n❌  {message}\n', fg='red', bold=True)
+
+
+def echo_success(message):
+    click.secho(f'\n✅  {message}', fg='green', bold=True)
+
+
+def echo_warning(message):
+    click.secho(f'\n⚠️  {message}', fg='yellow')
+
+
+def echo_info(message):
+    click.secho(f'{message}', fg='blue')

{tbr_deal_finder-0.1.3.dist-info → tbr_deal_finder-0.1.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tbr-deal-finder
-Version: 0.1.3
+Version: 0.1.5
 Summary: Track price drops and find deals on books in your TBR list across audiobook and ebook formats.
 License: MIT
 License-File: LICENSE
@@ -32,7 +32,7 @@ Track price drops and find deals on books in your TBR (To Be Read) list across a
 ### Audiobooks
 * Audible
 * Chirp
-* Libro.fm (Work in progress)
+* Libro.fm
 
 ### Locales
 * US
@@ -106,7 +106,7 @@ tbr-deal-finder setup
 
 #### UV
 ```sh
-uv run -m tbr_deal_finder.main setup
+uv run -m tbr_deal_finder.cli setup
 ```
 
 You will be prompted to:
@@ -131,7 +131,7 @@ tbr-deal-finder [COMMAND]
 
 #### UV
 ```sh
-uv run -m tbr_deal_finder.main [COMMAND]
+uv run -m tbr_deal_finder.cli [COMMAND]
 ```
 
 Example:
@@ -140,7 +140,7 @@ tbr-deal-finder latest-deals
 
 # or
 
-uv run -m tbr_deal_finder.main latest-deals
+uv run -m tbr_deal_finder.cli latest-deals
 ```
 
 ## Updating your TBR

{tbr_deal_finder-0.1.3.dist-info → tbr_deal_finder-0.1.5.dist-info}/RECORD

@@ -1,21 +1,21 @@
 tbr_deal_finder/__init__.py,sha256=WCoj0GZrRiCQlrpkLTw1VUeJmX-RtBLdLqnFYn1Es_4,208
 tbr_deal_finder/book.py,sha256=2MQirkxDIVKdQQ07U56zwOw45rC8KH-5aC932_X9dhE,3333
-tbr_deal_finder/cli.py,sha256=8riqTK5QVPKyP3aUQ3hHjNbIuZ0ibF_WLiNFMBqddT4,6830
+tbr_deal_finder/cli.py,sha256=1O_smeeIJSLWBg5vzSGIv-LDU8RYXHIBnrX_wOhuIKM,7168
 tbr_deal_finder/config.py,sha256=3fgN92sVsQbVqRBc58QK9w5t35zoPX6pP3k4nnJ_YTg,3441
 tbr_deal_finder/library_exports.py,sha256=FJXBQV_9H5AI_cwNuGjvGQxgQ1RLlpldmDBwc_PsiK4,5474
 tbr_deal_finder/migrations.py,sha256=6_WV55bm71UCFrcFrfJXlEX5uDrgnNTWZPq6vZTg18o,3733
-tbr_deal_finder/retailer_deal.py,sha256=J3dGceB84wDQUV0FsW_0I0PLA5nU6LStzAx6sMNTo2c,6408
-tbr_deal_finder/utils.py,sha256=c_AfIpfE1IAewUBiaRhPHjBM2o-fvuVVcWfM7jPEOvk,1021
+tbr_deal_finder/retailer_deal.py,sha256=mo3LkWWn6KENgaL9ZnIO24l-T43HZHbKLPG_D0dOsqU,6432
+tbr_deal_finder/utils.py,sha256=_4wdGFDtqCdMyoMnwTDiHgCR4WQLAcQr8LlZZZUcq6E,1357
 tbr_deal_finder/queries/get_active_deals.sql,sha256=jILZK5UVNPLbbKWgqMW0brEZyCb9XBdQZJLHRULoQC4,195
 tbr_deal_finder/queries/get_deals_found_at.sql,sha256=1vAE8PsAvfFi0SbvoUw8pvLwRN9VGYTJ7AVI3rmxXEI,122
 tbr_deal_finder/queries/latest_deal_last_ran_most_recent_success.sql,sha256=W4cNMAHtcW2DzQyPL8SHHFcbVZQKVK2VfTzazxC3LJU,107
 tbr_deal_finder/retailer/__init__.py,sha256=WePMSN7vi4EL_uPiAH6ogNNE-kRQe4OHT4CYGTKvBSk,243
-tbr_deal_finder/retailer/audible.py,sha256=7QYkaZOlImYOiBUo4zqhqwMEQVLMR895sk4rK7qpO3g,3478
-tbr_deal_finder/retailer/chirp.py,sha256=mi2uIhiXHxMnlRgtd1BZULEZbpF_K2HzxWubV4v_vvc,3540
-tbr_deal_finder/retailer/librofm.py,sha256=M4WvGh3Gf3LVUE3KOCVtNKJB8koQasgybUFhKBvqBe0,4476
+tbr_deal_finder/retailer/audible.py,sha256=7z7rDQBcCwOhdATU4BJjsJ-QBP0HnxscMSGPmzN_K2k,4408
+tbr_deal_finder/retailer/chirp.py,sha256=_ckdNPQT39Qy6ixI7sZLpEEDDgbxZn6_t4pQOiCULiE,3614
+tbr_deal_finder/retailer/librofm.py,sha256=YZojG8B0WftQFphJjNWvMSBVVd8oGsg8cr00jKwt9xw,4590
 tbr_deal_finder/retailer/models.py,sha256=zEwyM_0ildB8p38sxfpE6p2dIvtwAjeaul-GkJlk2Fo,1012
-tbr_deal_finder-0.1.3.dist-info/METADATA,sha256=wguRn_cH0FpnBBEH1bqqzqkze6FYHaTNg7mSezzABTM,4160
-tbr_deal_finder-0.1.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-tbr_deal_finder-0.1.3.dist-info/entry_points.txt,sha256=y_KG1k8xVCY8gngSZ-na2bkK-tTLUdOc_qZ9Djwldv0,60
-tbr_deal_finder-0.1.3.dist-info/licenses/LICENSE,sha256=rNc0wNPn4d4HHu6ZheJzeUaz_FbJ4rj2Dr2FjAivkNg,1064
-tbr_deal_finder-0.1.3.dist-info/RECORD,,
+tbr_deal_finder-0.1.5.dist-info/METADATA,sha256=d9sfj3B4vbzXeysL_xHsKvoCUo15SI1x2meI-tow0Cg,4138
+tbr_deal_finder-0.1.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+tbr_deal_finder-0.1.5.dist-info/entry_points.txt,sha256=y_KG1k8xVCY8gngSZ-na2bkK-tTLUdOc_qZ9Djwldv0,60
+tbr_deal_finder-0.1.5.dist-info/licenses/LICENSE,sha256=rNc0wNPn4d4HHu6ZheJzeUaz_FbJ4rj2Dr2FjAivkNg,1064
+tbr_deal_finder-0.1.5.dist-info/RECORD,,