tbr-deal-finder 0.1.7__py3-none-any.whl → 0.2.0__py3-none-any.whl

tbr_deal_finder/book.py

@@ -1,58 +1,58 @@
-import dataclasses
 import re
 from datetime import datetime
 from enum import Enum
-from typing import Optional, Union
+from typing import Union
 
 import click
 from Levenshtein import ratio
 from unidecode import unidecode
 
 from tbr_deal_finder.config import Config
-from tbr_deal_finder.utils import get_duckdb_conn, execute_query, get_query_by_name
+from tbr_deal_finder.utils import get_duckdb_conn, execute_query, get_query_by_name, echo_info
 
 _AUTHOR_RE = re.compile(r'[^a-zA-Z0-9]')
 
 class BookFormat(Enum):
     AUDIOBOOK = "Audiobook"
-    NA = "N/A"  # When format does not matter
-
-
-@dataclasses.dataclass
-class Book:    
-    retailer: str
-    title: str
-    authors: str
-    list_price: float
-    current_price: float
-    timepoint: datetime
-    format: Union[BookFormat, str]
-
-    # Metadata really only used for tracked books.
-    # See get_tbr_books for more context
-    audiobook_isbn: str = None
-    audiobook_list_price: float = 0
-
-    deleted: bool = False
-
-    deal_id: Optional[str] = None
-    exists: bool = True
-    normalized_authors: list[str] = None
-
-    def __post_init__(self):
-        self.current_price = round(self.current_price, 2)
-        self.list_price = round(self.list_price, 2)
-        self.normalized_authors = get_normalized_authors(self.authors)
-
-        # Strip the title down to its most basic repr
-        # Improves hit rate on retailers
-        self.title = self.title.split(":")[0].split("(")[0].strip()
-
-        if not self.deal_id:
-            self.deal_id = f"{self.title}__{self.normalized_authors}__{self.format}__{self.retailer}"
-
-        if isinstance(self.format, str):
-            self.format = BookFormat(self.format)
+    EBOOK = "E-Book"
+    NA = "N/A"  # When the format doesn't matter
+
+
+class Book:
+
+    def __init__(
+        self,
+        retailer: str,
+        title: str,
+        authors: str,
+        timepoint: datetime,
+        format: Union[BookFormat, str],
+        list_price: float = 0,
+        current_price: float = 0,
+        ebook_asin: str = None,
+        audiobook_isbn: str = None,
+        audiobook_list_price: float = 0,
+        deleted: bool = False,
+        exists: bool = True,
+    ):
+        self.retailer = retailer
+        self.title = get_normalized_title(title)
+        self.authors = authors
+        self.timepoint = timepoint
+
+        self.ebook_asin = ebook_asin
+        self.audiobook_isbn = audiobook_isbn
+        self.audiobook_list_price = audiobook_list_price
+        self.deleted = deleted
+        self.exists = exists
+
+        self.list_price = list_price
+        self.current_price = current_price
+        self.normalized_authors = get_normalized_authors(authors)
+
+        if isinstance(format, str):
+            format = BookFormat(format)
+        self.format = format
 
     def discount(self) -> int:
         return int((self.list_price/self.current_price - 1) * 100)
@@ -61,6 +61,10 @@ class Book:
     def price_to_string(price: float) -> str:
         return f"{Config.currency_symbol()}{price:.2f}"
 
+    @property
+    def deal_id(self) -> str:
+        return f"{self.title}__{self.normalized_authors}__{self.format}__{self.retailer}"
+
     @property
     def title_id(self) -> str:
         return f"{self.title}__{self.normalized_authors}__{self.format}"
@@ -69,6 +73,22 @@ class Book:
     def full_title_str(self) -> str:
         return f"{self.title}__{self.normalized_authors}"
 
+    @property
+    def current_price(self) -> float:
+        return self._current_price
+
+    @current_price.setter
+    def current_price(self, price: float):
+        self._current_price = round(price, 2)
+
+    @property
+    def list_price(self) -> float:
+        return self._list_price
+
+    @list_price.setter
+    def list_price(self, price: float):
+        self._list_price = round(price, 2)
+
     def list_price_string(self):
         return self.price_to_string(self.list_price)
 
@@ -81,17 +101,31 @@ class Book:
         title = self.title
         if len(self.title) > 75:
             title = f"{title[:75]}..."
-        return f"{title} by {self.authors} - {price} - {self.discount()}% Off at {self.retailer} - {book_format}"
+        return f"{title} by {self.authors} - {price} - {self.discount()}% Off at {self.retailer}"
 
     def dict(self):
