Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions services/app/api/library.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
from app.domain.catalog_titles import title_narrators
from app.domain.corrections import asset_state, correct_asset, revision
from app.domain.library_access import lock_access
from app.domain.library_review import CLOSED_STATES
from app.domain.visibility import visible_library, visible_work
from app.domain.work_graph import canonical_map

Expand Down Expand Up @@ -195,7 +196,7 @@ async def replace_grants(library_id: UUID, body: GrantInput, admin: Admin, db: D
await db.commit()


def asset_conditions(user, work_id, library_id, needs_review, q, medium, state):
def asset_conditions(user, work_id, library_id, needs_review, q, medium, state, hide_closed=False):
conditions = [
visible_library(user),
Integration.enabled.is_(True),
Expand All @@ -217,13 +218,21 @@ def asset_conditions(user, work_id, library_id, needs_review, q, medium, state):
conditions.append(LibraryAsset.medium == medium)
if state != "any":
conditions.append(LibraryAsset.state == state)
elif hide_closed:
conditions.append(LibraryAsset.state.not_in(CLOSED_STATES))
if q.strip():
# Search only declared title/credit fields, never arbitrary provider payloads.
pattern = (
"%" + q.strip().replace("\\", "\\\\").replace("%", "\\%").replace("_", "\\_") + "%"
)
mapping = canonical_map(
library_work_ids(user, library_id=library_id, medium=medium, state=state)
library_work_ids(
user,
library_id=library_id,
medium=medium,
state=state,
hide_closed=hide_closed,
)
)
catalog_matches = (
select(AssetContains.asset_id)
Expand Down Expand Up @@ -266,7 +275,8 @@ async def library_books(
limit: int = Query(default=40, ge=1, le=100),
):
mapping = display_map(
user, library_work_ids(user, library_id=library_id, medium=medium, state=state)
user,
library_work_ids(user, library_id=library_id, medium=medium, state=state, hide_closed=True),
)
matching = (
select(mapping.c.work_id, func.max(LibraryAsset.created_at).label("observed_at"))
Expand All @@ -275,7 +285,7 @@ async def library_books(
.join(Integration, Library.integration_id == Integration.id)
.join(AssetContains, AssetContains.asset_id == LibraryAsset.id)
.join(mapping, mapping.c.origin_id == AssetContains.work_id)
.where(*asset_conditions(user, None, library_id, False, q, medium, state))
.where(*asset_conditions(user, None, library_id, False, q, medium, state, hide_closed=True))
.group_by(mapping.c.work_id)
.subquery()
)
Expand Down
8 changes: 7 additions & 1 deletion services/app/domain/availability.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,16 @@
Version,
)
from app.domain.catalog_display import display_map
from app.domain.library_review import CLOSED_STATES
from app.domain.primary_editions import asset_narrators, edition_order, primary_choices


def library_work_ids(user, *, library_id=None, medium="any", state="any"):
def library_work_ids(user, *, library_id=None, medium="any", state="any", hide_closed=False):
"""Origins in accessible inventory, including incomplete and missing copies.

hide_closed leaves out copies that are gone for good (CLOSED_STATES) when no state is
asked for, so a bookshelf doesn't list removed files as unowned books.

This bounds library browsing projections; fulfillment still uses the stricter
availability_rows() relation to establish complete, verified ownership.
"""
Expand All @@ -41,6 +45,8 @@ def library_work_ids(user, *, library_id=None, medium="any", state="any"):
query = query.where(LibraryAsset.medium == medium)
if state != "any":
query = query.where(LibraryAsset.state == state)
elif hide_closed:
query = query.where(LibraryAsset.state.not_in(CLOSED_STATES))
return query


Expand Down
28 changes: 27 additions & 1 deletion tests/integration/test_library_browsing.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
Operation,
Work,
)
from tests.integration.test_discovery import login_member
from tests.integration.test_discovery import add_owned, login_member
from tests.integration.test_library_discovery import NOW
from tests.integration.test_library_discovery import add as add_observed

Expand Down Expand Up @@ -182,3 +182,29 @@ async def test_file_locations_only_appear_for_accessible_library_copies(client,
]
await login_member(client)
assert (await browse(client, work_id=work_id))["items"] == []


async def test_bookshelf_leaves_out_books_whose_only_copies_are_gone(client, admin, database):
async with database() as db, db.begin():
await add(db, "Still on disk")
await add(db, "Deleted file", state="intentionally-removed")
await add(db, "Lost file", state="missing-confirmed")
await add(db, "Same title")
await add(db, "Same title", state="intentionally-removed")
reorganised, _, _ = await add(db, "Reorganised copy")
old_library = await add_owned(db, reorganised)
await db.execute(
update(LibraryAsset)
.where(LibraryAsset.library_id == old_library.id)
.values(state="intentionally-removed")
)
books = (await client.get("/api/library/books")).json()
assert sorted(item["title"] for item in books["items"]) == [
"Reorganised copy",
"Same title",
"Still on disk",
]
assert books["total"] == 3
lost = (await client.get("/api/library/books", params={"state": "missing-confirmed"})).json()
assert [item["title"] for item in lost["items"]] == ["Lost file"]
assert (await browse(client))["total"] == 7