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

Extra OEB validity checks. "Absolute" URI generation for manifest items.

Browse Source
This commit is contained in:
Marshall T. Vandegrift 2008-12-30 19:39:16 -05:00
parent 4bae0a44fd
commit 0182685b76
1 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/calibre/ebooks/lit/oeb.py
View File

@ -128,6 +128,7 @@ class Metadata(object):
TERMS = set(['contributor', 'coverage', 'creator', 'date', 'description', TERMS = set(['contributor', 'coverage', 'creator', 'date', 'description',
'format', 'identifier', 'language', 'publisher', 'relation', 'format', 'identifier', 'language', 'publisher', 'relation',
'rights', 'source', 'subject', 'title', 'type']) 'rights', 'source', 'subject', 'title', 'type'])
ATTRS = set(['role', 'file-as', 'scheme'])
OPF1_NSMAP = {'dc': DC11_NS, 'oebpackage': OPF1_NS} OPF1_NSMAP = {'dc': DC11_NS, 'oebpackage': OPF1_NS}
OPF2_NSMAP = {'opf': OPF2_NS, 'dc': DC11_NS, 'dcterms': DCTERMS_NS, OPF2_NSMAP = {'opf': OPF2_NS, 'dc': DC11_NS, 'dcterms': DCTERMS_NS,
'xsi': XSI_NS} 'xsi': XSI_NS}
@ -144,6 +145,11 @@ class Metadata(object):
self.value = value self.value = value
self.attrib = attrib = {} self.attrib = attrib = {}
for fq_attr in fq_attrib: for fq_attr in fq_attrib:
if fq_attr in Metadata.ATTRS:
attr = fq_attr
fq_attr = OPF2(fq_attr)
fq_attrib[fq_attr] = fq_attrib.pop(attr)
else:
attr = barename(fq_attr) attr = barename(fq_attr)
attrib[attr] = fq_attrib[fq_attr] attrib[attr] = fq_attrib[fq_attr]
@ -161,7 +167,7 @@ class Metadata(object):
% (barename(self.term), self.value, self.attrib) % (barename(self.term), self.value, self.attrib)
def __str__(self): def __str__(self):
return self.value.encode('ascii', 'xmlcharrefreplace') return unicode(self.value).encode('ascii', 'xmlcharrefreplace')
def __unicode__(self): def __unicode__(self):
return unicode(self.value) return unicode(self.value)
@ -277,6 +283,14 @@ class Manifest(object):
return result return result
return cmp(self.id, other.id) return cmp(self.id, other.id)
def abshref(self, href):
if '/' not in self.href:
return href
dirname = os.path.dirname(self.href)
href = os.path.join(dirname, href)
href = os.path.normpath(href).replace('\\', '/')
return href
def __init__(self, oeb): def __init__(self, oeb):
self.oeb = oeb self.oeb = oeb
self.ids = {} self.ids = {}
@ -581,6 +595,15 @@ class OEBBook(object):
else: else:
self.logger.log_warn(u'Unique-identifier %r not found.' % uid) self.logger.log_warn(u'Unique-identifier %r not found.' % uid)
self.uid = metadata.identifier[0] self.uid = metadata.identifier[0]
if not metadata.language:
self.logger.log_warn(u'Language not specified.')
metadata.add('language', 'en')
if not metadata.creator:
self.logger.log_warn(u'Creator not specified.')
metadata.add('creator', 'Unknown')
if not metadata.title:
self.logger.log_warn(u'Title not specified.')
metadata.add('title', 'Unknown')
def _manifest_from_opf(self, opf): def _manifest_from_opf(self, opf):
self.manifest = manifest = Manifest(self) self.manifest = manifest = Manifest(self)