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

Make items_with_propert() prefix aware

Browse Source
This commit is contained in:
Kovid Goyal 2016-07-06 10:25:45 +05:30
parent b1f64efdd0
commit 37946153d0
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/calibre/ebooks/metadata/opf3.py
View File

@ -116,8 +116,14 @@ def simple_text(f):
return normalize_whitespace(f(*args, **kw)) return normalize_whitespace(f(*args, **kw))
return wrapper return wrapper
def items_with_property(root, q): def items_with_property(root, q, prefixes):
return XPath("./opf:manifest/opf:item[@properties and contains(concat(' ', normalize-space(@properties), ' '), ' %s ')]" % q)(root) q = expand_prefix(q, prefixes)
for item in XPath("./opf:manifest/opf:item[@properties]")(root):
for prop in (item.get('properties') or '').split():
prop = expand_prefix(prop, prefixes)
if prop == q:
yield item
# }}} # }}}
# Prefixes {{{ # Prefixes {{{
@ -798,7 +804,7 @@ def read_raster_cover(root, prefixes, refines):
if href: if href:
return href return href
for item in items_with_property(root, 'cover-image'): for item in items_with_property(root, 'cover-image', prefixes):
href = get_href(item) href = get_href(item)
if href: if href:
return href return href
@ -813,7 +819,7 @@ def read_raster_cover(root, prefixes, refines):
def ensure_is_only_raster_cover(root, prefixes, refines, raster_cover_item_href): def ensure_is_only_raster_cover(root, prefixes, refines, raster_cover_item_href):
for item in XPath('./opf:metadata/opf:meta[@name="cover"]')(root): for item in XPath('./opf:metadata/opf:meta[@name="cover"]')(root):
remove_element(item, refines) remove_element(item, refines)
for item in items_with_property(root, 'cover-image'): for item in items_with_property(root, 'cover-image', prefixes):
prop = normalize_whitespace(item.get('properties').replace('cover-image', '')) prop = normalize_whitespace(item.get('properties').replace('cover-image', ''))
if prop: if prop:
item.set('properties', prop) item.set('properties', prop)