Merge main into auto-hardcover-id - sync with latest changes and resolve conflicts

Author: crocodilestick

CONTRIBUTORS

@@ -11,8 +11,8 @@ Copyright (C) 2018-2026 Calibre-Web contributors
 Copyright (C) 2024-2026 Calibre-Web Automated contributors
 # Upstream Contributors (janeczku/calibre-web)
 
-- OzzieIsaacs (anon) (2778 commits)
-- Ozzie Isaacs (anon) (266 commits)
+- OzzieIsaacs (anon) (2788 commits)
+- Ozzie Isaacs (anon) (267 commits)
 - cbartondock (96 commits)
 - idalin (69 commits)
 - cervinko (68 commits)
@@ -41,6 +41,7 @@ Copyright (C) 2024-2026 Calibre-Web Automated contributors
 - mapi68 (15 commits)
 - ok11 (13 commits)
 - pwr (13 commits)
+- webysther (13 commits)
 - Kyosfonica (11 commits)
 - otapi (11 commits)
 - andy29485 (10 commits)
@@ -84,7 +85,6 @@ Copyright (C) 2024-2026 Calibre-Web Automated contributors
 - Petipopotam (4 commits)
 - stfrbrntyu (4 commits)
 - trasba (4 commits)
-- webysther (4 commits)
 - wildthyme (4 commits)
 - acciobugs (3 commits)
 - aliceout (3 commits)
@@ -196,6 +196,7 @@ Copyright (C) 2024-2026 Calibre-Web Automated contributors
 - dotlambda (1 commits)
 - ducbachvan (1 commits)
 - Dunrar (1 commits)
+- EdouardRouch (1 commits)
 - Efreak (1 commits)
 - elelay (1 commits)
 - elfcan (1 commits)
@@ -288,6 +289,7 @@ Copyright (C) 2024-2026 Calibre-Web Automated contributors
 - szepix (1 commits)
 - theopsall (1 commits)
 - Thijxx (1 commits)
+- tomchiverton (1 commits)
 - tomjmul (1 commits)
 - vagra (1 commits)
 - viljasenville (1 commits)
@@ -312,7 +314,7 @@ Copyright (C) 2024-2026 Calibre-Web Automated contributors
 - zhiyue (1 commits)
 # Fork Contributors (crocodilestick/calibre-web-automated)
 
-- crocodilestick (900 commits)
+- crocodilestick (941 commits)
 - jmarmstrong1207 (73 commits)
 - demitrix (30 commits)
 - sirwolfgang (29 commits)
@@ -326,6 +328,7 @@ Copyright (C) 2024-2026 Calibre-Web Automated contributors
 - alva-seal (6 commits)
 - smevawala (5 commits)
 - Aymendje (4 commits)
+- ManuelDrescher (4 commits)
 - opswhisperer (4 commits)
 - alexantao (3 commits)
 - Calychas (3 commits)
@@ -334,12 +337,14 @@ Copyright (C) 2024-2026 Calibre-Web Automated contributors
 - PulsarFTW (3 commits)
 - stewie83 (3 commits)
 - zikasak (3 commits)
+- aaronpowell (2 commits)
+- BrachiumX (2 commits)
 - chad3814 (2 commits)
 - coissac (2 commits)
 - FennyFatal (2 commits)
 - itsmarcy (2 commits)
 - JamesRy96 (2 commits)
-- ManuelDrescher (2 commits)
+- Olen (2 commits)
 - sethvoltz (2 commits)
 - Strubbl (2 commits)
 - tecosaur (2 commits)
@@ -364,6 +369,7 @@ Copyright (C) 2024-2026 Calibre-Web Automated contributors
 - emmanuel-ferdman (1 commits)
 - FilipMakowski (1 commits)
 - Flying-Tom (1 commits)
+- galeksandrp (1 commits)
 - google-labs-jules[bot] (1 commits)
 - gx1400 (1 commits)
 - halkeye (1 commits)
@@ -378,6 +384,7 @@ Copyright (C) 2024-2026 Calibre-Web Automated contributors
 - jeffonthemove (1 commits)
 - jspiers (1 commits)
 - kevpam (1 commits)
+- KucharczykL (1 commits)
 - lazyusername (1 commits)
 - Lee Nave (anon) (1 commits)
 - marauder37 (1 commits)
@@ -388,15 +395,16 @@ Copyright (C) 2024-2026 Calibre-Web Automated contributors
 - n00b42 (1 commits)
 - Nementon (1 commits)
 - NotaInutilis (1 commits)
-- Olen (1 commits)
 - r0b2g1t (1 commits)
 - rjaakke (1 commits)
 - robinwo (1 commits)
 - Rustymage (1 commits)
