renun/koreader
1
0
Fork 0
mirror of https://github.com/koreader/koreader.git synced 2025-08-10 00:52:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Annotations: fix page numbers (#12324)

Browse Source
This commit is contained in:
hius07
2024-08-13 22:18:24 +03:00
committed by GitHub
parent f3c0af49c2
commit 27e2efcbd2
6 changed files with 46 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
frontend/apps/reader/modules/readerannotation.lua
View File

@@ -25,12 +25,8 @@ function ReaderAnnotation:buildAnnotation(bm, highlights, init)
if chapter == nil then
chapter = self.ui.toc:getTocTitleByPage(bm.page)
end
if self.ui.rolling then
pageno = self.document:getPageFromXPointer(bm.page)
pageref = self:getPageRef(bm.page, pageno)
else
pageno = bm.page
end
pageno = self.ui.rolling and self.document:getPageFromXPointer(bm.page) or bm.page
pageref = self:getPageRef(bm.page, pageno)
end
if self.ui.paging and bm.pos0 and not bm.pos0.page then
-- old single-page reflow highlights do not have page in position
@@ -120,13 +116,9 @@ function ReaderAnnotation:onReadSettings(config)
end
self.annotations = annotations
if needs_update or needs_sort then
if self.ui.rolling then
self.ui:registerPostInitCallback(function()
self:updateAnnotations(needs_update, needs_sort)
end)
else
self.ui:registerPostReaderReadyCallback(function()
self:updateAnnotations(needs_update, needs_sort)
end
end)
config:delSetting("annotations_externally_modified")
end
else -- first run
@@ -219,10 +211,12 @@ function ReaderAnnotation:migrateToAnnotations(config)
self.annotations = self:getAnnotationsFromBookmarksHighlights(bookmarks, highlights, true)
end
function ReaderAnnotation:onDocumentRerendered()
function ReaderAnnotation:setNeedsUpdateFlag()
self.needs_update = true
end
ReaderAnnotation.onDocumentRerendered = ReaderAnnotation.setNeedsUpdateFlag
function ReaderAnnotation:onCloseDocument()
self:updatePageNumbers()
end
@@ -235,10 +229,9 @@ end
-- items handling
function ReaderAnnotation:updatePageNumbers(force_update)
if self.ui.paging then return end
if force_update or self.needs_update then -- triggered by ReaderRolling on document layout change
if force_update or self.needs_update then
for _, item in ipairs(self.annotations) do
item.pageno = self.document:getPageFromXPointer(item.page)
item.pageno = self.ui.rolling and self.document:getPageFromXPointer(item.page) or item.page
item.pageref = self:getPageRef(item.page, item.pageno)
end
end
@@ -405,12 +398,8 @@ end
function ReaderAnnotation:addItem(item)
item.datetime = os.date("%Y-%m-%d %H:%M:%S")
if self.ui.rolling then
item.pageno = self.document:getPageFromXPointer(item.page)
item.pageref = self:getPageRef(item.page, item.pageno)
else
item.pageno = item.page
end
item.pageno = self.ui.rolling and self.document:getPageFromXPointer(item.page) or item.page
item.pageref = self:getPageRef(item.page, item.pageno)
local index = self:getInsertionIndex(item)
table.insert(self.annotations, index, item)
return index
@@ -418,18 +407,21 @@ end
-- info
function ReaderAnnotation:getPageRef(xp, pn) -- same as ReaderBookmark:getBookmarkPageString()
local pageref
if self.ui.pagemap:wantsPageLabels() then
pageref = self.ui.pagemap:getXPointerPageLabel(xp, true)
elseif self.ui.document:hasHiddenFlows() then
pageref = tostring(self.ui.document:getPageNumberInFlow(pn))
local flow = self.ui.document:getPageFlow(pn)
if flow > 0 then
pageref = T("[%1]%2", pageref, flow)
end
function ReaderAnnotation:getPageRef(pn_or_xp, pn)
-- same as ReaderBookmark:getBookmarkPageString(page)
-- but gets pn (page number already calculated in the caller)
-- and returns nil if there are no reference pages and hidden flows
if self.ui.pagemap and self.ui.pagemap:wantsPageLabels() then
return self.ui.pagemap:getXPointerPageLabel(pn_or_xp, true)
end
if self.document:hasHiddenFlows() then
local page = self.document:getPageNumberInFlow(pn)
local flow = self.document:getPageFlow(pn)
if flow > 0 then
return T("[%1]%2", page, flow)
end
return tostring(page)
end
return pageref
end
function ReaderAnnotation:hasAnnotations()