feat(series): flat series sequence + cosmetic chapter dividers (#789 Phase 1)
Reframe a series from "ordered chapters that own pages" to ONE flat, series-global ordered run of pages with optional cosmetic chapter DIVIDERS over it. A chapter no longer wraps content — it's a labeled divider anchored to the page that begins it; a page's chapter is derived as the nearest preceding divider. This is what lets installments assembled from multiple sources sit in one continuous, correctly-numbered sequence (operator's Goblin Juice case). - migration 0047: flatten each series to a series-global page_number (preserving today's reading order); convert each existing chapter to a divider anchored at its first page (keeping title/stated_part); drop series_page.chapter_id; reshape series_chapter (anchor_page_id UNIQUE FK, drop chapter_number/is_placeholder/stated_page_start/end). Loss-safe for content; drops empty placeholder chapters + a redundant page-1 divider. - series_page: page_number is now the series-global order; no chapter_id. - series_chapter: anchored divider (anchor_page_id, title, stated_part). - series_service: flat list_pages (one run + derived dividers + per-page source_post + part_gaps), series-wide reorder/renumber, divider CRUD (create/update/move/delete); retired per-chapter reorder/merge/placement. - api/tags: drop chapter_id from add; /chapters endpoints are divider create/update/delete (removed chapter reorder/merge/page-reorder). - series_match_service: series "end" reads max(series_page.stated_page); accept appends via add_post. tag_service series-merge appends src's pages after tgt's max so the merged series stays one clean run. - frontend: seriesManage store + SeriesManageView → one continuous drag-reorder grid with inline divider bars + series-global page numbers; reader walks the flat run, headings from dividers; PostSeriesMenu copy. - tests reworked across the series suite for the divider model. Phase 2 (pending staging for add-from-post) is separate. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
"""FC-6.1 — chapter layer over series_page."""
|
||||
"""FC-6.x — cosmetic chapter dividers over the flat series page run."""
|
||||
|
||||
import pytest
|
||||
from sqlalchemy import func, select
|
||||
@@ -30,155 +30,138 @@ async def _series(db, name):
|
||||
return (await TagService(db).find_or_create(name, TagKind.series)).id
|
||||
|
||||
|
||||
async def _chapter_numbers(db, sid):
|
||||
rows = (
|
||||
await db.execute(
|
||||
select(SeriesChapter.id, SeriesChapter.chapter_number)
|
||||
.where(SeriesChapter.series_tag_id == sid)
|
||||
.order_by(SeriesChapter.chapter_number)
|
||||
)
|
||||
).all()
|
||||
return [(r.id, r.chapter_number) for r in rows]
|
||||
|
||||
|
||||
async def _page_order(db, chapter_id):
|
||||
async def _order(db, sid):
|
||||
rows = (
|
||||
await db.execute(
|
||||
select(SeriesPage.image_id)
|
||||
.where(SeriesPage.chapter_id == chapter_id)
|
||||
.where(SeriesPage.series_tag_id == sid)
|
||||
.order_by(SeriesPage.page_number)
|
||||
)
|
||||
).scalars().all()
|
||||
return list(rows)
|
||||
|
||||
|
||||
async def _dividers(db, sid):
|
||||
"""(anchor_image_id, title, stated_part) ordered by anchor page position."""
|
||||
rows = (
|
||||
await db.execute(
|
||||
select(
|
||||
SeriesChapter.id,
|
||||
SeriesPage.image_id,
|
||||
SeriesChapter.title,
|
||||
SeriesChapter.stated_part,
|
||||
)
|
||||
.join(SeriesPage, SeriesPage.id == SeriesChapter.anchor_page_id)
|
||||
.where(SeriesChapter.series_tag_id == sid)
|
||||
.order_by(SeriesPage.page_number)
|
||||
)
|
||||
).all()
|
||||
return rows
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_add_images_creates_default_chapter(db):
|
||||
async def test_create_divider_anchors_before_a_page(db):
|
||||
svc = SeriesService(db)
|
||||
sid = await _series(db, "C1")
|
||||
i1, i2 = await _img(db), await _img(db)
|
||||
await svc.add_images(sid, [i1, i2])
|
||||
chapters = await _chapter_numbers(db, sid)
|
||||
assert len(chapters) == 1
|
||||
assert chapters[0][1] == 1
|
||||
assert await _page_order(db, chapters[0][0]) == [i1, i2]
|
||||
i1, i2, i3 = await _img(db), await _img(db), await _img(db)
|
||||
await svc.add_images(sid, [i1, i2, i3])
|
||||
await svc.create_divider(sid, i2, title="Two", stated_part=2)
|
||||
divs = await _dividers(db, sid)
|
||||
assert len(divs) == 1
|
||||
assert divs[0].image_id == i2
|
||||
assert divs[0].title == "Two"
|
||||
assert divs[0].stated_part == 2
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_create_and_target_specific_chapter(db):
|
||||
async def test_create_divider_rejects_image_not_in_series(db):
|
||||
svc = SeriesService(db)
|
||||
sid = await _series(db, "C2")
|
||||
i1, i2 = await _img(db), await _img(db)
|
||||
await svc.add_images(sid, [i1]) # default chapter 1
|
||||
ch2 = await svc.create_chapter(sid, title="Two")
|
||||
assert ch2["chapter_number"] == 2
|
||||
await svc.add_images(sid, [i2], chapter_id=ch2["id"])
|
||||
assert await _page_order(db, ch2["id"]) == [i2]
|
||||
# i1 stayed in chapter 1.
|
||||
chapters = await _chapter_numbers(db, sid)
|
||||
assert len(chapters) == 2
|
||||
i1 = await _img(db)
|
||||
await svc.add_images(sid, [i1])
|
||||
with pytest.raises(SeriesError):
|
||||
await svc.create_divider(sid, 999999)
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_reorder_chapters(db):
|
||||
async def test_one_divider_per_page(db):
|
||||
svc = SeriesService(db)
|
||||
sid = await _series(db, "C3")
|
||||
c1 = (await svc.create_chapter(sid))["id"]
|
||||
c2 = (await svc.create_chapter(sid))["id"]
|
||||
c3 = (await svc.create_chapter(sid))["id"]
|
||||
await svc.reorder_chapters(sid, [c3, c1, c2])
|
||||
assert await _chapter_numbers(db, sid) == [(c3, 1), (c1, 2), (c2, 3)]
|
||||
i1, i2 = await _img(db), await _img(db)
|
||||
await svc.add_images(sid, [i1, i2])
|
||||
await svc.create_divider(sid, i2)
|
||||
with pytest.raises(SeriesError):
|
||||
await svc.reorder_chapters(sid, [c1, c2])
|
||||
await svc.create_divider(sid, i2)
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_reorder_pages_within_chapter(db):
|
||||
async def test_update_divider_sets_part_title_and_moves_anchor(db):
|
||||
svc = SeriesService(db)
|
||||
sid = await _series(db, "C4")
|
||||
i1, i2, i3 = await _img(db), await _img(db), await _img(db)
|
||||
await svc.add_images(sid, [i1, i2, i3])
|
||||
cid = (await _chapter_numbers(db, sid))[0][0]
|
||||
await svc.reorder_pages(sid, cid, [i3, i1, i2])
|
||||
assert await _page_order(db, cid) == [i3, i1, i2]
|
||||
d = await svc.create_divider(sid, i2)
|
||||
await svc.update_divider(
|
||||
sid, d["id"], set_title=True, title="X", set_part=True, stated_part=3
|
||||
)
|
||||
await svc.update_divider(
|
||||
sid, d["id"], set_anchor=True, anchor_image_id=i3
|
||||
)
|
||||
divs = await _dividers(db, sid)
|
||||
assert divs[0].image_id == i3
|
||||
assert divs[0].title == "X"
|
||||
assert divs[0].stated_part == 3
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_legacy_reorder_rejects_multi_chapter(db):
|
||||
async def test_delete_divider_leaves_pages(db):
|
||||
svc = SeriesService(db)
|
||||
sid = await _series(db, "C5")
|
||||
i1 = await _img(db)
|
||||
await svc.add_images(sid, [i1])
|
||||
await svc.create_chapter(sid) # now 2 chapters
|
||||
with pytest.raises(SeriesError):
|
||||
await svc.reorder(sid, [i1])
|
||||
i1, i2, i3 = await _img(db), await _img(db), await _img(db)
|
||||
await svc.add_images(sid, [i1, i2, i3])
|
||||
d = await svc.create_divider(sid, i2)
|
||||
await svc.delete_divider(sid, d["id"])
|
||||
assert await _order(db, sid) == [i1, i2, i3]
|
||||
assert len(await _dividers(db, sid)) == 0
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_merge_chapter_moves_pages_and_renumbers(db):
|
||||
async def test_removing_anchor_page_cascades_its_divider(db):
|
||||
svc = SeriesService(db)
|
||||
sid = await _series(db, "C6")
|
||||
i1, i2, i3 = await _img(db), await _img(db), await _img(db)
|
||||
await svc.add_images(sid, [i1]) # chapter 1
|
||||
c2 = (await svc.create_chapter(sid))["id"]
|
||||
await svc.add_images(sid, [i2, i3], chapter_id=c2)
|
||||
c1 = (await _chapter_numbers(db, sid))[0][0]
|
||||
moved = await svc.merge_chapter(sid, c2, c1)
|
||||
assert moved == 2
|
||||
assert await _page_order(db, c1) == [i1, i2, i3]
|
||||
# source chapter gone; remaining renumbered 1..N.
|
||||
assert await _chapter_numbers(db, sid) == [(c1, 1)]
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_delete_chapter_cascades_pages_and_renumbers(db):
|
||||
svc = SeriesService(db)
|
||||
sid = await _series(db, "C7")
|
||||
i1, i2 = await _img(db), await _img(db)
|
||||
await svc.add_images(sid, [i1])
|
||||
c2 = (await svc.create_chapter(sid))["id"]
|
||||
await svc.add_images(sid, [i2], chapter_id=c2)
|
||||
await svc.delete_chapter(sid, c2)
|
||||
assert [c for _, c in await _chapter_numbers(db, sid)] == [1]
|
||||
# i2's page cascaded away with its chapter.
|
||||
await svc.add_images(sid, [i1, i2, i3])
|
||||
await svc.create_divider(sid, i2)
|
||||
await svc.remove_images(sid, [i2])
|
||||
# the divider anchored at i2 cascaded away; pages compacted to 1..N.
|
||||
assert len(await _dividers(db, sid)) == 0
|
||||
assert await _order(db, sid) == [i1, i3]
|
||||
cnt = await db.scalar(
|
||||
select(func.count()).select_from(SeriesPage)
|
||||
.where(SeriesPage.image_id == i2)
|
||||
select(func.count()).select_from(SeriesChapter)
|
||||
.where(SeriesChapter.series_tag_id == sid)
|
||||
)
|
||||
assert cnt == 0
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_set_cover_brings_chapter_and_page_to_front(db):
|
||||
async def test_list_pages_returns_dividers_and_part_gaps(db):
|
||||
svc = SeriesService(db)
|
||||
sid = await _series(db, "C8")
|
||||
sid = await _series(db, "C7")
|
||||
i1, i2, i3 = await _img(db), await _img(db), await _img(db)
|
||||
await svc.add_images(sid, [i1]) # chapter 1
|
||||
c2 = (await svc.create_chapter(sid))["id"]
|
||||
await svc.add_images(sid, [i2, i3], chapter_id=c2)
|
||||
await svc.set_cover(sid, i3)
|
||||
chapters = await _chapter_numbers(db, sid)
|
||||
assert chapters[0][0] == c2 # i3's chapter is now first
|
||||
assert (await _page_order(db, c2))[0] == i3 # i3 first in its chapter
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_list_pages_flags_gaps_from_stated_ranges(db):
|
||||
svc = SeriesService(db)
|
||||
sid = await _series(db, "C9")
|
||||
await svc.create_chapter(sid, stated_page_start=1, stated_page_end=4)
|
||||
await svc.create_chapter(sid, stated_page_start=9, stated_page_end=12)
|
||||
await svc.add_images(sid, [i1, i2, i3])
|
||||
await svc.create_divider(sid, i1, stated_part=1)
|
||||
await svc.create_divider(sid, i3, stated_part=3)
|
||||
out = await svc.list_pages(sid)
|
||||
assert len(out["chapters"]) == 2
|
||||
assert len(out["gaps"]) == 1
|
||||
assert out["gaps"][0]["start"] == 5
|
||||
assert out["gaps"][0]["end"] == 8
|
||||
assert len(out["dividers"]) == 2
|
||||
assert len(out["part_gaps"]) == 1
|
||||
assert out["part_gaps"][0]["start"] == 2
|
||||
assert out["part_gaps"][0]["end"] == 2
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_add_with_stated_pages_records_them(db):
|
||||
svc = SeriesService(db)
|
||||
sid = await _series(db, "C10")
|
||||
sid = await _series(db, "C8")
|
||||
i1, i2 = await _img(db), await _img(db)
|
||||
await svc.add_images(sid, [i1, i2], stated_pages={i1: 9, i2: 10})
|
||||
rows = dict(
|
||||
|
||||
Reference in New Issue
Block a user