+- Seth Milliken (anon) (1 commits)
 - smathev (1 commits)
 - spezzino (1 commits)
 - stadler-pascal (1 commits)
 - stefanop1 (1 commits)
+- thetorminal (1 commits)
 - tmacphail (1 commits)
 - tomried (1 commits)
 - Turmaxx (1 commits)

README.md

@@ -46,11 +46,14 @@ Calibre-Web Automated aims to be an all-in-one solution, combining the modern li
 
 ## _Affiliated Projects_ 👬
 
-### Calibre-Web Automated Book Downloader
+### Shelfmark: Book Downloader
 
 - An intuitive web interface for searching and requesting book downloads, designed to work seamlessly with Calibre-Web-Automated. This project streamlines the process of downloading books and preparing them for integration into your Calibre library
 
-[<img src="https://raw.githubusercontent.com/vadret/android/master/assets/get-github.png" alt="Get it on GitHub" height="80">](https://github.com/calibrain/calibre-web-automated-book-downloader)
+> [!IMPORTANT]  
+> CWA does not approve of or support piracy of copyrighted materials and is not responsible for user behaviour
+
+[<img src="https://raw.githubusercontent.com/vadret/android/master/assets/get-github.png" alt="Get it on GitHub" height="80">](https://github.com/calibrain/shelfmark)
 
 ___
 
@@ -142,7 +145,7 @@ This tells CWA to avoid enabling WAL on the Calibre `metadata.db` and the `app.d
   - Using the information provided in the Calibre eBook-converter documentation on which formats convert best into epubs, CWA is able to determine from downloads containing multiple eBook formats, which format will convert most optimally, ignoring the other formats to ensure the **best possible quality** and no **duplicate imports** -->
 
 #### **Automatic Conversion Service** 🔃
-- On by default though can be toggled of in the CWA Settings page, with EPUB as the default target format
+- On by default though can be toggled off in the CWA Settings page, with EPUB as the default target format
   - _Available target formats include:_ **EPUB**, **MOBI**, **AZW3**, **KEPUB** & **PDF**
 - Upon detecting new files in the Ingest Directory, if any of the files are in formats the user has configured CWA to auto-convert to the current target format,
 - The following **28 file types are currently supported:**

cps/__init__.py

@@ -244,35 +244,125 @@ def create_app():
     # Ensure a valid calibre_db session exists before handling each request
     @app.before_request
     def _cwa_ensure_db_session():
+        from flask import g, request
         from .cw_login import current_user
+        from sqlalchemy import or_
         import time
 
+        if config.config_allow_reverse_proxy_header_login:
+            """
+            Load user from reverse proxy authentication header if configured.
+            Sets g.flask_httpauth_user early so that current_user proxy resolves correctly
+            for user-specific settings like theme preferences.
+
+            This must run before any blueprint before_request handlers that access current_user.
+            """
+
+            from . import usermanagement
+            user = usermanagement.load_user_from_reverse_proxy_header(request)
+            if user:
+                g.flask_httpauth_user = user
+            else:
+                # Explicitly set to None to indicate we checked but found nothing
+                g.flask_httpauth_user = None
+
         if current_user.is_authenticated:
-            g.magic_shelves_access = ub.session.query(ub.MagicShelf).filter(ub.MagicShelf.user_id == current_user.id).all()
-            
-            # Magic Shelf Count Caching
-            if 'magic_shelf_counts' not in session:
-                session['magic_shelf_counts'] = {}
-            
-            counts = session['magic_shelf_counts']
-            cache_updated = False
-            now = time.time()
-            CACHE_DURATION = 300  # 5 minutes
-            
-            for shelf in g.magic_shelves_access:
-                shelf_id_str = str(shelf.id)
-                cached_data = counts.get(shelf_id_str)
+            try:
+                # Verify required tables exist before querying
+                from sqlalchemy import inspect
+                inspector = inspect(ub.session.bind)
+                required_tables = ['magic_shelf', 'hidden_magic_shelf_templates']
+                existing_tables = inspector.get_table_names()
+                
+                missing_tables = [t for t in required_tables if t not in existing_tables]
+                if missing_tables:
+                    log.error(f"Magic shelf tables missing from database: {missing_tables}. Run migration to create them.")
+                    g.magic_shelves_access = []
+                    return
+                
+                # Get hidden items for this user (both system templates and custom shelves)
+                hidden_items = ub.session.query(
+                    ub.HiddenMagicShelfTemplate.template_key,
+                    ub.HiddenMagicShelfTemplate.shelf_id
+                ).filter(
+                    ub.HiddenMagicShelfTemplate.user_id == current_user.id
+                ).all()
+                
+                hidden_template_keys = {item.template_key for item in hidden_items if item.template_key}
+                hidden_shelf_ids = {item.shelf_id for item in hidden_items if item.shelf_id}
+                
+                # Get user's own shelves + public shelves (will filter hidden ones below)
+                g.magic_shelves_access = ub.session.query(ub.MagicShelf).filter(
+                    or_(
+                        ub.MagicShelf.is_public == 1,
+                        ub.MagicShelf.user_id == current_user.id
+                    )
+                ).all()
+                
+                log.debug(f"Found {len(g.magic_shelves_access)} total magic shelves for user {current_user.id} before filtering")
 
-                if cached_data and (now - cached_data.get('timestamp', 0) < CACHE_DURATION):
-                    shelf.book_count = cached_data['count']
-                else:
-                    count = magic_shelf.get_book_count_for_magic_shelf(shelf.id)
-                    counts[shelf_id_str] = {'count': count, 'timestamp': now}
-                    shelf.book_count = count
-                    cache_updated = True
-            
-            if cache_updated:
-                session.modified = True
+                # Filter out hidden items
+                from . import magic_shelf
+                filtered_shelves = []
+                for shelf in g.magic_shelves_access:
+                    # Skip hidden system templates
+                    if shelf.is_system and shelf.user_id == current_user.id:
+                        # Find template key for this system shelf
+                        template_key = None
+                        for key, template in magic_shelf.SYSTEM_SHELF_TEMPLATES.items():
+                            if template['name'] == shelf.name:
+                                template_key = key
+                                break
+                        
+                        # If template_key not found, this is an orphaned/deprecated system shelf
+                        if template_key is None:
+                            log.warning(f"System shelf '{shelf.name}' (ID: {shelf.id}) doesn't match any current template - may need migration")
+                            # Show it anyway - migration should clean it up on next restart
+                            filtered_shelves.append(shelf)
+                            continue
+                        
+                        # Skip if hidden
+                        if template_key in hidden_template_keys:
+                            log.debug(f"Hiding system shelf template '{template_key}' for user {current_user.id}")
+                            continue
+                    
+                    # Skip hidden custom public shelves (not owned by user)
+                    if shelf.is_public == 1 and shelf.user_id != current_user.id:
+                        if shelf.id in hidden_shelf_ids:
+                            log.debug(f"Hiding public shelf '{shelf.name}' (ID: {shelf.id}) for user {current_user.id}")
+                            continue
+                    
+                    filtered_shelves.append(shelf)
+                
+                g.magic_shelves_access = filtered_shelves
+                log.debug(f"Filtered to {len(filtered_shelves)} visible magic shelves for user {current_user.id}")
+                
+                # Magic Shelf Count Caching
+                if 'magic_shelf_counts' not in session:
+                    session['magic_shelf_counts'] = {}
+                
+                counts = session['magic_shelf_counts']
+                cache_updated = False
+                now = time.time()
+                CACHE_DURATION = 300  # 5 minutes
+                
+                for shelf in g.magic_shelves_access:
+                    shelf_id_str = str(shelf.id)
+                    cached_data = counts.get(shelf_id_str)
+                    
+                    if cached_data and (now - cached_data.get('timestamp', 0) < CACHE_DURATION):
+                        shelf.book_count = cached_data['count']
+                    else:
+                        count = magic_shelf.get_book_count_for_magic_shelf(shelf.id)
+                        counts[shelf_id_str] = {'count': count, 'timestamp': now}
+                        shelf.book_count = count
+                        cache_updated = True
+                
+                if cache_updated:
+                    session.modified = True
+            except Exception as e:
+                log.error(f"Error populating magic shelves for user {current_user.id}: {str(e)}", exc_info=True)
+                g.magic_shelves_access = []
         else:
             g.magic_shelves_access = []
         try:
@@ -286,28 +376,6 @@ def shutdown_session(exception=None):
         if calibre_db.session_factory:
             calibre_db.session_factory.remove()
 
-    # Load user from reverse proxy header early in request lifecycle
-    # This ensures current_user resolves correctly before any code accesses user settings
-    @app.before_request
-    def _load_reverse_proxy_user():
-        """
-        Load user from reverse proxy authentication header if configured.
-        Sets g.flask_httpauth_user early so that current_user proxy resolves correctly
-        for user-specific settings like theme preferences.
-
-        This must run before any blueprint before_request handlers that access current_user.
-        """
-        from flask import g, request
-
-        if config.config_allow_reverse_proxy_header_login:
-            from . import usermanagement
-            user = usermanagement.load_user_from_reverse_proxy_header(request)
-            if user:
-                g.flask_httpauth_user = user
-            else:
-                # Explicitly set to None to indicate we checked but found nothing
-                g.flask_httpauth_user = None
-
     from .schedule import register_scheduled_tasks, register_startup_tasks
     register_scheduled_tasks(config.schedule_reconnect)
     register_startup_tasks()