develop-to-master

README.md

@@ -12,7 +12,7 @@
 
 <p align="center">
   <a href="https://github.com/codebude/librislog/actions/workflows/tests.yml"><img src="https://github.com/codebude/librislog/actions/workflows/tests.yml/badge.svg" alt="Tests"></a>
-  <a href="https://github.com/codebude/librislog/actions/workflows/docker.yml"><img src="https://github.com/codebude/librislog/actions/workflows/docker.yml/badge.svg" alt="Docker Build"></a>
+  <a href="https://github.com/codebude?tab=packages&repo_name=librislog"><img src="https://github.com/codebude/librislog/actions/workflows/docker.yml/badge.svg" alt="Docker Build"></a>
   <a href="https://codebude.github.io/librislog/"><img src="https://github.com/codebude/librislog/actions/workflows/docs.yml/badge.svg" alt="Docs Build"></a>
   <img src="https://img.shields.io/badge/python-3.14-%233776AB?logo=python" alt="Python">
   <img src="https://img.shields.io/badge/svelte-5-%23FF3E00?logo=svelte" alt="Svelte">

backend/app/database.py

@@ -5,11 +5,30 @@
 
 from app.config import settings
 
+
+def _set_sqlite_pragmas(dbapi_connection, _connection_record) -> None:
+    """Apply performance-oriented PRAGMAs to new SQLite connections."""
+    import sqlite3
+    if not isinstance(dbapi_connection, sqlite3.Connection):
+        return
+    cursor = dbapi_connection.cursor()
+    cursor.execute("PRAGMA journal_mode=WAL")
+    cursor.execute("PRAGMA synchronous=NORMAL")
+    cursor.execute("PRAGMA cache_size=-8000")
+    cursor.execute("PRAGMA temp_store=MEMORY")
+    cursor.execute("PRAGMA mmap_size=268435456")
+    cursor.close()
+
+
 engine = create_engine(
     settings.database_url,
     connect_args={"check_same_thread": False},  # needed for SQLite
+    pool_pre_ping=True,
 )
 
+from sqlalchemy import event  # noqa: E402
+event.listen(engine, "connect", _set_sqlite_pragmas)
+
 
 @atexit.register
 def _dispose_engine() -> None:

backend/app/models.py

@@ -5,6 +5,7 @@
 from datetime import datetime, timezone
 
 import sqlalchemy as sa
+from pydantic import model_validator
 from sqlalchemy import Column, DateTime, TypeDecorator
 from sqlmodel import Field, SQLModel
 
@@ -60,6 +61,13 @@ class Book(SQLModel, table=True):
     isbn: Optional[str] = Field(default=None, unique=True)
     cover_url: Optional[str] = None
     publisher: Optional[str] = None
+
+    @model_validator(mode="before")
+    @classmethod
+    def normalize_empty_cover_url(cls, data: dict) -> dict:
+        if isinstance(data, dict) and "cover_url" in data and data["cover_url"] == "":
+            data["cover_url"] = None
+        return data
     published_year: Optional[int] = None
     page_count: int = Field(default=0)
     language: Optional[str] = Field(default=None, max_length=2)
@@ -103,7 +111,7 @@ class BookTag(SQLModel, table=True):
     __tablename__ = "book_tag"
 
     book_id: int = Field(foreign_key="book.id", primary_key=True)
-    tag_id: int = Field(foreign_key="tag.id", primary_key=True)
+    tag_id: int = Field(foreign_key="tag.id", primary_key=True, index=True)
 
 
 class User(SQLModel, table=True):

backend/app/routers/books.py

@@ -5,6 +5,7 @@
 from typing import List, Literal, Optional
 
 from fastapi import APIRouter, Depends, HTTPException, Query, status
+import sqlalchemy as sa
 from sqlalchemy.exc import IntegrityError
 from sqlmodel import Session, func, or_, select
 
@@ -31,7 +32,7 @@
 )
 from app.services.cover_import import import_cover_from_url, is_external_cover_url
 from app.services.quote_cache import get_or_fetch_dashboard_quote
