Skip to content

Commit 7ad7a20

Browse files
Update merge.lua
Remove logs and fix function name Merge
1 parent 5e82845 commit 7ad7a20

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

highlightsync.koplugin/merge.lua

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ local function get_newer(item1, item2)
4343
end
4444

4545
-- Function to merge highlights from local, server, and last sync versions
46-
function merge_highlights(local_annotations, server_annotations, last_sync_annotations)
46+
function Merge_highlights(local_annotations, server_annotations, last_sync_annotations)
4747
local merged = {}
4848

4949
-- Convert lists into tables indexed by the unique key
@@ -57,9 +57,9 @@ function merge_highlights(local_annotations, server_annotations, last_sync_annot
5757
for key, local_highlight in pairs(local_map) do
5858
local server_highlight = server_map[key]
5959
local last_sync_highlight = last_sync_map[key]
60-
salt.save(server_map, SidecarDir .. "/key-server.lua")
61-
salt.save(local_map, SidecarDir .. "/key-local.lua")
62-
salt.save(last_sync_map, SidecarDir .. "/last-key.lua")
60+
-- salt.save(server_map, SidecarDir .. "/key-server.lua")
61+
-- salt.save(local_map, SidecarDir .. "/key-local.lua")
62+
-- salt.save(last_sync_map, SidecarDir .. "/last-key.lua")
6363

6464
if server_highlight == nil and last_sync_highlight ~= nil then
6565
-- ❌ If the highlight was in the last sync, still exists locally, but is missing from the server,

0 commit comments

Comments
 (0)