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

Explicitly clear all known fields when merging XMP packets

Browse Source
This commit is contained in:
Kovid Goyal 2014-02-17 10:31:43 +05:30
parent 2b03c2621a
commit 196e3286d8
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/calibre/ebooks/metadata/xmp.py
View File

@ -425,10 +425,14 @@ def merge_xmp_packet(old, new):
# As per the adobe spec all metadata items have to be present inside top-level rdf:Description containers # As per the adobe spec all metadata items have to be present inside top-level rdf:Description containers
item_xpath = XPath('//rdf:RDF/rdf:Description/*') item_xpath = XPath('//rdf:RDF/rdf:Description/*')
# First remove all data fields that are defined in the new packet from the # First remove all data fields that metadata_to_xmp_packet() knowns about,
# old packet # since either they will have been set or if not present, imply they have
# been cleared
defined_tags = {expand(prefix + ':' + scheme) for prefix in ('prism', 'pdfx') for scheme in KNOWN_ID_SCHEMES} defined_tags = {expand(prefix + ':' + scheme) for prefix in ('prism', 'pdfx') for scheme in KNOWN_ID_SCHEMES}
defined_tags |= {x.tag for x in item_xpath(new)} | {expand('dc:identifier')} defined_tags |= {expand('dc:' + x) for x in ('identifier', 'title', 'creator', 'date', 'description', 'language', 'publisher', 'subject')}
defined_tags |= {expand('xmp:' + x) for x in ('MetadataDate', 'Identifier')}
# For redundancy also remove all fields explicitly set in the new packet
defined_tags |= {x.tag for x in item_xpath(new)}
calibrens = '{%s}' % NS_MAP['calibre'] calibrens = '{%s}' % NS_MAP['calibre']
for elem in item_xpath(old): for elem in item_xpath(old):
if elem.tag in defined_tags or (elem.tag and elem.tag.startswith(calibrens)): if elem.tag in defined_tags or (elem.tag and elem.tag.startswith(calibrens)):