Migrations/bookorbit
1
0
Fork 0
mirror of https://github.com/bookorbit/bookorbit.git synced 2026-11-03 08:21:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

feat(koreader): rebuild the plugin interface and fix four-way annotation sync

Browse Source 
Squash of feat/koreader-widget-board. KOReader plugin 2.0.0 gets the widget-board dashboard, redesigned
book details, menus, lists and dialogs, Decor page and reading companions. Highlights, notes and bookmarks
now stay in step across web, Kobo, KOReader and the phones (defects D-00 to D-20, migration 0121), and
reading progress and narration hand off cleanly between devices.
This commit is contained in:
neon
2026-10-19 21:04:23 +00:00
parent 7202a59afc
commit 80244ea4e2
349 changed files with 66312 additions and 8386 deletions
Download Patch File Download Diff File Expand all files Collapse all files
koreader-plugin/bookorbit.koplugin/bookorbit_bookmarks.lua
+25 -2
View File
@@ -178,6 +178,14 @@ function BookOrbitBookmarks.applyLive(ui, to_apply)
for _, entry in ipairs(to_apply.add or {}) do
local existing_index, existing = findByPos(annotations, entry.pos)
if existing_index then
local old_chapter, old_text, old_note, old_pageno = existing.chapter, existing.text, existing.note, existing.pageno
applyTitleFields(existing, entry.title, chapterForPos(ui, entry.pos))
if type(entry.pageno) == "number" then existing.pageno = entry.pageno end
if existing.chapter ~= old_chapter or existing.text ~= old_text
or existing.note ~= old_note or existing.pageno ~= old_pageno then
touched = touched + 1
ui:handleEvent(Event:new("AnnotationsModified", { existing, index_modified = existing_index }))
end
table.insert(applied, ackExisting(entry, existing))
else
local ok, resolves = pcall(document.isXPointerInDocument, document, entry.pos)
@@ -228,6 +236,13 @@ function BookOrbitBookmarks.applySidecar(file, to_apply)
for _, entry in ipairs(to_apply.add or {}) do
local existing_index, existing = findByPos(annotations, entry.pos)
if existing_index then
local old_chapter, old_text, old_note, old_pageno = existing.chapter, existing.text, existing.note, existing.pageno
applyTitleFields(existing, entry.title, existing.chapter)
if type(entry.pageno) == "number" then existing.pageno = entry.pageno end
if existing.chapter ~= old_chapter or existing.text ~= old_text
or existing.note ~= old_note or existing.pageno ~= old_pageno then
touched = touched + 1
end
table.insert(applied, ackExisting(entry, existing))
else
-- No document is loaded, so the position cannot be verified and no
@@ -290,8 +305,13 @@ function BookOrbitBookmarks.exchangeBook(opts)
if not book then return nil, "unmatched" end
local bookmarks = opts.bookmarks or {}
local keys = BookOrbitBookmarks.collectKeys(bookmarks)
local keys_complete = #keys <= MAX_KEYS_PER_BOOK
local keys = BookOrbitBookmarks.collectKeys(opts.key_bookmarks or bookmarks)
local keys_complete = opts.keys_complete ~= false and #keys <= MAX_KEYS_PER_BOOK
if opts.file and opts.state.hasOtherCopy and opts.state:hasOtherCopy(opts.digest, opts.file) then
keys_complete = false
end
local sidecar_state
sidecar_state, keys_complete = BookOrbitSidecar.resolveExchangeState(opts.client, opts.sidecar_state, keys_complete)
if not keys_complete then keys = {} end
local result = { uploaded = 0, applied = 0, deleted = 0, failed = 0, had_errors = false }
@@ -311,6 +331,7 @@ function BookOrbitBookmarks.exchangeBook(opts)
hash = opts.digest,
keys = first_request and keys or {},
keysComplete = first_request and keys_complete or false,
sidecarState = first_request and sidecar_state or nil,
changes = chunk,
},
})
@@ -419,8 +440,10 @@ function BookOrbitBookmarks.exchangeOpenBook(opts)
digest = opts.digest,
bookmarks = bookmarks,
bm_signature = signature,
sidecar_state = opts.sidecar_state,
apply_mode = "live",
ui = ui,
file = ui.document.file,
})
end