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

tbr_deal_finder/__init__.py

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

tbr_deal_finder/desktop_updater.py

@@ -43,12 +43,16 @@ class DesktopUpdater:
             release_data = response.json()
             latest_version = release_data["tag_name"].lstrip("v")
             if version.parse(latest_version) > version.parse(self.current_version):
-                release_url = release_data["html_url"]
+                download_url = release_data["html_url"]
+                if self.platform == "darwin":
+                    for asset in release_data["assets"]:
+                        if asset["browser_download_url"].endswith(".dmg"):
+                            download_url = asset["browser_download_url"]
+
                 return {
                     "version": latest_version,
-                    "download_url": release_url,
+                    "download_url": download_url,
                     "release_notes": release_data.get("body", ""),
-                    "release_url": release_url
                 }
                 
             return None
@@ -56,86 +60,6 @@ class DesktopUpdater:
         except Exception as e:
             logger.error(f"Failed to check updates for {self.github_repo}: {e}")
             return None
-    
-    def download_update(self, download_url: str, progress_callback=None) -> Optional[Path]:
-        """
-        Download the update file.
-        Returns path to downloaded file or None if failed.
-        """
-        try:
-            response = requests.get(download_url, stream=True, timeout=30)
-            response.raise_for_status()
-            
-            # Determine file extension
-            filename = download_url.split("/")[-1]
-            temp_file = Path(tempfile.gettempdir()) / filename
-            
-            total_size = int(response.headers.get('content-length', 0))
-            downloaded = 0
-            
-            with open(temp_file, 'wb') as f:
-                for chunk in response.iter_content(chunk_size=8192):
-                    if chunk:
-                        f.write(chunk)
-                        downloaded += len(chunk)
-                        
-                        if progress_callback and total_size > 0:
-                            progress = (downloaded / total_size) * 100
-                            progress_callback(progress)
-            
-            return temp_file
-            
-        except Exception as e:
-            logger.error(f"Failed to download update: {e}")
-            return None
-    
-    def install_update(self, update_file: Path) -> bool:
-        """
-        Install the downloaded update.
-        Platform-specific installation logic.
-        """
-        if self.platform == "darwin":
-            return self._install_macos_update(update_file)
-        elif self.platform == "windows":
-            return self._install_windows_update(update_file)
-        elif self.platform == "linux":
-            return self._install_linux_update(update_file)
-        else:
-            return False
-    
-    def _install_macos_update(self, dmg_file: Path) -> bool:
-        """Install .dmg update on macOS."""
-        try:
-            # Open the DMG file - user will need to drag to Applications
-            subprocess.run(["open", str(dmg_file)], check=True)
-            return True
-        except subprocess.CalledProcessError:
-            return False
-    
-    def _install_windows_update(self, exe_file: Path) -> bool:
-        """Install .exe update on Windows."""
-        try:
-            # Run the installer
-            subprocess.run([str(exe_file)], check=True)
-            return True
-        except subprocess.CalledProcessError:
-            return False
-    
-    def _install_linux_update(self, appimage_file: Path) -> bool:
-        """Install AppImage update on Linux."""
-        try:
-            # Make executable and offer to replace current installation
-            os.chmod(appimage_file, 0o755)
-            
-            # For AppImage, we'd typically replace the current file
-            # This is more complex and might require user permission
-            return True
-        except Exception:
-            return False
-    
-    def open_download_page(self, release_url: str):
-        """Open the GitHub release page in browser."""
-        webbrowser.open(release_url)
 
 
 # Global instance

tbr_deal_finder/gui/main.py

@@ -1,6 +1,10 @@
 import asyncio
 import os
 import base64
+import subprocess
+import sys
+from datetime import datetime
+from pathlib import Path
 
 import flet as ft
 
@@ -17,6 +21,7 @@ from tbr_deal_finder.gui.pages.all_deals import AllDealsPage
 from tbr_deal_finder.gui.pages.latest_deals import LatestDealsPage
 from tbr_deal_finder.gui.pages.all_books import AllBooksPage
 from tbr_deal_finder.gui.pages.book_details import BookDetailsPage
+from tbr_deal_finder.utils import get_duckdb_conn, get_latest_deal_last_ran
 
 
 class TBRDealFinderApp:
@@ -27,7 +32,8 @@ class TBRDealFinderApp:
         self.selected_book = None
         self.update_info = None  # Store update information
         self.nav_disabled = False  # Track navigation disabled state
