refactor: Add Chapter types, lift spine-range to Epub#56
Merged
Conversation
znelson
added a commit
that referenced
this pull request
May 24, 2026
Replace TocBoundary (Section) and SpineSegment (EpubReaderActivity) with the unified Chapter type from phase 1 (PR #56). Delete TocPageRange; getPageRangeForTocIndex now returns std::optional directly. Drop the denormalized cumulativeOffset and totalPages fields. getChapterRelativePage is rewritten as a running sum over chapterPageInfo.segments (N <= 3 in practice). New getChapterTotalPages() helper exposes the chapter total to status bar and reader menu without storing it on the side. Section::tocBoundaries now precomputes endPage at build time (post-sort) instead of recomputing it in each getPageRangeForTocIndex call. No behavior change. RAM unchanged; flash drops ~1.3 KB. On-disk section cache format unchanged (no SECTION_FILE_VERSION bump).
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Introduce lib/Epub/Epub/Chapter.h with Chapter, ChapterTarget, and SpineRange POD types in preparation for unifying the scattered chapter representations across Section, EpubReaderActivity, and ActivityResult. Move the spine-range-for-TOC-index computation from EpubReaderActivity::prepareSection into Epub::getSpineRangeForTocIndex where it belongs. Rename ChapterResult to ChapterTarget for consistency with the new type taxonomy. Pure-rename + additive; no behavior change.