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

DRYer

Browse Source
This commit is contained in:
Kovid Goyal 2020-04-16 19:47:33 +05:30
parent 244d0a2701
commit 016bd5458c
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
3 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pyj/read_book/extract.pyj
View File

@ -3,7 +3,7 @@
from __python__ import bound_methods, hash_literals from __python__ import bound_methods, hash_literals
from read_book.globals import get_boss from read_book.globals import annot_id_uuid_map
def get_elements(x, y): def get_elements(x, y):
@ -15,7 +15,7 @@ def get_elements(x, y):
elif elem.tagName.toLowerCase() is 'img' and elem.getAttribute('data-calibre-src') and not ans.img: elif elem.tagName.toLowerCase() is 'img' and elem.getAttribute('data-calibre-src') and not ans.img:
ans.img = elem.getAttribute('data-calibre-src') ans.img = elem.getAttribute('data-calibre-src')
elif elem.dataset?.calibreRangeWrapper: elif elem.dataset?.calibreRangeWrapper:
annot_id = get_boss().annot_id_uuid_map[elem.dataset.calibreRangeWrapper] annot_id = annot_id_uuid_map[elem.dataset.calibreRangeWrapper]
if annot_id: if annot_id:
ans.highlight = annot_id ans.highlight = annot_id
return ans return ans

9
src/pyj/read_book/globals.pyj
View File

@ -100,3 +100,12 @@ ui_operations = {
'toggle_toc': None, 'toggle_toc': None,
'toggle_full_screen': None, 'toggle_full_screen': None,
} }
annot_id_uuid_map = {}
def clear_annot_id_uuid_map():
nonlocal annot_id_uuid_map
annot_id_uuid_map = {}

33
src/pyj/read_book/iframe.pyj
View File