-        
+        self._last_run_time = None
+
         # Initialize pages
         self.settings_page = SettingsPage(self)
         self.all_deals_page = AllDealsPage(self)
@@ -295,10 +301,9 @@ class TBRDealFinderApp:
             self.all_books_page.refresh_page_state()
     
     def refresh_all_pages(self):
-        """Refresh all pages by clearing their state and reloading data"""
+        """Refresh all pages except all_books_page by clearing their state and reloading data"""
         self.all_deals_page.refresh_page_state()
         self.latest_deals_page.refresh_page_state()
-        self.all_books_page.refresh_page_state()
 
     def disable_navigation(self):
         """Disable navigation rail during background operations"""
@@ -621,10 +626,6 @@ class TBRDealFinderApp:
         def close_dialog(e):
             dialog.open = False
             self.page.update()
-        
-        def view_release_and_close(e):
-            self.view_release_notes(e)
-            close_dialog(e)
             
         def download_and_close(e):
             self.download_update(e)
@@ -638,10 +639,13 @@ class TBRDealFinderApp:
             ], spacing=10),
             content=ft.Column([
                 ft.Text(f"Version {self.update_info['version']} is now available!"),
-                ft.Text("Would you like to download the update?", color=ft.Colors.GREY_600)
-            ], spacing=10, tight=True),
+                ft.Divider(),
+                ft.Text(
+                    self.update_info.get('release_notes', 'No release notes available.'),
+                    selectable=True
+                ),
+            ], scroll=ft.ScrollMode.AUTO, spacing=10, tight=True),
             actions=[
-                ft.TextButton("View Release Notes", on_click=view_release_and_close),
                 ft.ElevatedButton("Download Update", on_click=download_and_close),
                 ft.TextButton("Later", on_click=close_dialog),
             ],
@@ -675,24 +679,36 @@ class TBRDealFinderApp:
         dialog.open = True
         self.page.update()
 
-    def view_release_notes(self, e):
-        """Open release notes in browser."""
-        if self.update_info:
-            import webbrowser
-            webbrowser.open(self.update_info['release_url'])
-
     def download_update(self, e):
         """Handle update download."""
         if not self.update_info or not self.update_info.get('download_url'):
             return
-        
-        # For now, open download URL in browser
-        # In a more advanced implementation, you could download in-app
-        import webbrowser
-        webbrowser.open(self.update_info['download_url'])
-        
-        # Show download instructions
-        self.show_download_instructions()
+
+        if sys.platform == "darwin":
+            dmg_path = Path(
+                f"~/Downloads/TBR-Deal-Finder-{self.update_info['version']}-mac.dmg"
+            ).expanduser()
+
+            # Show download instructions
+            self.show_download_instructions()
+
+            if not dmg_path.exists():
+                # Using curl or urllib to download to prevent Mac warning
+                subprocess.run([
+                    "curl", "-L",
+                    self.update_info['download_url'],
+                    "-o", dmg_path
+                ])
+
+            subprocess.run(["open", dmg_path])
+        else:
+            # For now, open download URL in browser
+            # In a more advanced implementation, you could download in-app
+            import webbrowser
+            webbrowser.open(self.update_info['download_url'])
+
+            # Show download instructions
+            self.show_download_instructions()
 
     def show_download_instructions(self):
         """Show instructions for installing the downloaded update."""
@@ -701,7 +717,7 @@ class TBRDealFinderApp:
             self.page.update()
         
         instructions = {
-            "darwin": "1. Download will start in your browser\n2. Open the downloaded .dmg file\n3. Drag the app to Applications folder\n4. Restart the application",
+            "darwin": "1. Wait for the update to download (can take a minute or 2)\n2. Close TBR Deal Finder\n3. Once the installer opens, drag the app to Applications folder\n3. When prompted, select Replace\n4. Restart the application",
             "windows": "1. Download will start in your browser\n2. Run the downloaded .exe installer\n3. Follow the installation wizard\n4. Restart the application",
         }
         
@@ -732,12 +748,20 @@ class TBRDealFinderApp:
         dialog.open = True
         self.page.update()
 
-
-
     def check_for_updates_button(self):
         """Check for updates when button is clicked."""
         self.check_for_updates_manual()
 
