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

Fix decoding of CFI in a tag that has a range wrapper as its first child

Browse Source
This commit is contained in:
Kovid Goyal 2020-07-23 22:33:04 +05:30
parent 0c233efa27
commit 366a69a3cd
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -394,6 +394,8 @@ def decode(cfi, doc):
# Find the text node that contains the offset # Find the text node that contains the offset
if offset is not None: if offset is not None:
orig_offset = offset orig_offset = offset
if node.parentNode?.nodeType is Node.ELEMENT_NODE and node.parentNode.dataset.calibreRangeWrapper:
node = node.parentNode
node, offset, ok = node_for_text_offset(node.parentNode.childNodes, offset, point.forward, node) node, offset, ok = node_for_text_offset(node.parentNode.childNodes, offset, point.forward, node)
if not ok: if not ok:
error = "Offset out of range: " + orig_offset error = "Offset out of range: " + orig_offset

16
src/pyj/read_book/test_cfi.pyj
View File

@ -55,12 +55,10 @@ def cfi_roundtripping():
@test @test
def cfi_with_range_wrappers(): def cfi_with_range_wrappers():
document.body.appendChild(E.p('abc')) document.body.appendChild(E.p('abc', E.span('def', data_calibre_range_wrapper='1'), '123'))
p = document.body.firstChild p = document.body.firstChild
path_to_p = encode(document, p) path_to_p = encode(document, p)
p.appendChild(E.span('def', data_calibre_range_wrapper='1')) rw1 = p.querySelector('span')
rw1 = p.lastChild
p.appendChild(document.createTextNode('123'))
assert_equal(encode(document, p.firstChild, 1), f'{path_to_p}/1:1') assert_equal(encode(document, p.firstChild, 1), f'{path_to_p}/1:1')
assert_equal(decode(f'{path_to_p}/1:1'), {'node': p.firstChild, 'offset': 1}) assert_equal(decode(f'{path_to_p}/1:1'), {'node': p.firstChild, 'offset': 1})
assert_equal(encode(document, rw1), f'{path_to_p}/1:3') assert_equal(encode(document, rw1), f'{path_to_p}/1:3')
@ -98,3 +96,13 @@ def cfi_with_range_wrappers():
p.appendChild(document.createTextNode('def')) p.appendChild(document.createTextNode('def'))
after_wrapper = encode(document, p.lastChild, 1) after_wrapper = encode(document, p.lastChild, 1)
assert_equal(after_wrapper, f'{path_to_p}/1:4') assert_equal(after_wrapper, f'{path_to_p}/1:4')
document.body.appendChild(
E.p(E.span('abc', data_calibre_range_wrapper='8'), 'def', E.span('123', data_calibre_range_wrapper='9'), '456'))
p = document.body.lastChild
path_to_p = encode(document, p)
rw = p.querySelectorAll('span')[-1]
assert_equal(decode(f'{path_to_p}/1:0'), {'node': p.firstChild.firstChild, 'offset': 0})
assert_equal(decode(f'{path_to_p}/1:5'), {'node': p.firstChild.nextSibling, 'offset': 2})
assert_equal(decode(f'{path_to_p}/1:7'), {'node': rw.firstChild, 'offset': 1})
assert_equal(decode(f'{path_to_p}/1:11'), {'node': rw.nextSibling, 'offset': 2})