f2a2d96938
Pull skipped notes carrying a deleted_at tombstone but never removed the matching local annotation. A highlight deleted on Readest therefore lingered in KOReader, and a later push (notably a full sync) re-uploaded it, resurrecting the note on the server and making it reappear on every device. Add removeDeletedAnnotations, invoked at the start of the pull callback, to drop local annotations the server has tombstoned. Tombstones are matched by stored id, by the hash-derived id for native KOReader highlights, or by position/page xpointer. Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
176 lines
7.4 KiB
Lua
176 lines
7.4 KiB
Lua
-- syncannotations_spec.lua
|
|
-- Tests for readest_syncannotations.lua. The push/pull entrypoints are
|
|
-- glued to KOReader's UI (UIManager, InfoMessage, the document/annotation
|
|
-- objects) and aren't unit-testable in isolation. These specs lock down the
|
|
-- pure reconciliation logic: removeDeletedAnnotations, which drops local
|
|
-- annotations the server has tombstoned so deletions sync across platforms
|
|
-- (issue #4119 — deleted highlights reappearing in KOReader).
|
|
|
|
require("spec_helper")
|
|
|
|
-- The module pulls a handful of KOReader globals at require-time. Stub the
|
|
-- minimum surface here so the require succeeds under busted.
|
|
package.preload["ui/event"] = function()
|
|
return { new = function(_, name, data) return { name = name, data = data } end }
|
|
end
|
|
package.preload["ui/widget/infomessage"] = function()
|
|
return { new = function() return {} end }
|
|
end
|
|
package.preload["ui/network/manager"] = function() return {} end
|
|
package.preload["ui/uimanager"] = function()
|
|
return {
|
|
show = function() end,
|
|
setDirty = function() end,
|
|
nextTick = function(_, fn) fn() end,
|
|
}
|
|
end
|
|
package.preload["ffi/util"] = function()
|
|
return { template = function(s) return s end }
|
|
end
|
|
package.preload["readest_i18n"] = function()
|
|
return function(s) return s end
|
|
end
|
|
-- Deterministic stand-in for KOReader's FFI md5. Real cryptographic
|
|
-- strength is irrelevant to the matching logic; we only need a stable,
|
|
-- well-distributed hash so generated note IDs collide iff their inputs do.
|
|
package.preload["ffi/sha2"] = function()
|
|
return {
|
|
md5 = function(s)
|
|
-- djb2: addition/multiplication only, so it compiles under
|
|
-- LuaJIT (5.1), which rejects the `~` bitwise operator.
|
|
local h = 5381
|
|
for i = 1, #s do
|
|
h = (h * 33 + s:byte(i)) % 4294967296
|
|
end
|
|
return string.format("%08x", h)
|
|
end,
|
|
}
|
|
end
|
|
|
|
describe("readest_syncannotations", function()
|
|
local SyncAnnotations
|
|
|
|
before_each(function()
|
|
package.loaded["readest_syncannotations"] = nil
|
|
SyncAnnotations = require("readest_syncannotations")
|
|
end)
|
|
|
|
describe("removeDeletedAnnotations", function()
|
|
local BOOK_HASH = "book-hash-1"
|
|
|
|
local function mgr(annotations)
|
|
return { annotations = annotations }
|
|
end
|
|
|
|
it("removes a local annotation tombstoned by matching id", function()
|
|
local annotation_mgr = mgr({
|
|
{ id = "keep1", drawer = "lighten", pos0 = "/a/1", pos1 = "/a/2" },
|
|
{ id = "gone1", drawer = "lighten", pos0 = "/b/1", pos1 = "/b/2" },
|
|
})
|
|
local removed = SyncAnnotations:removeDeletedAnnotations(annotation_mgr, {
|
|
{ id = "gone1", type = "annotation", xpointer0 = "/b/1", deleted_at = "2026-05-17T00:00:00" },
|
|
}, BOOK_HASH)
|
|
|
|
assert.are.equal(1, removed)
|
|
assert.are.equal(1, #annotation_mgr.annotations)
|
|
assert.are.equal("keep1", annotation_mgr.annotations[1].id)
|
|
end)
|
|
|
|
it("removes a native annotation (no stored id) via the generated id", function()
|
|
local annotation_mgr = mgr({
|
|
{ drawer = "lighten", pos0 = "/x/1", pos1 = "/x/2" },
|
|
})
|
|
-- The note id is what KOReader produced when it first pushed
|
|
-- this highlight: a hash of the book + positions.
|
|
local note_id = SyncAnnotations:generateNoteId(BOOK_HASH, "annotation", "/x/1", "/x/2")
|
|
local removed = SyncAnnotations:removeDeletedAnnotations(annotation_mgr, {
|
|
{ id = note_id, type = "annotation", xpointer0 = "/x/1", xpointer1 = "/x/2",
|
|
deleted_at = "2026-05-17T00:00:00" },
|
|
}, BOOK_HASH)
|
|
|
|
assert.are.equal(1, removed)
|
|
assert.are.equal(0, #annotation_mgr.annotations)
|
|
end)
|
|
|
|
it("removes an annotation by position when the id is absent on both sides", function()
|
|
local annotation_mgr = mgr({
|
|
{ drawer = "underscore", pos0 = "/p/1", pos1 = "/p/9" },
|
|
})
|
|
local removed = SyncAnnotations:removeDeletedAnnotations(annotation_mgr, {
|
|
{ type = "annotation", xpointer0 = "/p/1", xpointer1 = "/p/9",
|
|
deleted_at = "2026-05-17T00:00:00" },
|
|
}, BOOK_HASH)
|
|
|
|
assert.are.equal(1, removed)
|
|
assert.are.equal(0, #annotation_mgr.annotations)
|
|
end)
|
|
|
|
it("removes a bookmark by page xpointer", function()
|
|
local annotation_mgr = mgr({
|
|
{ id = "bm1", page = "/doc/bm" },
|
|
{ id = "hl1", drawer = "lighten", pos0 = "/h/1" },
|
|
})
|
|
local removed = SyncAnnotations:removeDeletedAnnotations(annotation_mgr, {
|
|
{ id = "bm1", type = "bookmark", xpointer0 = "/doc/bm",
|
|
deleted_at = "2026-05-17T00:00:00" },
|
|
}, BOOK_HASH)
|
|
|
|
assert.are.equal(1, removed)
|
|
assert.are.equal(1, #annotation_mgr.annotations)
|
|
assert.are.equal("hl1", annotation_mgr.annotations[1].id)
|
|
end)
|
|
|
|
it("ignores notes without a deleted_at tombstone", function()
|
|
local annotation_mgr = mgr({
|
|
{ id = "a1", drawer = "lighten", pos0 = "/a/1" },
|
|
})
|
|
local removed = SyncAnnotations:removeDeletedAnnotations(annotation_mgr, {
|
|
{ id = "a1", type = "annotation", xpointer0 = "/a/1" },
|
|
}, BOOK_HASH)
|
|
|
|
assert.are.equal(0, removed)
|
|
assert.are.equal(1, #annotation_mgr.annotations)
|
|
end)
|
|
|
|
it("leaves annotations untouched when a tombstone has no local match", function()
|
|
local annotation_mgr = mgr({
|
|
{ id = "a1", drawer = "lighten", pos0 = "/a/1" },
|
|
})
|
|
local removed = SyncAnnotations:removeDeletedAnnotations(annotation_mgr, {
|
|
{ id = "not-here", type = "annotation", xpointer0 = "/z/9",
|
|
deleted_at = "2026-05-17T00:00:00" },
|
|
}, BOOK_HASH)
|
|
|
|
assert.are.equal(0, removed)
|
|
assert.are.equal(1, #annotation_mgr.annotations)
|
|
end)
|
|
|
|
it("removes multiple tombstoned annotations without index shift errors", function()
|
|
local annotation_mgr = mgr({
|
|
{ id = "a1", drawer = "lighten", pos0 = "/a/1" },
|
|
{ id = "a2", drawer = "lighten", pos0 = "/a/2" },
|
|
{ id = "a3", drawer = "lighten", pos0 = "/a/3" },
|
|
{ id = "a4", drawer = "lighten", pos0 = "/a/4" },
|
|
})
|
|
local removed = SyncAnnotations:removeDeletedAnnotations(annotation_mgr, {
|
|
{ id = "a1", type = "annotation", xpointer0 = "/a/1", deleted_at = "2026-05-17T00:00:00" },
|
|
{ id = "a3", type = "annotation", xpointer0 = "/a/3", deleted_at = "2026-05-17T00:00:00" },
|
|
}, BOOK_HASH)
|
|
|
|
assert.are.equal(2, removed)
|
|
assert.are.equal(2, #annotation_mgr.annotations)
|
|
assert.are.equal("a2", annotation_mgr.annotations[1].id)
|
|
assert.are.equal("a4", annotation_mgr.annotations[2].id)
|
|
end)
|
|
|
|
it("returns 0 when the annotation manager has no annotations", function()
|
|
local annotation_mgr = mgr({})
|
|
local removed = SyncAnnotations:removeDeletedAnnotations(annotation_mgr, {
|
|
{ id = "a1", type = "annotation", xpointer0 = "/a/1", deleted_at = "2026-05-17T00:00:00" },
|
|
}, BOOK_HASH)
|
|
|
|
assert.are.equal(0, removed)
|
|
end)
|
|
end)
|
|
end)
|