averello/koreader-mirror
1
0
Fork 0
mirror of https://github.com/koreader/koreader.git synced 2025-12-13 20:36:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

ReaderToc: rework getChapterPageCount/Left/Done()

Browse Source 
Rework the way they are computed, fixing issues with hidden
flows when they don't coincide with chapter starts.
This commit is contained in:
poire-z
2023-10-08 17:51:39 +02:00
parent e6ac74c1df
commit 5ec736ae96
2 changed files with 40 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
frontend/apps/reader/modules/readertoc.lua
View File

@@ -543,78 +543,54 @@ function ReaderToc:isChapterEnd(cur_pageno)
end
function ReaderToc:getChapterPageCount(pageno)
if self.ui.document:hasHiddenFlows() then
-- Count pages until new chapter, starting by going backwards to the beginning of the current chapter if necessary
local page_count = 1
if not self:isChapterStart(pageno) then
local test_page = self.ui.document:getPrevPage(pageno)
while test_page > 0 do
page_count = page_count + 1
if self:isChapterStart(test_page) then
break
end
test_page = self.ui.document:getPrevPage(test_page)
local next_chapter = self:getNextChapter(pageno) or self.ui.document:getPageCount() + 1
local previous_chapter = self:isChapterStart(pageno) and pageno or self:getPreviousChapter(pageno) or 1
local page_count = next_chapter - previous_chapter
if self.ui.document:hasHiddenFlows() and self.ui.document:getPageFlow(pageno) == 0 then
-- If current page in a hidden flow, return the full amount of pages in this chapter.
-- Otherwise, count only pages in the main flow
for page = previous_chapter, next_chapter - 1 do
if self.ui.document:getPageFlow(page) ~= 0 then
page_count = page_count - 1
end
end
-- Then forward
local test_page = self.ui.document:getNextPage(pageno)
while test_page > 0 do
page_count = page_count + 1
if self:isChapterStart(test_page) then
return page_count - 1
end
test_page = self.ui.document:getNextPage(test_page)
end
else
local next_chapter = self:getNextChapter(pageno) or self.ui.document:getPageCount() + 1
local previous_chapter = self:isChapterStart(pageno) and pageno or self:getPreviousChapter(pageno) or 1
local page_count = next_chapter - previous_chapter
return page_count
end
return page_count
end
function ReaderToc:getChapterPagesLeft(pageno)
if self.ui.document:hasHiddenFlows() then
-- Count pages until new chapter
local pages_left = 0
local test_page = self.ui.document:getNextPage(pageno)
while test_page > 0 do
pages_left = pages_left + 1
if self:isChapterStart(test_page) then
return pages_left - 1
end
test_page = self.ui.document:getNextPage(test_page)
end
else
local next_chapter = self:getNextChapter(pageno)
if next_chapter then
next_chapter = next_chapter - pageno - 1
end
return next_chapter
local next_chapter = self:getNextChapter(pageno)
if not next_chapter then
-- (ReaderFooter deals itself with nil and pageno in last chapter)
return
end
local pages_left = next_chapter - pageno - 1
if self.ui.document:hasHiddenFlows() and self.ui.document:getPageFlow(pageno) == 0 then
for page = pageno, next_chapter - 1 do
if self.ui.document:getPageFlow(page) ~= 0 then
pages_left = pages_left - 1
end
end
end
return pages_left
end
function ReaderToc:getChapterPagesDone(pageno)
if self:isChapterStart(pageno) then return 0 end
if self.ui.document:hasHiddenFlows() then
-- Count pages until chapter start
local pages_done = 0
local test_page = self.ui.document:getPrevPage(pageno)
while test_page > 0 do
pages_done = pages_done + 1
if self:isChapterStart(test_page) then
return pages_done
end
test_page = self.ui.document:getPrevPage(test_page)
end
else
local previous_chapter = self:getPreviousChapter(pageno)
if previous_chapter then
previous_chapter = pageno - previous_chapter
end
return previous_chapter
local previous_chapter = self:getPreviousChapter(pageno)
if not previous_chapter then
-- (ReaderFooter deals itself with nil and pageno not yet in first chapter)
return
end
local pages_done = pageno - previous_chapter
if self.ui.document:hasHiddenFlows() and self.ui.document:getPageFlow(pageno) == 0 then
for page = previous_chapter, pageno - 1 do
if self.ui.document:getPageFlow(page) ~= 0 then
pages_done = pages_done - 1
end
end
end
return pages_done
end
function ReaderToc:updateCurrentNode()

5
spec/unit/readertoc_spec.lua
View File

@@ -76,7 +76,10 @@ describe("Readertoc module", function()
it("should get page left of chapter", function()
assert.truthy(toc:getChapterPagesLeft(10) > 10)
assert.truthy(toc:getChapterPagesLeft(95) > 10)
assert.are.same(nil, toc:getChapterPagesLeft(290))
-- assert.are.same(nil, toc:getChapterPagesLeft(290))
-- Previous line somehow fails, but not if written this way:
local pagesleft = toc:getChapterPagesLeft(290)
assert.are.same(nil, pagesleft)
end)
it("should get page done of chapter", function()
assert.truthy(toc:getChapterPagesDone(11) < 5)