Implement series

This commit is contained in:
Kovid Goyal 2016-06-23 16:06:50 +05:30
parent b502499140
commit 7e1d8a96e9
2 changed files with 60 additions and 3 deletions

View File

@ -622,12 +622,50 @@ def set_rating(root, prefixes, refines, val):
if val: if val:
ensure_prefix(root, prefixes, 'calibre', CALIBRE_PREFIX) ensure_prefix(root, prefixes, 'calibre', CALIBRE_PREFIX)
m = XPath('./opf:metadata')(root)[0] m = XPath('./opf:metadata')(root)[0]
if val:
d = m.makeelement(OPF('meta'), attrib={'property':'calibre:rating'}) d = m.makeelement(OPF('meta'), attrib={'property':'calibre:rating'})
d.text = '%.2g' % val d.text = '%.2g' % val
m.append(d) m.append(d)
# }}} # }}}
# Series {{{
def read_series(root, prefixes, refines):
series_index = 1.0
for meta in XPath('./opf:metadata/opf:meta[@property="belongs-to-collection" and @id]')(root):
val = (meta.text or '').strip()
if val:
props = properties_for_id(meta.get('id'), refines)
if props.get('collection-type') == 'series':
try:
series_index = float(props.get('group-position').strip())
except Exception:
pass
return normalize_whitespace(val), series_index
for si in XPath('./opf:metadata/opf:meta[@name="calibre:series_index"]/@content')(root):
try:
series_index = float(si)
break
except:
pass
for s in XPath('./opf:metadata/opf:meta[@name="calibre:series"]/@content')(root):
s = normalize_whitespace(s)
if s:
return s, series_index
return None, series_index
def set_series(root, prefixes, refines, series, series_index):
for meta in XPath('./opf:metadata/opf:meta[@name="calibre:series" or @name="calibre:series_index"]')(root):
remove_element(meta, refines)
for meta in XPath('./opf:metadata/opf:meta[@property="belongs-to-collection"]')(root):
remove_element(meta, refines)
m = XPath('./opf:metadata')(root)[0]
if series:
d = m.makeelement(OPF('meta'), attrib={'property':'belongs-to-collection'})
d.text = series
m.append(d)
set_refines(d, refines, refdef('collection-type', 'series'), refdef('group-position', '%.2g' % series_index))
# }}}
def read_metadata(root): def read_metadata(root):
ans = Metadata(_('Unknown'), [_('Unknown')]) ans = Metadata(_('Unknown'), [_('Unknown')])
prefixes, refines = read_prefixes(root), read_refines(root) prefixes, refines = read_prefixes(root), read_refines(root)
@ -663,6 +701,9 @@ def read_metadata(root):
ans.publisher = read_publisher(root, prefixes, refines) or ans.publisher ans.publisher = read_publisher(root, prefixes, refines) or ans.publisher
ans.tags = read_tags(root, prefixes, refines) or ans.tags ans.tags = read_tags(root, prefixes, refines) or ans.tags
ans.rating = read_rating(root, prefixes, refines) or ans.rating ans.rating = read_rating(root, prefixes, refines) or ans.rating
s, si = read_series(root, prefixes, refines)
if s:
ans.series, ans.series_index = s, si
return ans return ans
def get_metadata(stream): def get_metadata(stream):
@ -685,6 +726,7 @@ def apply_metadata(root, mi, cover_prefix='', cover_data=None, apply_null=False,
set_publisher(root, prefixes, refines, mi.publisher) set_publisher(root, prefixes, refines, mi.publisher)
set_tags(root, prefixes, refines, mi.tags) set_tags(root, prefixes, refines, mi.tags)
set_rating(root, prefixes, refines, mi.rating) set_rating(root, prefixes, refines, mi.rating)
set_series(root, prefixes, refines, mi.series, mi.series_index)
pretty_print_opf(root) pretty_print_opf(root)

View File

@ -17,7 +17,7 @@ from calibre.ebooks.metadata.opf3 import (
read_book_producers, set_book_producers, read_timestamp, set_timestamp, read_book_producers, set_book_producers, read_timestamp, set_timestamp,
read_pubdate, set_pubdate, CALIBRE_PREFIX, read_last_modified, read_comments, read_pubdate, set_pubdate, CALIBRE_PREFIX, read_last_modified, read_comments,
set_comments, read_publisher, set_publisher, read_tags, set_tags, read_rating, set_comments, read_publisher, set_publisher, read_tags, set_tags, read_rating,
set_rating set_rating, read_series, set_series
) )
TEMPLATE = '''<package xmlns="http://www.idpf.org/2007/opf" version="3.0" prefix="calibre: %s" unique-identifier="uid"><metadata xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:opf="http://www.idpf.org/2007/opf">{metadata}</metadata></package>''' % CALIBRE_PREFIX # noqa TEMPLATE = '''<package xmlns="http://www.idpf.org/2007/opf" version="3.0" prefix="calibre: %s" unique-identifier="uid"><metadata xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:opf="http://www.idpf.org/2007/opf">{metadata}</metadata></package>''' % CALIBRE_PREFIX # noqa
@ -220,6 +220,21 @@ class TestOPF3(unittest.TestCase):
self.ae(1, st(root,1)) self.ae(1, st(root,1))
# }}} # }}}
def test_series(self): # {{{
def rt(root):
return read_series(root, read_prefixes(root), read_refines(root))
def st(root, val, i):
set_series(root, read_prefixes(root), read_refines(root), val, i)
return rt(root)
root = self.get_opf('''<meta name="calibre:series" content="xxx"/><meta name="calibre:series_index" content="5"/>''')
self.ae(('xxx', 5), rt(root))
root = self.get_opf('''<meta name="calibre:series" content="xxx"/><meta name="calibre:series_index" content="5"/>'''
'<meta property="belongs-to-collection" id="c02">yyy</meta><meta refines="#c02" property="collection-type">series</meta>'
'<meta refines="#c02" property="group-position">2.1</meta>')
self.ae(('yyy', 2.1), rt(root))
self.ae(('zzz', 3.3), st(root, 'zzz', 3.3))
# }}}
# Run tests {{{ # Run tests {{{
def suite(): def suite():