tbr-deal-finder 0.3.1__py3-none-any.whl → 0.3.2__py3-none-any.whl

tbr_deal_finder/__init__.py

@@ -1,5 +1,5 @@
 from pathlib import Path
 
-__VERSION__ = "0.3.1"
+__VERSION__ = "0.3.2"
 
 QUERY_PATH = Path(__file__).parent.joinpath("queries")

tbr_deal_finder/gui/main.py

@@ -26,6 +26,7 @@ class TBRDealFinderApp:
         self.current_page = "all_deals"
         self.selected_book = None
         self.update_info = None  # Store update information
+        self.nav_disabled = False  # Track navigation disabled state
         
         # Initialize pages
         self.settings_page = SettingsPage(self)
@@ -258,6 +259,16 @@ class TBRDealFinderApp:
 
     def nav_changed(self, e):
         """Handle navigation rail selection changes"""
+        # Prevent navigation if disabled
+        if self.nav_disabled:
+            # Reset to current page selection to prevent visual change
+            current_indices = {"all_deals": 0, "latest_deals": 1, "all_books": 2}
+            self.nav_rail.selected_index = current_indices.get(self.current_page, 0)
+            # Reapply disabled state after page update
+            self.nav_rail.disabled = True
+            self.page.update()
+            return
+            
         destinations = ["all_deals", "latest_deals", "all_books"]
         if e.control.selected_index < len(destinations):
             self.current_page = destinations[e.control.selected_index]
@@ -289,6 +300,23 @@ class TBRDealFinderApp:
         self.latest_deals_page.refresh_page_state()
         self.all_books_page.refresh_page_state()
 
+    def disable_navigation(self):
+        """Disable navigation rail during background operations"""
+        self.nav_disabled = True
+        if hasattr(self, 'nav_rail'):
+            self.nav_rail.disabled = True
+            self.page.update()
+
+    def enable_navigation(self):
+        """Enable navigation rail after background operations complete"""
+        if not self.nav_disabled:
+            return
+
+        self.nav_disabled = False
+        if hasattr(self, 'nav_rail'):
+            self.nav_rail.disabled = False
+            self.page.update()
+
     def get_current_page_content(self):
         """Get content for the current page"""
         if self.config is None and self.current_page != "settings":
@@ -309,6 +337,7 @@ class TBRDealFinderApp:
 
     def get_config_prompt(self):
         """Show config setup prompt when no config exists"""
+        self.disable_navigation()
         return ft.Container(
             content=ft.Column([
                 ft.Icon(ft.Icons.SETTINGS, size=64, color=ft.Colors.GREY_400),

tbr_deal_finder/gui/pages/all_books.py

@@ -39,6 +39,9 @@ class AllBooksPage(BaseBookPage):
 
     async def _async_load_items(self):
         """Load TBR books asynchronously using Flet's async support"""
+        # Disable navigation during the loading operation
+        self.app.disable_navigation()
+        
         try:
             # Run the async operation directly
             await self.app.auth_all_configured_retailers()
@@ -50,6 +53,10 @@ class AllBooksPage(BaseBookPage):
             self.filtered_items = []
         finally:
             self.set_loading(False)
+            
+            # Re-enable navigation after the operation completes
+            self.app.enable_navigation()
+            
             # Update the page to reflect the loaded data
             self.app.page.update()
 

tbr_deal_finder/gui/pages/base_book_page.py

@@ -142,8 +142,7 @@ class BaseBookPage(ABC):
             item_tiles.append(tile)
         
         return ft.Container(
-            content=ft.ListView(item_tiles, spacing=5),
-            height=700,
+            content=ft.Column(item_tiles, spacing=5),
             border=ft.border.all(1, ft.Colors.OUTLINE),
             border_radius=8,
             padding=10

tbr_deal_finder/gui/pages/latest_deals.py

@@ -274,6 +274,9 @@ class LatestDealsPage(BaseBookPage):
         self.progress_container.visible = True
         self.run_button.disabled = True
         
+        # Disable navigation during the operation
+        self.app.disable_navigation()
+        
         # Update the page to show loading state
         self.app.page.update()
         
@@ -299,6 +302,9 @@ class LatestDealsPage(BaseBookPage):
             self.run_button.disabled = False
             self.check_last_run()  # Refresh the status
             
+            # Re-enable navigation after the operation
+            self.app.enable_navigation()
+            
             # Update the page to reset loading state
             self.app.page.update()
             

tbr_deal_finder/gui/pages/settings.py

@@ -309,6 +309,7 @@ class SettingsPage:
             clear_unknown_books()
             
             self.show_success("Configuration saved successfully!")
+            self.app.enable_navigation()
             self.app.config_updated(self.config)
             
         except Exception as ex:

tbr_deal_finder/retailer_deal.py

@@ -2,16 +2,14 @@ import asyncio
 import copy
 from collections import defaultdict
 
-import click
 import pandas as pd
-from tqdm.asyncio import tqdm_asyncio
 
 from tbr_deal_finder.book import Book, get_active_deals, BookFormat
 from tbr_deal_finder.config import Config
 from tbr_deal_finder.tracked_books import get_tbr_books, get_unknown_books, set_unknown_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, echo_info, echo_err, is_gui_env
+from tbr_deal_finder.utils import get_duckdb_conn, echo_info, echo_err
 
 
 def update_retailer_deal_table(config: Config, new_deals: list[Book]):
@@ -67,6 +65,13 @@ async def _get_books(
     Returns:
         List of Book objects with updated pricing and availability
     """
+
+    echo_info(f"Getting deals from {retailer.name}")
+    books = _get_retailer_relevant_tbr_books(
+        retailer,
+        books,
+    )
+
     semaphore = asyncio.Semaphore(retailer.max_concurrency)
     response = []
     unknown_books = []
@@ -81,11 +86,7 @@ async def _get_books(
         if book.deal_id not in ignored_deal_ids
     ]
 
-    if is_gui_env():
-        results = await asyncio.gather(*tasks)
-    else:
-        results = await tqdm_asyncio.gather(*tasks, desc=f"Getting latest prices from {retailer.name}")
-
+    results = await asyncio.gather(*tasks)
     for book in results:
         if not book:
             """Cases where we know the retailer has the book but it's not coming back.
@@ -99,9 +100,7 @@ async def _get_books(
         elif not book.exists:
             unknown_books.append(book)
 
-    click.echo()
-    for book in unknown_books:
-        echo_info(f"{book.title} by {book.authors} not found")
+    echo_info(f"Finished getting deals from {retailer.name}")
 
     return response, unknown_books
 
@@ -184,34 +183,26 @@ async def _get_latest_deals(config: Config):
     ignore_books: list[Book] = get_unknown_books(config)
     ignored_deal_ids: set[str] = {book.deal_id for book in ignore_books}
 
+    tasks = []
     for retailer_str in config.tracked_retailers:
         retailer = RETAILER_MAP[retailer_str]()
         await retailer.set_auth()
 
-        relevant_tbr_books = _get_retailer_relevant_tbr_books(
-            retailer,
-            tbr_books,
+        tasks.append(
+            _get_books(
+                config,
+                retailer,
+                tbr_books,
+                ignored_deal_ids
+            )
         )
 
-        echo_info(f"Getting deals from {retailer.name}")
-        click.echo("\n---------------")
-        retailer_books, u_books = await _get_books(
-            config,
-            retailer,
-            relevant_tbr_books,
-            ignored_deal_ids
-        )
+    results = await asyncio.gather(*tasks)
+    for retailer_books, u_books in results:
         books.extend(retailer_books)
         unknown_books.extend(u_books)
-        click.echo("---------------\n")
 
     _apply_proper_list_prices(books)
-
-    books = [
-        book
-        for book in books
-    ]
-
     update_retailer_deal_table(config, books)
     set_unknown_books(config, unknown_books)
 

tbr_deal_finder/utils.py

@@ -27,25 +27,34 @@ def get_data_dir() -> Path:
     app_name = "TBR Deal Finder"
 
     if custom_path := os.getenv("TBR_DEAL_FINDER_CUSTOM_PATH"):
-        path = Path(custom_path)
-
-    elif not is_gui_env():
-        path = Path.home() / ".tbr_deal_finder"
-
-    elif sys.platform == "win32":
-        # Windows: C:\Users\Username\AppData\Local\AppAuthor\AppName
-        base = os.environ.get("LOCALAPPDATA", os.path.expanduser("~\\AppData\\Local"))
-        path = Path(base) / app_author / app_name
-
-    elif sys.platform == "darwin":
-        # macOS: ~/Library/Application Support/AppName
-        path = Path.home() / "Library" / "Application Support" / app_name
-
-    else:  # Linux and others
-        # Linux: ~/.local/share/appname (following XDG spec)
-        xdg_data_home = os.environ.get("XDG_DATA_HOME",
-                                       os.path.expanduser("~/.local/share"))
-        path = Path(xdg_data_home) / app_name.lower()
+        path = Path(custom_path).expanduser()
+    else:
+        cli_path = Path.home() / ".tbr_deal_finder"
+        if sys.platform == "win32":
+            # Windows: C:\Users\Username\AppData\Local\AppAuthor\AppName
+            base = os.environ.get("LOCALAPPDATA", os.path.expanduser("~\\AppData\\Local"))
+            gui_path = Path(base) / app_author / app_name
+
+        elif sys.platform == "darwin":
+            # macOS: ~/Library/Application Support/AppName
+            gui_path = Path.home() / "Library" / "Application Support" / app_name
+
+        else:  # Linux and others
+            # Linux: ~/.local/share/appname (following XDG spec)
+            xdg_data_home = os.environ.get("XDG_DATA_HOME",
+                                           os.path.expanduser("~/.local/share"))
+            gui_path = Path(xdg_data_home) / app_name.lower()
+
+        if is_gui_env():
+            path = gui_path
+            if cli_path.exists() and not path.exists():
+                # Use the cli path if it exists and the gui path does not
+                path = cli_path
+        else:
+            path = cli_path
+            if gui_path.exists() and not path.exists():
+                # Use the gui path if it exists and the cli path does not
+                path = gui_path
 
     # Create directory if it doesn't exist
     path.mkdir(parents=True, exist_ok=True)

{tbr_deal_finder-0.3.1.dist-info → tbr_deal_finder-0.3.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tbr-deal-finder
-Version: 0.3.1
+Version: 0.3.2
 Summary: Track price drops and find deals on books in your TBR list across audiobook and ebook formats.
 License: MIT
 License-File: LICENSE

{tbr_deal_finder-0.3.1.dist-info → tbr_deal_finder-0.3.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-tbr_deal_finder/__init__.py,sha256=iYLaqaUWltN1HqI41ELPAw8KoYbwf9AbF4iXz4we5xw,104
+tbr_deal_finder/__init__.py,sha256=3Zo2T2Th8AT8qexLKWZhNJIeyXPVf2N76kkDGJw5Wc0,104
 tbr_deal_finder/__main__.py,sha256=b2-3WiGIno_XVusUDijQXa2MthKahFz6CVH-hIBe7es,165
 tbr_deal_finder/book.py,sha256=WbvDEeI923iQX_eIsC9H7y-qKVPkfCqwjBCqChssFCM,6740
 tbr_deal_finder/cli.py,sha256=16vZnWS9TTWPhIjZsjsf7OY7Btb0ULOfws5EkUefbRY,7089
@@ -6,19 +6,19 @@ tbr_deal_finder/config.py,sha256=pocHMEoJVIoiuRzEtKDAmsGmiiLgD-lN6n6TU9gI8Lc,398
 tbr_deal_finder/desktop_updater.py,sha256=VCD4MW1ckx6yyq0N_CJrOth8wePqPhTjhvdJTKsUVkw,5123
 tbr_deal_finder/migrations.py,sha256=fO7r2JbWb6YG0CsPqauakwvbKaEFPxqX1PP8c8N03Wc,4951
 tbr_deal_finder/owned_books.py,sha256=Cf1VeiSg7XBi_TXptJfy5sO1mEgMMQWbJ_P6SzAx0nQ,516
-tbr_deal_finder/retailer_deal.py,sha256=S5E7XHYx-L-31jvuIJ_vaaTCeTSxCjosLFkdA-fBc1o,7525
+tbr_deal_finder/retailer_deal.py,sha256=l2n-79kSNZfPh73PZBbSE6tkNYYCaHPEehIPcelDPeY,7214
 tbr_deal_finder/tracked_books.py,sha256=u3KfBNlwvsEwTfM5TAJVLbiTmm1lTe2k70JJOszQz1k,12714
-tbr_deal_finder/utils.py,sha256=mWqn-AUniLG0If3Hm2fwvRf2tycA-47oHtd3HKFfzbU,3159
+tbr_deal_finder/utils.py,sha256=LJYRNPRO3XBFIlodGzxCxlxiQ9viNYGU5QjNnjz4qMA,3635
 tbr_deal_finder/version_check.py,sha256=tzuKWngnjSdjPAOdyuPk2ym6Lv3LyeObJAfgsBIH9YQ,1217
 tbr_deal_finder/gui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tbr_deal_finder/gui/main.py,sha256=I2YNyZkIln6bEl1E2aHqHd3eOJurgMBW-gZMN1MQAOU,26413
+tbr_deal_finder/gui/main.py,sha256=VvdCdSH3mbVhw_3PaDD78U8RQV-drTyXyCNSWFwmoe8,27539
 tbr_deal_finder/gui/pages/__init__.py,sha256=1xc9Ib3oX_hqxLdhZvbCv3AhwOmVBSklZZC6CAcvoMU,20
-tbr_deal_finder/gui/pages/all_books.py,sha256=FG9mHofSmNUiYY9EeOBZeWUAAAxhvkTTWLoK1tJJrSc,3418
+tbr_deal_finder/gui/pages/all_books.py,sha256=uQguQ9_NjM5kq_D5DbOWFB9om1lOdPk1iTcjH0yl9bg,3655
 tbr_deal_finder/gui/pages/all_deals.py,sha256=rY08w4XXFc_Jbd39BPJ6fO00vstuuu2YHvZterHx5ZI,2389
-tbr_deal_finder/gui/pages/base_book_page.py,sha256=Car1OSX571xBz_WHCMYZ4f5-Nd0FLB5MC_xC41g5aFU,10491
+tbr_deal_finder/gui/pages/base_book_page.py,sha256=kmHjJE4eIGrMhXtBWePn_eXfO6qJ36kIoQ7hE1xB3ic,10465
 tbr_deal_finder/gui/pages/book_details.py,sha256=POknUa9yNjfqhC6eXuw7RtaRcFtQj_CdvJ8mK2r6DDo,22047
-tbr_deal_finder/gui/pages/latest_deals.py,sha256=IuUg2mJEMqoDz4EoMtcfJFCvvSMrem7raJdkjDP5xvE,13813
-tbr_deal_finder/gui/pages/settings.py,sha256=5kr6FXdp6s7OalOEfRgzZOhjrzILiw4CgT3nIOhaHYk,14316
+tbr_deal_finder/gui/pages/latest_deals.py,sha256=E-DoINTb7hAdiope7y9kqCdWuViBq3zDmMmFEL-vzso,14019
+tbr_deal_finder/gui/pages/settings.py,sha256=gdQXi508yd_oZ5lj0mxuDL5qSxmH256LwPi5gTo2Cqg,14357
 tbr_deal_finder/queries/get_active_deals.sql,sha256=nh0F1lRV6YVrUV7gsQpjsgfXmN9R0peBeMHRifjgpUM,212
 tbr_deal_finder/queries/get_deals_found_at.sql,sha256=KqrtQk7FS4Hf74RyL1r-oD2D-RJz1urrxKxkwlvjAro,139
 tbr_deal_finder/queries/latest_deal_last_ran_most_recent_success.sql,sha256=W4cNMAHtcW2DzQyPL8SHHFcbVZQKVK2VfTzazxC3LJU,107
@@ -31,8 +31,8 @@ tbr_deal_finder/retailer/chirp.py,sha256=GR8yeXp-1DHMktepy5TecHslrUibpLM7LfueIuT
 tbr_deal_finder/retailer/kindle.py,sha256=kA4SO2kl2SvJHADkBYyYMgq_bditStbiTiW7piQPAFI,5282
 tbr_deal_finder/retailer/librofm.py,sha256=dn1kaJEQ9g_AOAFNKhUtFLxYxQZa6RAHgXhT_dx-O3k,7514
 tbr_deal_finder/retailer/models.py,sha256=56xTwcLcw3bFcvTDOb85TktqtksvvyY95hZBbp9-5mY,3340
-tbr_deal_finder-0.3.1.dist-info/METADATA,sha256=4RkxKZB-76ZNwWBIkhZhmPmcU3_otzi1_BQUccI_9gE,3448
-tbr_deal_finder-0.3.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-tbr_deal_finder-0.3.1.dist-info/entry_points.txt,sha256=xjeRw7aX_jbX1ERC--IgYIa2oLNgeRefsMbKeTAVb70,112
-tbr_deal_finder-0.3.1.dist-info/licenses/LICENSE,sha256=rNc0wNPn4d4HHu6ZheJzeUaz_FbJ4rj2Dr2FjAivkNg,1064
-tbr_deal_finder-0.3.1.dist-info/RECORD,,
+tbr_deal_finder-0.3.2.dist-info/METADATA,sha256=W3GS1LYeE-KXn0aE9S8d4v7GtRGTAobTw4ZeUmXYtqw,3448
+tbr_deal_finder-0.3.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+tbr_deal_finder-0.3.2.dist-info/entry_points.txt,sha256=xjeRw7aX_jbX1ERC--IgYIa2oLNgeRefsMbKeTAVb70,112
+tbr_deal_finder-0.3.2.dist-info/licenses/LICENSE,sha256=rNc0wNPn4d4HHu6ZheJzeUaz_FbJ4rj2Dr2FjAivkNg,1064
+tbr_deal_finder-0.3.2.dist-info/RECORD,,