averello/koreader-mirror
1
0
Fork 0
mirror of https://github.com/koreader/koreader.git synced 2025-12-13 20:36:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix inconsistant notes between myclipping and history

Browse Source
This commit is contained in:
chrox
2014-05-12 21:19:17 +08:00
parent 31aebe1caf
commit dd278a4b1f
1 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
plugins/evernote.koplugin/main.lua
View File

@@ -232,7 +232,8 @@ function EvernoteExporter:exportCurrentNotes(view)
self:exportClippings(client, clippings)
end
function EvernoteExporter:updateClippings(clippings, new_clippings)
function EvernoteExporter:updateHistoryClippings(clippings, new_clippings)
-- update clippings from history clippings
for title, booknotes in pairs(new_clippings) do
for chapter_index, chapternotes in ipairs(booknotes) do
for note_index, note in ipairs(chapternotes) do
@@ -242,6 +243,7 @@ function EvernoteExporter:updateClippings(clippings, new_clippings)
or clippings[title][chapter_index][note_index].time ~= note.time
or clippings[title][chapter_index][note_index].text ~= note.text
or clippings[title][chapter_index][note_index].note ~= note.note then
DEBUG("found new notes in history", booknotes.title)
clippings[title] = booknotes
end
end
@@ -250,6 +252,18 @@ function EvernoteExporter:updateClippings(clippings, new_clippings)
return clippings
end
function EvernoteExporter:updateMyClippings(clippings, new_clippings)
-- only new titles or new notes in My clippings are updated to clippings
-- since appending is the only way to modify notes in My Clippings
for title, booknotes in pairs(new_clippings) do
if clippings[title] == nil or #clippings[title] < #booknotes then
DEBUG("found new notes in MyClipping", booknotes.title)
clippings[title] = booknotes
end
end
return clippings
end
function EvernoteExporter:exportAllNotes()
local EvernoteClient = require("EvernoteClient")
local client = EvernoteClient:new{
@@ -258,8 +272,8 @@ function EvernoteExporter:exportAllNotes()
}
local clippings = self.config:readSetting("clippings") or {}
clippings = self:updateClippings(clippings, self.parser:parseMyClippings())
clippings = self:updateClippings(clippings, self.parser:parseHistory())
clippings = self:updateHistoryClippings(clippings, self.parser:parseHistory())
clippings = self:updateMyClippings(clippings, self.parser:parseMyClippings())
-- remove blank entries
for title, booknotes in pairs(clippings) do
-- chapter number is zero
@@ -278,8 +292,8 @@ function EvernoteExporter:exportClippings(client, clippings)
local export_title, error_title
for title, booknotes in pairs(clippings) do
-- skip exported booknotes
if booknotes.exported ~= true then
local ok, err = pcall(self.exportBooknotes, self,
if booknotes.exported ~= true then
local ok, err = pcall(self.exportBooknotes, self,
client, title, booknotes)
-- error reporting
if not ok then
@@ -292,8 +306,6 @@ function EvernoteExporter:exportClippings(client, clippings)
export_title = title
booknotes.exported = true
end
else
DEBUG("Skip exporting notes in book:", title)
end
end