-        response = dataclasses.asdict(self)
-        response["format"] = self.format.value
-        del response["audiobook_isbn"]
-        del response["audiobook_list_price"]
-        del response["exists"]
-        del response["normalized_authors"]
-
-        return response
+        return {
+            "retailer": self.retailer,
+            "title": self.title,
+            "authors": self.authors,
+            "list_price": self.list_price,
+            "current_price": self.current_price,
+            "timepoint": self.timepoint,
+            "format": self.format.value,
+            "deleted": self.deleted,
+            "deal_id": self.deal_id,
+        }
+
+    def tbr_dict(self):
+        return {
+            "title": self.title,
+            "authors": self.authors,
+            "format": self.format.value,
+            "ebook_asin": self.ebook_asin,
+            "audiobook_isbn": self.audiobook_isbn,
+            "audiobook_list_price": self.audiobook_list_price,
+            "book_id": self.title_id,
+        }
 
 
 def get_deals_found_at(timepoint: datetime) -> list[Book]:
@@ -114,13 +148,26 @@ def get_active_deals() -> list[Book]:
 
 
 def print_books(books: list[Book]):
-    prior_title_id = books[0].title_id
-    for book in books:
-        if prior_title_id != book.title_id:
-            prior_title_id = book.title_id
-            click.echo()
+    audiobooks = [book for book in books if book.format == BookFormat.AUDIOBOOK]
+    audiobooks = sorted(audiobooks, key=lambda book: book.deal_id)
 
-        click.echo(str(book))
+    ebooks = [book for book in books if book.format == BookFormat.EBOOK]
+    ebooks = sorted(ebooks, key=lambda book: book.deal_id)
+
+    for books_in_format in [audiobooks, ebooks]:
+        if not books_in_format:
+            continue
+
+        init_book = books_in_format[0]
+        echo_info(f"\n\n{init_book.format.value} Deals:")
+
+        prior_title_id = init_book.title_id
+        for book in books_in_format:
+            if prior_title_id != book.title_id:
+                prior_title_id = book.title_id
+                click.echo()
+
+            click.echo(str(book))
 
 
 def get_full_title_str(title: str, authors: Union[list, str]) -> str:
@@ -131,6 +178,10 @@ def get_title_id(title: str, authors: Union[list, str], book_format: BookFormat)
     return f"{title}__{get_normalized_authors(authors)}__{book_format.value}"
 
 
+def get_normalized_title(title: str) -> str:
+    return title.split(":")[0].split("(")[0].strip()
+
+
 def get_normalized_authors(authors: Union[str, list[str]]) -> list[str]:
     if isinstance(authors, str):
         authors = [i for i in authors.split(",")]

tbr_deal_finder/cli.py

@@ -9,11 +9,11 @@ import click
 import questionary
 
 from tbr_deal_finder.config import Config