+    def update_last_run_time(self):
+        db_conn = get_duckdb_conn()
+        self._last_run_time = get_latest_deal_last_ran(db_conn)
+
+    def get_last_run_time(self) -> datetime:
+        if not self._last_run_time:
+            self.update_last_run_time()
+
+        return self._last_run_time
+
 
 def main():
     """Main entry point for the GUI application"""

tbr_deal_finder/gui/pages/book_details.py

@@ -11,7 +11,7 @@ from tbr_deal_finder.utils import get_duckdb_conn, execute_query, float_to_curre
 logger = logging.getLogger(__name__)
 
 
-def build_book_price_section(historical_data: list[dict]) -> ft.Column:
+def build_book_price_section(max_dt: datetime, historical_data: list[dict]) -> ft.Column:
     retailer_data = dict()
     available_colors = [
         ft.Colors.AMBER,
@@ -27,7 +27,6 @@ def build_book_price_section(historical_data: list[dict]) -> ft.Column:
     min_price = None
     max_price = None
     min_time = None
-    max_dt = datetime.now()
     max_time = max_dt.timestamp()
 
     for record in historical_data:
@@ -461,7 +460,7 @@ class BookDetailsPage:
             )
         
         # Create the chart
-        chart_fig = build_book_price_section(self.historical_data)
+        chart_fig = build_book_price_section(self.app.get_last_run_time(), self.historical_data)
         
         return ft.Container(
             content=ft.Column([

tbr_deal_finder/gui/pages/latest_deals.py

@@ -10,7 +10,6 @@ from tbr_deal_finder.gui.pages.base_book_page import BaseBookPage
 class LatestDealsPage(BaseBookPage):
     def __init__(self, app):
         super().__init__(app, 4)
-        self.last_run_time = None
         
     def get_page_title(self) -> str:
         return "Latest Deals"
@@ -27,7 +26,7 @@ class LatestDealsPage(BaseBookPage):
     
     def build(self):
         """Build the latest deals page with custom header"""
-        self.check_last_run()
+        self.app.update_last_run_time()
         
         # Custom header with run button
         header = self.build_header()
@@ -73,15 +72,16 @@ class LatestDealsPage(BaseBookPage):
     def build_header(self):
         """Build the header with run button and status"""
         can_run = self.can_run_latest_deals()
-        
-        if not can_run and self.last_run_time:
-            next_run_time = self.last_run_time + timedelta(hours=8)
+        last_run_time = self.app.get_last_run_time()
+
+        if not can_run and last_run_time:
+            next_run_time = last_run_time + timedelta(hours=8)
             time_remaining = next_run_time - datetime.now()
             hours_remaining = max(0, int(time_remaining.total_seconds() / 3600))
             status_text = f"Next run available in {hours_remaining} hours"
             status_color = ft.Colors.ORANGE
-        elif self.last_run_time:
-            status_text = f"Last run: {self.last_run_time.strftime('%Y-%m-%d %H:%M')}"
+        elif last_run_time:
+            status_text = f"Last run: {last_run_time.strftime('%Y-%m-%d %H:%M')}"
             status_color = ft.Colors.GREEN
         else:
             status_text = "No previous runs"
@@ -194,11 +194,13 @@ class LatestDealsPage(BaseBookPage):
 
     def load_items(self):
         """Load deals found at the last run time"""
-        if self.last_run_time:
+        last_run_time = self.app.get_last_run_time()
+
+        if last_run_time:
             try:
                 self.items = [
                     book
-                    for book in get_deals_found_at(self.last_run_time)
+                    for book in get_deals_found_at(last_run_time)
                     if is_qualifying_deal(self.app.config, book)
                 ]
                 self.apply_filters()
@@ -237,19 +239,15 @@ class LatestDealsPage(BaseBookPage):
             )
         )
 
-    def check_last_run(self):
-        """Check when deals were last run"""
-        if not self.last_run_time:
-            db_conn = get_duckdb_conn()
-            self.last_run_time = get_latest_deal_last_ran(db_conn)
-
     def can_run_latest_deals(self) -> bool:
         """Check if latest deals can be run (8 hour cooldown)"""
-        if not self.last_run_time:
+        last_run_time = self.app.get_last_run_time()
+
+        if not last_run_time:
             return True
         
         min_age = datetime.now() - timedelta(hours=8)
-        return self.last_run_time < min_age
+        return last_run_time < min_age
 
     def run_latest_deals(self, e):
         """Run the latest deals check"""
@@ -286,7 +284,7 @@ class LatestDealsPage(BaseBookPage):
             
             if success:
                 # Update the run time and load new deals
-                self.last_run_time = self.app.config.run_time
+                self.app.update_last_run_time()
                 self.load_items()
                 self.show_success(f"Found {len(self.items)} new deals!")
             else:
@@ -300,7 +298,7 @@ class LatestDealsPage(BaseBookPage):
             self.is_loading = False
             self.progress_container.visible = False
             self.run_button.disabled = False
-            self.check_last_run()  # Refresh the status
+            self.app.update_last_run_time()  # Refresh the status
             
             # Re-enable navigation after the operation
             self.app.enable_navigation()
@@ -372,5 +370,5 @@ class LatestDealsPage(BaseBookPage):
             self.format_dropdown.value = "All"
         
         # Check last run and reload data
-        self.check_last_run()
+        self.app.update_last_run_time()
         self.load_items()

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tbr-deal-finder
-Version: 0.3.2
+Version: 0.3.3
 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.2.dist-info → tbr_deal_finder-0.3.3.dist-info}/RECORD

