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

Ensure at_point() does not raise exceptions

Browse Source
This commit is contained in:
Kovid Goyal 2020-08-13 13:08:54 +05:30
parent 3a05d2b2ad
commit ed21a72eae
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/pyj/read_book/cfi.pyj
View File

@ -786,7 +786,7 @@ def scroll_to(cfi, callback, doc): # {{{
# }}} # }}}
def at_point(ox, oy): # {{{ def at_point(x, y): # {{{
# The CFI at the specified point. Different to at() in that this method # The CFI at the specified point. Different to at() in that this method
# returns null if there is an error, and also calculates a point from # returns null if there is an error, and also calculates a point from
# the CFI and returns null if the calculated point is far from the # the CFI and returns null if the calculated point is far from the
@ -795,17 +795,26 @@ def at_point(ox, oy): # {{{
def dist(p1, p2): def dist(p1, p2):
Math.sqrt(Math.pow(p1[0]-p2[0], 2), Math.pow(p1[1]-p2[1], 2)) Math.sqrt(Math.pow(p1[0]-p2[0], 2), Math.pow(p1[1]-p2[1], 2))
cfi = at(ox, oy) try:
cfi = at(x, y)
except:
cfi = None
if cfi is None: if cfi is None:
return None return None
try:
decoded = decode_with_range(cfi) decoded = decode_with_range(cfi)
except:
decoded = None
if not decoded: if not decoded:
return None return None
if cfi: if cfi:
try:
cfix, cfiy = decoded_to_document_position(decoded) cfix, cfiy = decoded_to_document_position(decoded)
if cfix is None or cfiy is None or dist(scroll_viewport.viewport_to_document(ox, oy), v'[cfix, cfiy]') > 50: except:
cfix = cfiy = None
if cfix is None or cfiy is None or dist(scroll_viewport.viewport_to_document(x, y), v'[cfix, cfiy]') > 50:
cfi = None cfi = None
return cfi return cfi