-from tbr_deal_finder.library_exports import maybe_enrich_library_exports
 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.tracked_books import reprocess_incomplete_tbr_books
 from tbr_deal_finder.utils import (
     echo_err,
     echo_info,
@@ -180,6 +180,10 @@ def _set_config() -> Config:
 def setup():
     _set_config()
 
+    # Retailers may have changed causing some books to need reprocessing
+    config = Config.load()
+    reprocess_incomplete_tbr_books(config)
+
 
 @cli.command()
 def latest_deals():
@@ -189,8 +193,6 @@ def latest_deals():
     except FileNotFoundError:
         config = _set_config()
 
-    asyncio.run(maybe_enrich_library_exports(config))
-
     db_conn = get_duckdb_conn()
     results = execute_query(
         db_conn,

tbr_deal_finder/config.py

@@ -83,6 +83,16 @@ class Config:
     def tracked_retailers_str(self) -> str:
         return ", ".join(self.tracked_retailers)
 
+    def is_tracking_format(self, book_format) -> bool:
+        from tbr_deal_finder.retailer import RETAILER_MAP
+
+        for retailer_str in self.tracked_retailers:
+            retailer = RETAILER_MAP[retailer_str]()
+            if retailer.format == book_format:
+                return True
+
+        return False
+
     def set_library_export_paths(self, library_export_paths: Union[str, list[str]]):
         if not library_export_paths:
             self.library_export_paths = []

tbr_deal_finder/migrations.py

@@ -46,6 +46,22 @@ _MIGRATIONS = [
             );
             """
     ),
+    TableMigration(
+        version=1,
+        table_name="tbr_book",
+        sql="""
+            CREATE TABLE tbr_book
+            (
+                title                VARCHAR,
+                authors              VARCHAR,
+                format               VARCHAR,
+                ebook_asin           VARCHAR,
+                audiobook_isbn       VARCHAR,
+                audiobook_list_price FLOAT,
+                book_id              VARCHAR
+            );
+            """
+    ),
 ]
 
 

tbr_deal_finder/queries/get_active_deals.sql

@@ -1,4 +1,4 @@
-SELECT *
+SELECT * exclude(deal_id)
 FROM retailer_deal
 QUALIFY	ROW_NUMBER() OVER (PARTITION BY title, authors, retailer, format ORDER BY timepoint DESC) = 1 AND deleted IS NOT TRUE
 ORDER BY title, authors, retailer, format

tbr_deal_finder/queries/get_deals_found_at.sql

@@ -1,4 +1,4 @@
-SELECT *
+SELECT * exclude(deal_id)
 FROM retailer_deal
 WHERE timepoint = $timepoint AND deleted IS NOT TRUE
 ORDER BY title, authors, retailer, format

tbr_deal_finder/retailer/__init__.py

@@ -1,9 +1,11 @@
 from tbr_deal_finder.retailer.audible import Audible
 from tbr_deal_finder.retailer.chirp import Chirp
+from tbr_deal_finder.retailer.kindle import Kindle
 from tbr_deal_finder.retailer.librofm import LibroFM
 
 RETAILER_MAP = {
     "Audible": Audible,
     "Chirp": Chirp,
     "Libro.FM": LibroFM,
+    "Kindle": Kindle,
 }

tbr_deal_finder/retailer/amazon.py

@@ -0,0 +1,85 @@
+import sys
+import os.path
+
+import audible
+import click
+from audible.login import build_init_cookies
+from textwrap import dedent
+
+if sys.platform != 'win32':
+    # Breaks Windows support but required for Mac
+    # Untested on Linux
+    import readline  # type: ignore
+
+from tbr_deal_finder import TBR_DEALS_PATH
+from tbr_deal_finder.config import Config
+from tbr_deal_finder.retailer.models import Retailer
+
+_AUTH_PATH = TBR_DEALS_PATH.joinpath("audible.json")
+
+
+def login_url_callback(url: str) -> str:
+    """Helper function for login with external browsers."""
+
+    try:
+        from playwright.sync_api import sync_playwright  # type: ignore
+    except ImportError:
+        pass
+    else:
+        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.
+        Note: your browser will show you an error page (Page not found). This is expected.
+        
+        {url}
+
+        Once you have logged in, please insert the copied url.
+    """
+    click.echo(dedent(message))
+    return input()
+
+
+class Amazon(Retailer):
+    _auth: audible.Authenticator = None
+    _client: audible.AsyncClient = None
+
+    async def set_auth(self):
+        if not os.path.exists(_AUTH_PATH):
+            auth = audible.Authenticator.from_login_external(
+                locale=Config.locale,
+                login_url_callback=login_url_callback
+            )
+
+            # Save credentials to file
+            auth.to_file(_AUTH_PATH)
+
+        self._auth = audible.Authenticator.from_file(_AUTH_PATH)
+        self._client = audible.AsyncClient(auth=self._auth)
+

tbr_deal_finder/retailer/audible.py

@@ -1,74 +1,12 @@
 import asyncio
 import math
-import os.path
-from datetime import datetime
-from textwrap import dedent
-import readline  # type: ignore
 
-
-import audible
-import click
-from audible.login import build_init_cookies
-
-from tbr_deal_finder import TBR_DEALS_PATH
 from tbr_deal_finder.config import Config
-from tbr_deal_finder.retailer.models import Retailer
-from tbr_deal_finder.book import Book, BookFormat
-
-_AUTH_PATH = TBR_DEALS_PATH.joinpath("audible.json")
-
-
-def login_url_callback(url: str) -> str:
-    """Helper function for login with external browsers."""
-
-    try:
-        from playwright.sync_api import sync_playwright  # type: ignore
-    except ImportError:
-        pass
-    else:
-        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.
-        Note: your browser will show you an error page (Page not found). This is expected.
-        
-        {url}
+from tbr_deal_finder.retailer.amazon import Amazon
+from tbr_deal_finder.book import Book, BookFormat, get_normalized_title
 
-        Once you have logged in, please insert the copied url.
-    """
-    click.echo(dedent(message))
-    return input()
 
-
-class Audible(Retailer):
-    _auth: audible.Authenticator = None
-    _client: audible.AsyncClient = None
+class Audible(Amazon):
 
     @property
     def name(self) -> str:
@@ -78,23 +16,9 @@ class Audible(Retailer):
     def format(self) -> BookFormat:
         return BookFormat.AUDIOBOOK
 
-    async def set_auth(self):
-        if not os.path.exists(_AUTH_PATH):
-            auth = audible.Authenticator.from_login_external(
-                locale=Config.locale,
-                login_url_callback=login_url_callback
-            )
-
-            # Save credentials to file
-            auth.to_file(_AUTH_PATH)
-
-        self._auth = audible.Authenticator.from_file(_AUTH_PATH)
-        self._client = audible.AsyncClient(auth=self._auth)
-
     async def get_book(
         self,
         target: Book,
-        runtime: datetime,
         semaphore: asyncio.Semaphore
     ) -> Book:
         title = target.title
@@ -112,29 +36,18 @@ class Audible(Retailer):
             )
 
             for product in match.get("products", []):
-                if product["title"] != title:
+                if get_normalized_title(product["title"]) != title:
+                    continue
+                try:
+                    target.list_price = product["price"]["list_price"]["base"]
+                    target.current_price = product["price"]["lowest_price"]["base"]
+                    target.exists = True
+                    return target
+                except KeyError:
                     continue
 
-                return Book(
-                    retailer=self.name,
-                    title=title,
-                    authors=authors,
-                    list_price=product["price"]["list_price"]["base"],
-                    current_price=product["price"]["lowest_price"]["base"],
-                    timepoint=runtime,
-                    format=BookFormat.AUDIOBOOK
-                )
-
-            return Book(
-                retailer=self.name,
-                title=title,
-                authors=authors,
-                list_price=0,
-                current_price=0,
-                timepoint=runtime,
-                format=BookFormat.AUDIOBOOK,
-                exists=False,
-            )
+            target.exists = False
+            return target
 
     async def get_wishlist(self, config: Config) -> list[Book]:
         wishlist_books = []

tbr_deal_finder/retailer/chirp.py

@@ -9,17 +9,19 @@ import click
 
 from tbr_deal_finder import TBR_DEALS_PATH
 from tbr_deal_finder.config import Config
-from tbr_deal_finder.retailer.models import Retailer
+from tbr_deal_finder.retailer.models import AioHttpSession, Retailer
 from tbr_deal_finder.book import Book, BookFormat, get_normalized_authors, is_matching_authors
 from tbr_deal_finder.utils import currency_to_float, echo_err
 
 
-class Chirp(Retailer):
+class Chirp(AioHttpSession, Retailer):
     # Static because url for other locales just redirects to .com
     _url: str = "https://api.chirpbooks.com/api/graphql"
     USER_AGENT = "ChirpBooks/5.13.9 (Android)"
 
     def __init__(self):
+        super().__init__()
+
         self.auth_token = None
 
     @property
@@ -38,17 +40,17 @@ class Chirp(Retailer):
         if self.auth_token:
             headers["authorization"] = f"Bearer {self.auth_token}"
 
-        async with aiohttp.ClientSession() as http_client:
-            response = await http_client.request(
-                request_type.upper(),
-                self._url,
-                headers=headers,
-                **kwargs
-            )
-            if response.ok:
-                return await response.json()
-            else:
-                return {}
+        session = await self._get_session()
+        response = await session.request(
+            request_type.upper(),
+            self._url,
+            headers=headers,
+            **kwargs
+        )
+        if response.ok:
+            return await response.json()
+        else:
+            return {}
 
     async def set_auth(self):
         auth_path = TBR_DEALS_PATH.joinpath("chirp.json")
@@ -84,35 +86,26 @@ class Chirp(Retailer):
             json.dump(response, f)
 
     async def get_book(
-        self, target: Book, runtime: datetime, semaphore: asyncio.Semaphore
+        self, target: Book, semaphore: asyncio.Semaphore
     ) -> 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()
+            session = await self._get_session()
+            response = await session.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(
-                    retailer=self.name,
-                    title=title,
-                    authors=authors,
-                    list_price=0,
-                    current_price=0,
-                    timepoint=runtime,
-                    format=BookFormat.AUDIOBOOK,
-                    exists=False,
-                )
+                target.exists = False
+                return target
 
             for book in audiobooks:
                 if not book["currentProduct"]:
@@ -123,26 +116,12 @@ class Chirp(Retailer):
                     book["displayTitle"] == title
                     and is_matching_authors(target.normalized_authors, normalized_authors)
                 ):
-                    return Book(
-                        retailer=self.name,
-                        title=title,
-                        authors=authors,
-                        list_price=currency_to_float(book["currentProduct"]["listingPrice"]),
-                        current_price=currency_to_float(book["currentProduct"]["discountPrice"]),
-                        timepoint=runtime,
-                        format=BookFormat.AUDIOBOOK,
-                    )
+                    target.list_price = currency_to_float(book["currentProduct"]["listingPrice"])
+                    target.current_price = currency_to_float(book["currentProduct"]["discountPrice"])
+                    return target
 
-            return Book(
-                retailer=self.name,
-                title=title,
-                authors=target.authors,
-                list_price=0,
-                current_price=0,
-                timepoint=runtime,
-                format=BookFormat.AUDIOBOOK,
-                exists=False,
-            )
+            target.exists = False
+            return target
 
     async def get_wishlist(self, config: Config) -> list[Book]:
         wishlist_books = []