@ -29,8 +29,8 @@ from read_book.flow_mode import (
) )
from read_book.footnotes import is_footnote_link from read_book.footnotes import is_footnote_link
from read_book.globals import ( from read_book.globals import (
current_book, current_layout_mode, current_spine_item, runtime, set_boss, annot_id_uuid_map, clear_annot_id_uuid_map, current_book, current_layout_mode,
set_current_spine_item, set_layout_mode current_spine_item, runtime, set_boss, set_current_spine_item, set_layout_mode
) )
from read_book.mathjax import apply_mathjax from read_book.mathjax import apply_mathjax
from read_book.paged_mode import ( from read_book.paged_mode import (
@ -105,7 +105,6 @@ class IframeBoss:
self.reference_mode_enabled = False self.reference_mode_enabled = False
self.replace_history_on_next_cfi_update = True self.replace_history_on_next_cfi_update = True
self.blob_url_map = {} self.blob_url_map = {}
self.annot_id_uuid_map = {}
self.content_ready = False self.content_ready = False
self.last_window_width = self.last_window_height = -1 self.last_window_width = self.last_window_height = -1
self.forward_keypresses = False self.forward_keypresses = False
@ -201,7 +200,7 @@ class IframeBoss:
def display(self, data): def display(self, data):
self.length_before = None self.length_before = None
self.content_ready = False self.content_ready = False
self.annot_id_uuid_map = {} clear_annot_id_uuid_map()
reset_highlight_counter() reset_highlight_counter()
self.replace_history_on_next_cfi_update = True self.replace_history_on_next_cfi_update = True
self.book = current_book.book = data.book self.book = current_book.book = data.book
@ -675,7 +674,7 @@ class IframeBoss:
if annot_id: if annot_id:
extents = selection_extents(in_flow_mode) extents = selection_extents(in_flow_mode)
self.send_message( self.send_message(
'annotations', type='position-handles', extents=extents, existing=self.annot_id_uuid_map[annot_id]) 'annotations', type='position-handles', extents=extents, existing=annot_id_uuid_map[annot_id])
elif data.type is 'scroll': elif data.type is 'scroll':
if self.scroll_to_extend_annotation(data.backwards): if self.scroll_to_extend_annotation(data.backwards):
page_rect = {'width': current_page_width()} page_rect = {'width': current_page_width()}
@ -690,7 +689,7 @@ class IframeBoss:
elif data.type is 'set-highlight-style': elif data.type is 'set-highlight-style':
set_selection_style(data.style) set_selection_style(data.style)
elif data.type is 'edit-highlight': elif data.type is 'edit-highlight':
crw_ = {v: k for k, v in Object.entries(self.annot_id_uuid_map)}[data.uuid] crw_ = {v: k for k, v in Object.entries(annot_id_uuid_map)}[data.uuid]
if crw_: if crw_:
select_crw(crw_) select_crw(crw_)
self.ensure_selection_visible() self.ensure_selection_visible()
@ -704,23 +703,23 @@ class IframeBoss:
annot_id, intersecting_wrappers = wrap_text_in_range(data.style, None, self.add_highlight_listeners) annot_id, intersecting_wrappers = wrap_text_in_range(data.style, None, self.add_highlight_listeners)
removed_highlights = v'[]' removed_highlights = v'[]'
if annot_id is not None: if annot_id is not None:
intersecting_uuids = [self.annot_id_uuid_map[x] for x in intersecting_wrappers] intersecting_uuids = [annot_id_uuid_map[x] for x in intersecting_wrappers]
if data.existing and intersecting_uuids.indexOf(data.existing) > -1: if data.existing and intersecting_uuids.indexOf(data.existing) > -1:
idx = intersecting_uuids.indexOf(data.existing) idx = intersecting_uuids.indexOf(data.existing)
intersecting_wrappers.splice(idx, 1) intersecting_wrappers.splice(idx, 1)
data.uuid = data.existing data.uuid = data.existing
elif intersecting_wrappers.length is 1 and self.annot_id_uuid_map[intersecting_wrappers[0]]: elif intersecting_wrappers.length is 1 and annot_id_uuid_map[intersecting_wrappers[0]]:
data.uuid = self.annot_id_uuid_map[intersecting_wrappers[0]] data.uuid = annot_id_uuid_map[intersecting_wrappers[0]]
intersecting_wrappers = v'[]' intersecting_wrappers = v'[]'
removed_highlights = {} removed_highlights = {}
for crw in intersecting_wrappers: for crw in intersecting_wrappers:
unwrap_crw(crw) unwrap_crw(crw)
if self.annot_id_uuid_map[crw]: if annot_id_uuid_map[crw]:
removed_highlights[self.annot_id_uuid_map[crw]] = True removed_highlights[annot_id_uuid_map[crw]] = True
v'delete self.annot_id_uuid_map[crw]' v'delete annot_id_uuid_map[crw]'
removed_highlights = Object.keys(removed_highlights) removed_highlights = Object.keys(removed_highlights)
sel.removeAllRanges() sel.removeAllRanges()
self.annot_id_uuid_map[annot_id] = data.uuid annot_id_uuid_map[annot_id] = data.uuid
self.send_message( self.send_message(
'annotations', 'annotations',
type='highlight-applied', type='highlight-applied',
@ -734,7 +733,7 @@ class IframeBoss:
console.log('Ignoring annotations message to iframe with unknown type: ' + data.type) console.log('Ignoring annotations message to iframe with unknown type: ' + data.type)
def apply_highlights_on_load(self, highlights): def apply_highlights_on_load(self, highlights):
self.annot_id_uuid_map = {} clear_annot_id_uuid_map()
strcmp = v'new Intl.Collator().compare' strcmp = v'new Intl.Collator().compare'
highlights.sort(def (a, b): return strcmp(a.timestamp, b.timestamp);) highlights.sort(def (a, b): return strcmp(a.timestamp, b.timestamp);)
for h in highlights: for h in highlights:
@ -744,10 +743,10 @@ class IframeBoss:
style = f'color: {h.style.color}; background-color: {h.style["background-color"]}' style = f'color: {h.style.color}; background-color: {h.style["background-color"]}'
annot_id, intersecting_wrappers = wrap_text_in_range(style, r, self.add_highlight_listeners) annot_id, intersecting_wrappers = wrap_text_in_range(style, r, self.add_highlight_listeners)
if annot_id is not None: if annot_id is not None:
self.annot_id_uuid_map[annot_id] = h.uuid annot_id_uuid_map[annot_id] = h.uuid
for crw in intersecting_wrappers: for crw in intersecting_wrappers:
unwrap_crw(crw) unwrap_crw(crw)
v'delete self.annot_id_uuid_map[crw]' v'delete annot_id_uuid_map[crw]'
def add_highlight_listeners(self, wrapper): def add_highlight_listeners(self, wrapper):
wrapper.addEventListener('dblclick', self.highlight_wrapper_dblclicked) wrapper.addEventListener('dblclick', self.highlight_wrapper_dblclicked)
@ -760,7 +759,7 @@ class IframeBoss:
def highlight_wrapper_dblclicked(self, ev): def highlight_wrapper_dblclicked(self, ev):
crw = ev.currentTarget.dataset.calibreRangeWrapper crw = ev.currentTarget.dataset.calibreRangeWrapper
ev.preventDefault(), ev.stopPropagation() ev.preventDefault(), ev.stopPropagation()
self.activate_annotation(self.annot_id_uuid_map[crw]) self.activate_annotation(annot_id_uuid_map[crw])
def copy_selection(self): def copy_selection(self):
text = window.getSelection().toString() text = window.getSelection().toString()