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

Allow for offsets larger than text length in decode_with_range()

Browse Source 
This can happen if the book is edited, for example. And rather than fail
in such cases, better to use a close but not perfect match.
This commit is contained in:
Kovid Goyal 2020-08-13 09:21:40 +05:30
parent 120107e9d2
commit 53c0c3fb68
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -550,14 +550,14 @@ def at(x, y, doc): # {{{
return encode(doc, target, offset, tail)
# }}}
# Like decode(), but tries to construct a range from the CFI's character offset and include it in
# the return value.
# Wrapper for decode(), tries to construct a range from the CFI's
# character offset and include it in the return value.
#
# If the CFI defines a character offset, there are three cases:
# Case 1. If the offset is 0 and the text node's length is zero,
# the range is set to None. This is a failure case, but
# later code will try to use the node's bounding box.
# Case 2. Otherwise, if the offset is equal to the length of the range,
# Case 2. Otherwise, if the offset is >= the length of the range,
# then a range from the previous to the last character is created,
# and use_range_end_pos is set. This is the special case.
# Case 3. Otherwise, the range is set start at the offset and end at one character past the offset.
@ -596,8 +596,8 @@ def decode_with_range(cfi, doc): # {{{
# Check for special case: End of range offset, after the last character
offset = decoded.offset
position_at_end_of_range = False
if offset == node_len:
offset -= 1
if offset >= node_len:
offset = node_len - 1
position_at_end_of_range = True
range_.setStart(node, offset)