fnp
/
librarian.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix for missing xml declaration of content.opf and toc.ncx
[librarian.git]
/
librarian
/
parser.py
diff --git
a/librarian/parser.py
b/librarian/parser.py
index
b5145a6
..
e06c4d7
100644
(file)
--- a/
librarian/parser.py
+++ b/
librarian/parser.py
@@
-5,6
+5,7
@@
#
from librarian import ValidationError, NoDublinCore, ParseError, NoProvider
from librarian import RDFNS
#
from librarian import ValidationError, NoDublinCore, ParseError, NoProvider
from librarian import RDFNS
+from librarian.cover import DefaultEbookCover
from librarian import dcparser
from xml.parsers.expat import ExpatError
from librarian import dcparser
from xml.parsers.expat import ExpatError
@@
-19,7
+20,8
@@
class WLDocument(object):
LINE_SWAP_EXPR = re.compile(r'/\s', re.MULTILINE | re.UNICODE)
provider = None
LINE_SWAP_EXPR = re.compile(r'/\s', re.MULTILINE | re.UNICODE)
provider = None
- def __init__(self, edoc, parse_dublincore=True, provider=None, strict=False):
+ def __init__(self, edoc, parse_dublincore=True, provider=None,
+ strict=False, meta_fallbacks=None):
self.edoc = edoc
self.provider = provider
self.edoc = edoc
self.provider = provider
@@
-37,7
+39,7
@@
class WLDocument(object):
raise NoDublinCore('Document has no DublinCore - which is required.')
self.book_info = dcparser.BookInfo.from_element(
raise NoDublinCore('Document has no DublinCore - which is required.')
self.book_info = dcparser.BookInfo.from_element(
- self.rdf_elem, strict=strict)
+ self.rdf_elem,
fallbacks=meta_fallbacks,
strict=strict)
else:
self.book_info = None
else:
self.book_info = None
@@
-46,7
+48,7
@@
class WLDocument(object):
return cls.from_file(StringIO(xml), *args, **kwargs)
@classmethod
return cls.from_file(StringIO(xml), *args, **kwargs)
@classmethod
- def from_file(cls, xmlfile,
parse_dublincore=True, provider=None
):
+ def from_file(cls, xmlfile,
*args, **kwargs
):
# first, prepare for parsing
if isinstance(xmlfile, basestring):
# first, prepare for parsing
if isinstance(xmlfile, basestring):
@@
-67,7
+69,7
@@
class WLDocument(object):
parser = etree.XMLParser(remove_blank_text=False)
tree = etree.parse(StringIO(data.encode('utf-8')), parser)
parser = etree.XMLParser(remove_blank_text=False)
tree = etree.parse(StringIO(data.encode('utf-8')), parser)
- return cls(tree,
parse_dublincore=parse_dublincore, provider=provider
)
+ return cls(tree,
*args, **kwargs
)
except (ExpatError, XMLSyntaxError, XSLTApplyError), e:
raise ParseError(e)
except (ExpatError, XMLSyntaxError, XSLTApplyError), e:
raise ParseError(e)
@@
-204,6
+206,11
@@
class WLDocument(object):
from librarian import fb2
return fb2.transform(self, *args, **kwargs)
from librarian import fb2
return fb2.transform(self, *args, **kwargs)
+ def as_cover(self, cover_class=None, *args, **kwargs):
+ if cover_class is None:
+ cover_class = DefaultEbookCover
+ 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):
if output_dir_path:
def save_output_file(self, output_file, output_path=None,
output_dir_path=None, make_author_dir=False, ext=None):
if output_dir_path: