Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Show highlights in the highlights panel sorted by start position in book

Browse Source
This commit is contained in:
Kovid Goyal 2020-07-20 17:33:29 +05:30
parent e0f1953ae6
commit ee5b7ecaa4
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/calibre/gui2/viewer/highlights.py
View File

@ -11,6 +11,7 @@ from PyQt5.Qt import (
) )
from calibre.constants import plugins from calibre.constants import plugins
from calibre.ebooks.epub.cfi.parse import cfi_sort_key
from calibre.gui2 import error_dialog, question_dialog from calibre.gui2 import error_dialog, question_dialog
from calibre.gui2.library.annotations import Details from calibre.gui2.library.annotations import Details
from calibre.gui2.viewer.search import SearchInput from calibre.gui2.viewer.search import SearchInput
@ -39,12 +40,21 @@ class Highlights(QListWidget):
def load(self, highlights): def load(self, highlights):
self.clear() self.clear()
self.uuid_map = {} self.uuid_map = {}
for h in highlights or (): highlights = (h for h in highlights if not h.get('removed') and h.get('highlighted_text'))
for h in self.sorted_highlights(highlights):
txt = h.get('highlighted_text') txt = h.get('highlighted_text')
if not h.get('removed') and txt: i = QListWidgetItem(txt, self)
i = QListWidgetItem(txt, self) i.setData(Qt.UserRole, h)
i.setData(Qt.UserRole, h) self.uuid_map[h['uuid']] = self.count() - 1
self.uuid_map[h['uuid']] = self.count() - 1
def sorted_highlights(self, highlights):
defval = 999999999999999, cfi_sort_key('/99999999')
def cfi_key(h):
cfi = h.get('start_cfi')
return (h.get('spine_index') or defval[0], cfi_sort_key(cfi)) if cfi else defval
return sorted(highlights, key=cfi_key)
def refresh(self, highlights): def refresh(self, highlights):
h = self.current_highlight h = self.current_highlight