-from app.services.tags import build_book_read, cleanup_orphan_tags, sync_book_tags
+from app.services.tags import build_book_read, cleanup_orphan_tags, load_tags_batch, sync_book_tags
 from app.time_utils import utcnow
 
 logger = logging.getLogger(__name__)
@@ -128,10 +129,19 @@ def _raise_integrity_conflict(exc: IntegrityError) -> None:
     raise
 
 
+def _build_book_read_with_tags(book: Book, tags_text: str | None) -> BookRead:
+    """Build a BookRead from a Book model with a pre-resolved tags string."""
+    payload = book.model_dump()
+    payload.pop("user_id", None)
+    payload["tags"] = tags_text
+    return BookRead.model_validate(payload)
+
+
 @router.get("", response_model=BookListResponse)
 def list_books(
     status: Optional[ReadingStatus] = Query(default=None),
     q: Optional[str] = Query(default=None),
+    has_cover: Optional[bool] = Query(default=None),
     sort: Literal["title", "date_added", "date_started", "date_finished", "rating"] = Query(
         default="date_added"
     ),
@@ -173,6 +183,14 @@ def list_books(
             )
         )
 
+    if has_cover is not None:
+        if has_cover:
+            base_statement = base_statement.where(Book.cover_url.is_not(None), Book.cover_url != "")
+        else:
+            base_statement = base_statement.where(
+                sa.or_(Book.cover_url.is_(None), Book.cover_url == "")
+            )
+
     total = session.exec(
         select(func.count()).select_from(base_statement.subquery())
     ).one()
@@ -206,8 +224,13 @@ def list_books(
 
     books = list(session.exec(statement).all())
     logger.debug("list_books — returning %d/%d book(s)", len(books), total)
+    book_ids = [b.id for b in books if b.id is not None]
+    book_tags_map = load_tags_batch(session, book_ids) if book_ids else {}
     return BookListResponse(
-        books=[build_book_read(session, book) for book in books],
+        books=[
+            _build_book_read_with_tags(book, book_tags_map.get(book.id))
+            for book in books
+        ],
         total=total,
     )
 
@@ -279,12 +302,13 @@ def get_tag_cloud(
     session: Session = Depends(get_session),
 ) -> List[TagCloudEntry]:
     """Return tags sorted by usage count (descending) for the authenticated user."""
+    count_label = func.count(BookTag.book_id).label("cnt")
     rows = session.exec(
-        select(Tag.name, func.count(BookTag.book_id))
+        select(Tag.name, count_label)
         .join(BookTag, BookTag.tag_id == Tag.id)
         .where(Tag.user_id == current_user.id)
-        .group_by(Tag.id, Tag.name)
-        .order_by(func.count(BookTag.book_id).desc(), Tag.name.asc())
+        .group_by(Tag.id)
+        .order_by(count_label.desc(), Tag.name.asc())
         .limit(limit)
     ).all()
     return [TagCloudEntry(tag=name, count=count) for name, count in rows]

backend/app/routers/data.py

@@ -293,6 +293,7 @@ async def execute_import_data(
     async def event_generator():
         with Session(stream_bind) as session:
             completed = False
+            import_failed_rows = 0
             final_error: str | None = None
             try:
                 async for event in execute_import(
@@ -305,6 +306,7 @@ async def event_generator():
                 ):
                     if event.get("event") == "complete":
                         completed = True
+                        import_failed_rows = event.get("failed", 0)
                     if event.get("event") == "error":
                         final_error = str(event.get("message") or "Import failed")
                     yield f"data: {json.dumps(event)}\n\n"
@@ -321,7 +323,7 @@ async def event_generator():
                 final_error = 'error.importExecutionFailed'
                 yield f"data: {json.dumps({'event': 'error', 'message': 'error.importExecutionFailed'})}\n\n"
             finally:
-                if completed or final_error is not None:
+                if completed and import_failed_rows == 0 and final_error is None:
                     delete_parsed_upload(body.file_id, current_user.id)
 
     return StreamingResponse(