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

ReaderAnnotation: skip old highlights with invalid xpointers (#12494)

Browse Source
This commit is contained in:
hius07
2024-09-14 11:17:26 +03:00
committed by GitHub
parent 57ceaf3f07
commit d3beecd3f5
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,6 +11,18 @@ local ReaderAnnotation = WidgetContainer:extend{
function ReaderAnnotation:buildAnnotation(bm, highlights, init)
-- bm: associated single bookmark ; highlights: tables with all highlights
if self.ui.rolling then
local is_invalid
if not self.document:isXPointerInDocument(bm.page) then
logger.warn("Skipping old bookmark, invalid start xpointer:", bm.page)
is_invalid = true
end
if bm.pos1 and not self.document:isXPointerInDocument(bm.pos1) then
logger.warn("Skipping old bookmark, invalid end xpointer:", bm.page)
is_invalid = true
end
if is_invalid then return end
end
local note = bm.text
if note == "" then
note = nil
@@ -80,7 +92,10 @@ end
function ReaderAnnotation:getAnnotationsFromBookmarksHighlights(bookmarks, highlights, init)
local annotations = {}
for i = #bookmarks, 1, -1 do
table.insert(annotations, self:buildAnnotation(bookmarks[i], highlights, init))
local annotation = self:buildAnnotation(bookmarks[i], highlights, init)
if annotation then
table.insert(annotations, annotation)
end
end
if init then
self:sortItems(annotations)