Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-31 14:33:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

DOCX Output: Word no longer complains about damaged file

Browse Source
This commit is contained in:
Kovid Goyal 2015-03-15 13:19:41 +05:30
parent 41750fe5ff
commit ebb5e4dfe6
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/ebooks/conversion/plugins/docx_output.py
View File

@ -39,7 +39,7 @@ class DOCXOutput(OutputFormatPlugin):
from calibre.ebooks.docx.writer.from_html import Convert from calibre.ebooks.docx.writer.from_html import Convert
docx = DOCX(opts, log) docx = DOCX(opts, log)
Convert(oeb, docx)() Convert(oeb, docx)()
docx.write(output_path) docx.write(output_path, oeb)
if opts.extract_to: if opts.extract_to:
from calibre.ebooks.docx.dump import do_dump from calibre.ebooks.docx.dump import do_dump
do_dump(output_path, opts.extract_to) do_dump(output_path, opts.extract_to)

1
src/calibre/ebooks/docx/writer/TODO
View File

@ -6,6 +6,7 @@ Various TODOs sprinkled through the source
Tables Tables
Lists Lists
Embed Fonts Embed Fonts
Cover image
RTL text RTL text
Lang support in run styles <w:lang> Lang support in run styles <w:lang>
Create graphical config widget Create graphical config widget

20
src/calibre/ebooks/docx/writer/container.py
View File

@ -14,6 +14,7 @@ from lxml.builder import ElementMaker
from calibre import guess_type from calibre import guess_type
from calibre.constants import numeric_version, __appname__ from calibre.constants import numeric_version, __appname__
from calibre.ebooks.docx.names import namespaces, STYLES, WEB_SETTINGS from calibre.ebooks.docx.names import namespaces, STYLES, WEB_SETTINGS
from calibre.utils.date import utcnow
from calibre.utils.zipfile import ZipFile from calibre.utils.zipfile import ZipFile
def xml2str(root, pretty_print=False, with_tail=False): def xml2str(root, pretty_print=False, with_tail=False):
@ -90,7 +91,7 @@ class DOCX(object):
types.append(E.Default(Extension=ext, ContentType=mt)) types.append(E.Default(Extension=ext, ContentType=mt))
# TODO: Iterate over all resources and add mimetypes for any that are # TODO: Iterate over all resources and add mimetypes for any that are
# not already added # not already added
return xml2str(types, pretty_print=True) return xml2str(types)
@property @property
def appproperties(self): def appproperties(self):
@ -104,7 +105,7 @@ class DOCX(object):
E.ScaleCrop('false'), E.ScaleCrop('false'),
E.SharedDoc('false'), E.SharedDoc('false'),
) )
return xml2str(props, pretty_print=True) return xml2str(props)
@property @property
def containerrels(self): def containerrels(self):
@ -121,15 +122,26 @@ class DOCX(object):
E = ElementMaker(namespace=namespaces['w'], nsmap={'w':namespaces['w']}) E = ElementMaker(namespace=namespaces['w'], nsmap={'w':namespaces['w']})
ws = E.webSettings( ws = E.webSettings(
E.optimizeForBrowser, E.allowPNG, E.doNotSaveAsSingleFile) E.optimizeForBrowser, E.allowPNG, E.doNotSaveAsSingleFile)
return xml2str(ws, pretty_print=True) return xml2str(ws)
# }}} # }}}
def write(self, path_or_stream): def convert_metadata(self, oeb):
E = ElementMaker(namespace=namespaces['cp'], nsmap={x:namespaces[x] for x in 'cp dc dcterms xsi'.split()})
cp = E.coreProperties(E.revision("1"), E.lastModifiedBy('calibre'))
ts = utcnow().isoformat(str('T')).rpartition('.')[0] + 'Z'
for x in 'created modified'.split():
x = cp.makeelement('{%s}%s' % (namespaces['dcterms'], x), **{'{%s}type' % namespaces['xsi']:'dcterms:W3CDTF'})
x.text = ts
cp.append(x)
return xml2str(cp)
def write(self, path_or_stream, oeb):
with ZipFile(path_or_stream, 'w') as zf: with ZipFile(path_or_stream, 'w') as zf:
zf.writestr('[Content_Types].xml', self.contenttypes) zf.writestr('[Content_Types].xml', self.contenttypes)
zf.writestr('_rels/.rels', self.containerrels) zf.writestr('_rels/.rels', self.containerrels)
zf.writestr('docProps/app.xml', self.appproperties) zf.writestr('docProps/app.xml', self.appproperties)
zf.writestr('docProps/core.xml', self.convert_metadata(oeb))
zf.writestr('word/webSettings.xml', self.websettings) zf.writestr('word/webSettings.xml', self.websettings)
zf.writestr('word/document.xml', xml2str(self.document)) zf.writestr('word/document.xml', xml2str(self.document))
zf.writestr('word/styles.xml', xml2str(self.styles)) zf.writestr('word/styles.xml', xml2str(self.styles))