@@ -1,9 +1,9 @@
-tbr_deal_finder/__init__.py,sha256=3Zo2T2Th8AT8qexLKWZhNJIeyXPVf2N76kkDGJw5Wc0,104
+tbr_deal_finder/__init__.py,sha256=Yq_k2n4fUg7OMmkDUL-qq_1rUK2wu1KPureT3sJEKx4,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
 tbr_deal_finder/config.py,sha256=pocHMEoJVIoiuRzEtKDAmsGmiiLgD-lN6n6TU9gI8Lc,3982
-tbr_deal_finder/desktop_updater.py,sha256=VCD4MW1ckx6yyq0N_CJrOth8wePqPhTjhvdJTKsUVkw,5123
+tbr_deal_finder/desktop_updater.py,sha256=-1hNJt1uAkxGo4fUf1IT_BQc9vcRR3mCBDHcYsO-_DU,2285
 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=l2n-79kSNZfPh73PZBbSE6tkNYYCaHPEehIPcelDPeY,7214
@@ -11,13 +11,13 @@ tbr_deal_finder/tracked_books.py,sha256=u3KfBNlwvsEwTfM5TAJVLbiTmm1lTe2k70JJOszQ
 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=VvdCdSH3mbVhw_3PaDD78U8RQV-drTyXyCNSWFwmoe8,27539
+tbr_deal_finder/gui/main.py,sha256=msFtiEVd7um3Ck-dlMhjSUHG2GjSyeVuJSDsLGFarJs,28420
 tbr_deal_finder/gui/pages/__init__.py,sha256=1xc9Ib3oX_hqxLdhZvbCv3AhwOmVBSklZZC6CAcvoMU,20
 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=kmHjJE4eIGrMhXtBWePn_eXfO6qJ36kIoQ7hE1xB3ic,10465
-tbr_deal_finder/gui/pages/book_details.py,sha256=POknUa9yNjfqhC6eXuw7RtaRcFtQj_CdvJ8mK2r6DDo,22047
-tbr_deal_finder/gui/pages/latest_deals.py,sha256=E-DoINTb7hAdiope7y9kqCdWuViBq3zDmMmFEL-vzso,14019
+tbr_deal_finder/gui/pages/book_details.py,sha256=8ZqONLeqZ_1TGzmkJrem00VBFT3VcczEtEIzyCiHyro,22067
+tbr_deal_finder/gui/pages/latest_deals.py,sha256=XFTzmWjaw8grmbSF_KTGMKFOJ2TUY2kpLljyVdte93k,13896
 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
@@ -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.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,,
+tbr_deal_finder-0.3.3.dist-info/METADATA,sha256=VEp2T5WOIRAR_c5lc3y5YI8GJaaEiUuacKdl2oBQCdw,3448
+tbr_deal_finder-0.3.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+tbr_deal_finder-0.3.3.dist-info/entry_points.txt,sha256=xjeRw7aX_jbX1ERC--IgYIa2oLNgeRefsMbKeTAVb70,112
+tbr_deal_finder-0.3.3.dist-info/licenses/LICENSE,sha256=rNc0wNPn4d4HHu6ZheJzeUaz_FbJ4rj2Dr2FjAivkNg,1064
+tbr_deal_finder-0.3.3.dist-info/RECORD,,