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

When creating and using id assertions in CFI check that the ID is unique

Browse Source
This commit is contained in:
Kovid Goyal 2023-04-19 23:02:17 +05:30
parent b63ca39143
commit d153d026e9
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -238,7 +238,14 @@ def encode(doc, node, offset, tail):
index -= 1 index -= 1
# Add id assertions for robustness where possible # Add id assertions for robustness where possible
id = node.id id = node.id
idspec = ('[' + escape_for_cfi(id) + ']') if id else '' idspec = ''
if id:
try:
multiples = document.querySelectorAll('#' + id)
except:
multiples = None
if multiples and multiples.length < 2:
idspec = ('[' + escape_for_cfi(id) + ']')
cfi = '/' + index + idspec + cfi cfi = '/' + index + idspec + cfi
node = p node = p
@ -268,6 +275,11 @@ def node_for_path_step(parent, target, assertion):
if assertion: if assertion:
q = document.getElementById(assertion) q = document.getElementById(assertion)
if q: if q:
try:
multiples = document.querySelectorAll('#' + assertion)
except:
multiples = None
if multiples and multiples.length < 2:
return q return q
is_element = target % 2 == 0 is_element = target % 2 == 0
target //= 2 target //= 2