X-Git-Url: https://git.mdrn.pl/librarian.git/blobdiff_plain/cbe81ee35b07783b4f52c3d3dda83db7aaf82d34..318d79c6ec02163ec898a66723055da25837346a:/librarian/parser.py?ds=sidebyside diff --git a/librarian/parser.py b/librarian/parser.py index a9e8c65..efe6e95 100644 --- a/librarian/parser.py +++ b/librarian/parser.py @@ -3,9 +3,11 @@ # This file is part of Librarian, licensed under GNU Affero GPLv3 or later. # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. # +from __future__ import unicode_literals + from librarian import ValidationError, NoDublinCore, ParseError, NoProvider from librarian import RDFNS -from librarian.cover import WLCover +from librarian.cover import make_cover from librarian import dcparser from xml.parsers.expat import ExpatError @@ -14,14 +16,15 @@ from lxml.etree import XMLSyntaxError, XSLTApplyError import os import re -from StringIO import StringIO +import six + class WLDocument(object): LINE_SWAP_EXPR = re.compile(r'/\s', re.MULTILINE | re.UNICODE) provider = None def __init__(self, edoc, parse_dublincore=True, provider=None, - strict=False, meta_fallbacks=None): + strict=False, meta_fallbacks=None): self.edoc = edoc self.provider = provider @@ -36,7 +39,7 @@ class WLDocument(object): self.rdf_elem = root_elem.find(dc_path) if self.rdf_elem is None: - raise NoDublinCore('Document has no DublinCore - which is required.') + raise NoDublinCore("Document must have a '%s' element." % RDFNS('RDF')) self.book_info = dcparser.BookInfo.from_element( self.rdf_elem, fallbacks=meta_fallbacks, strict=strict) @@ -44,14 +47,14 @@ class WLDocument(object): self.book_info = None @classmethod - def from_string(cls, xml, *args, **kwargs): - return cls.from_file(StringIO(xml), *args, **kwargs) + def from_bytes(cls, xml, *args, **kwargs): + return cls.from_file(six.BytesIO(xml), *args, **kwargs) @classmethod def from_file(cls, xmlfile, *args, **kwargs): # first, prepare for parsing - if isinstance(xmlfile, basestring): + if isinstance(xmlfile, six.text_type): file = open(xmlfile, 'rb') try: data = file.read() @@ -60,17 +63,17 @@ class WLDocument(object): else: data = xmlfile.read() - if not isinstance(data, unicode): + if not isinstance(data, six.text_type): data = data.decode('utf-8') data = data.replace(u'\ufeff', '') try: parser = etree.XMLParser(remove_blank_text=False) - tree = etree.parse(StringIO(data.encode('utf-8')), parser) + tree = etree.parse(six.BytesIO(data.encode('utf-8')), parser) return cls(tree, *args, **kwargs) - except (ExpatError, XMLSyntaxError, XSLTApplyError), e: + except (ExpatError, XMLSyntaxError, XSLTApplyError) as e: raise ParseError(e) def swap_endlines(self): @@ -100,8 +103,7 @@ class WLDocument(object): if self.book_info is None: raise NoDublinCore('No Dublin Core in document.') for part_uri in self.book_info.parts: - yield self.from_file(self.provider.by_uri(part_uri), - provider=self.provider) + yield self.from_file(self.provider.by_uri(part_uri), provider=self.provider) def chunk(self, path): # convert the path to XPath @@ -122,7 +124,7 @@ class WLDocument(object): parts.append(part) else: tag, n = match.groups() - parts.append("*[%d][name() = '%s']" % (int(n)+1, tag) ) + parts.append("*[%d][name() = '%s']" % (int(n)+1, tag)) if parts[0] == '.': parts[0] = '' @@ -135,11 +137,11 @@ class WLDocument(object): def update_dc(self): if self.book_info: parent = self.rdf_elem.getparent() - parent.replace( self.rdf_elem, self.book_info.to_etree(parent) ) + parent.replace(self.rdf_elem, self.book_info.to_etree(parent)) def serialize(self): self.update_dc() - return etree.tostring(self.edoc, encoding=unicode, pretty_print=True) + return etree.tostring(self.edoc, encoding='unicode', pretty_print=True) def merge_chunks(self, chunk_dict): unmerged = [] @@ -148,18 +150,18 @@ class WLDocument(object): try: xpath = self.path_to_xpath(key) node = self.edoc.xpath(xpath)[0] - repl = etree.fromstring(u"<%s>%s" %(node.tag, data, node.tag) ) + repl = etree.fromstring(u"<%s>%s" % (node.tag, data, node.tag)) node.getparent().replace(node, repl) - except Exception, e: - unmerged.append( repr( (key, xpath, e) ) ) + except Exception as e: + unmerged.append(repr((key, xpath, e))) return unmerged - def clean_ed_note(self): + def clean_ed_note(self, note_tag='nota_red'): """ deletes forbidden tags from nota_red """ - for node in self.edoc.xpath('|'.join('//nota_red//%s' % tag for tag in - ('pa', 'pe', 'pr', 'pt', 'begin', 'end', 'motyw'))): + for node in self.edoc.xpath('|'.join('//%s//%s' % (note_tag, tag) for tag in + ('pa', 'pe', 'pr', 'pt', 'begin', 'end', 'motyw'))): tail = node.tail node.clear() node.tag = 'span' @@ -172,8 +174,7 @@ class WLDocument(object): """ if self.book_info is None: raise NoDublinCore('No Dublin Core in document.') - persons = set(self.book_info.editors + - self.book_info.technical_editors) + persons = set(self.book_info.editors + self.book_info.technical_editors) for child in self.parts(): persons.update(child.editors()) if None in persons: @@ -208,18 +209,21 @@ class WLDocument(object): def as_cover(self, cover_class=None, *args, **kwargs): if cover_class is None: - cover_class = WLCover + cover_class = make_cover return cover_class(self.book_info, *args, **kwargs).output_file() - def save_output_file(self, output_file, output_path=None, - output_dir_path=None, make_author_dir=False, ext=None): + # for debugging only + def latex_dir(self, *args, **kwargs): + kwargs['latex_dir'] = True + from librarian import pdf + return pdf.transform(self, *args, **kwargs) + + def save_output_file(self, output_file, output_path=None, output_dir_path=None, make_author_dir=False, ext=None): if output_dir_path: save_path = output_dir_path if make_author_dir: - save_path = os.path.join(save_path, - unicode(self.book_info.author).encode('utf-8')) - save_path = os.path.join(save_path, - self.book_info.uri.slug) + save_path = os.path.join(save_path, six.text_type(self.book_info.author).encode('utf-8')) + save_path = os.path.join(save_path, self.book_info.url.slug) if ext: save_path += '.%s' % ext else: