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

Implement dc:subject

Browse Source
This commit is contained in:
Kovid Goyal 2016-06-23 14:42:07 +05:30
parent dca6c268ed
commit 88a88db233
2 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,6 +6,7 @@ from __future__ import (unicode_literals, division, absolute_import,
print_function)
from collections import defaultdict, namedtuple
from functools import wraps
from future_builtins import map
import re
from lxml import etree
@ -567,6 +568,28 @@ def set_publisher(root, prefixes, refines, val):
m.append(c)
# }}}
# Tags {{{
def read_tags(root, prefixes, refines):
ans = []
for dc in XPath('./opf:metadata/dc:subject')(root):
if dc.text:
ans.extend(map(normalize_whitespace, dc.text.split(',')))
return uniq(filter(None, ans))
def set_tags(root, prefixes, refines, val):
for dc in XPath('./opf:metadata/dc:subject')(root):
remove_element(dc, refines)
m = XPath('./opf:metadata')(root)[0]
if val:
val = uniq(filter(None, val))
for x in val:
c = m.makeelement(DC('subject'))
c.text = normalize_whitespace(x)
if c.text:
m.append(c)
# }}}
def read_metadata(root):
ans = Metadata(_('Unknown'), [_('Unknown')])
prefixes, refines = read_prefixes(root), read_refines(root)
@ -600,6 +623,7 @@ def read_metadata(root):
ans.last_modified = lm
ans.comments = read_comments(root, prefixes, refines) or ans.comments
ans.publisher = read_publisher(root, prefixes, refines) or ans.publisher
ans.tags = read_tags(root, prefixes, refines) or ans.tags
return ans
def get_metadata(stream):
@ -620,6 +644,7 @@ def apply_metadata(root, mi, cover_prefix='', cover_data=None, apply_null=False,
set_timestamp(root, prefixes, refines, mi.timestamp)
set_comments(root, prefixes, refines, mi.comments)
set_publisher(root, prefixes, refines, mi.publisher)
set_tags(root, prefixes, refines, mi.tags)
pretty_print_opf(root)

13
src/calibre/ebooks/metadata/opf3_test.py
View File

@ -16,7 +16,7 @@ from calibre.ebooks.metadata.opf3 import (
read_authors, Author, set_authors, ensure_prefix, read_prefixes,
read_book_producers, set_book_producers, read_timestamp, set_timestamp,
read_pubdate, set_pubdate, CALIBRE_PREFIX, read_last_modified, read_comments,
set_comments, read_publisher, set_publisher
set_comments, read_publisher, set_publisher, read_tags, set_tags
)
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
@ -195,6 +195,17 @@ class TestOPF3(unittest.TestCase):
self.ae('<a>p</a>', st(root, '<a>p</a> '))
# }}}
def test_tags(self): # {{{
def rt(root):
return read_tags(root, read_prefixes(root), read_refines(root))
def st(root, val):
set_tags(root, read_prefixes(root), read_refines(root), val)
return rt(root)
root = self.get_opf('''<dc:subject> one, two </dc:subject><dc:subject> xxx</dc:subject>''')
self.ae('one,two,xxx'.split(','), rt(root))
self.ae('1,2,3'.split(','), st(root, '1,2,3'.split(',')))
# }}}
# Run tests {{{
def suite():