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

Store current toc node information when creating highlights

Browse Source
This commit is contained in:
Kovid Goyal 2020-09-01 20:08:10 +05:30
parent 1cfc3c8c78
commit 5ce9010cc3
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pyj/read_book/annotations.pyj
View File

@ -237,7 +237,7 @@ class AnnotationsManager: # {{{
x = 2 * (spine_index + 1) x = 2 * (spine_index + 1)
return f'epubcfi(/{x}{h.start_cfi})' return f'epubcfi(/{x}{h.start_cfi})'
def add_highlight(self, msg, style, notes): def add_highlight(self, msg, style, notes, toplevel_toc_node, toc_node):
now = Date().toISOString() now = Date().toISOString()
for uuid in msg.removed_highlights: for uuid in msg.removed_highlights:
self.remove_highlight(uuid) self.remove_highlight(uuid)
@ -255,6 +255,10 @@ class AnnotationsManager: # {{{
} }
if notes: if notes:
annot.notes = notes annot.notes = notes
if toplevel_toc_node?.title:
annot.top_level_section_title = toplevel_toc_node.title
if toc_node?.title:
annot.lowest_level_section_title = toc_node.title
self.sync_annots_to_server('highlights') self.sync_annots_to_server('highlights')
def highlights_for_currently_showing(self): def highlights_for_currently_showing(self):

3
src/pyj/read_book/selection_bar.pyj
View File

@ -965,7 +965,8 @@ class SelectionBar:
_('Highlighting failed'), _('Highlighting failed'),
_('Failed to apply highlighting, try adjusting extent of highlight') _('Failed to apply highlighting, try adjusting extent of highlight')
) )
self.annotations_manager.add_highlight(msg, self.current_highlight_style.style, notes) self.annotations_manager.add_highlight(
msg, self.current_highlight_style.style, notes, self.view.current_toc_toplevel_node, self.view.current_toc_node)
elif msg.type is 'edit-highlight': elif msg.type is 'edit-highlight':
if self.state is WAITING: if self.state is WAITING:
self.create_highlight() self.create_highlight()