[Checkins] SVN: zopyx.convert2/branches/calibre-integration/src/zopyx/convert2/ convert() now returns a dict with output filename,
Andreas Jung
andreas at andreas-jung.com
Sat Sep 5 08:52:28 EDT 2009
Log message for revision 103592:
convert() now returns a dict with output filename,
the conversion status and conversion output
Changed:
U zopyx.convert2/branches/calibre-integration/src/zopyx/convert2/calibre.py
U zopyx.convert2/branches/calibre-integration/src/zopyx/convert2/cli.py
U zopyx.convert2/branches/calibre-integration/src/zopyx/convert2/fop.py
U zopyx.convert2/branches/calibre-integration/src/zopyx/convert2/prince.py
U zopyx.convert2/branches/calibre-integration/src/zopyx/convert2/xfc.py
U zopyx.convert2/branches/calibre-integration/src/zopyx/convert2/xinc.py
-=-
Modified: zopyx.convert2/branches/calibre-integration/src/zopyx/convert2/calibre.py
===================================================================
--- zopyx.convert2/branches/calibre-integration/src/zopyx/convert2/calibre.py 2009-09-05 12:39:21 UTC (rev 103591)
+++ zopyx.convert2/branches/calibre-integration/src/zopyx/convert2/calibre.py 2009-09-05 12:52:28 UTC (rev 103592)
@@ -49,7 +49,9 @@
status, output = runcmd(cmd)
if status != 0:
raise RuntimeError('Error executing: %s' % cmd)
- return output_filename
+ return dict(output_filename=output_filename,
+ status=status,
+ output=output)
class HTML2Calibre(BaseConverter):
@@ -65,9 +67,9 @@
def convert(self, output_filename=None, **calibre_options):
tidy_filename = tidyhtml(self.filename, self.encoding)
- output_filename = html2calibre(tidy_filename, output_filename, **calibre_options)
+ result = html2calibre(tidy_filename, output_filename, **calibre_options)
os.unlink(tidy_filename)
- return output_filename
+ return result
from registry import registerConverter
Modified: zopyx.convert2/branches/calibre-integration/src/zopyx/convert2/cli.py
===================================================================
--- zopyx.convert2/branches/calibre-integration/src/zopyx/convert2/cli.py 2009-09-05 12:39:21 UTC (rev 103591)
+++ zopyx.convert2/branches/calibre-integration/src/zopyx/convert2/cli.py 2009-09-05 12:52:28 UTC (rev 103592)
@@ -36,7 +36,8 @@
print '%s: %s.html -> %s.%s' % (name, tmpf, tmpf, cls.output_format)
C = Converter(tmpf + '.html', verbose=True)
try:
- output_filename = C(name, output_filename=tmpf + '.' + cls.output_format)
+ result = C(name, output_filename=tmpf + '.' + cls.output_format)
+ print result
except Exception, e:
print 'FAILED (%s)' % e
@@ -48,9 +49,9 @@
for fn in args:
C = Converter(fn, verbose=options.verbose)
- output_filename = C(options.format,
+ result = C(options.format,
output_filename=options.output_filename)
- print 'Generated file: %s' % output_filename
+ print 'Generated file: %s' % result['output_filename']
def main():
Modified: zopyx.convert2/branches/calibre-integration/src/zopyx/convert2/fop.py
===================================================================
--- zopyx.convert2/branches/calibre-integration/src/zopyx/convert2/fop.py 2009-09-05 12:39:21 UTC (rev 103591)
+++ zopyx.convert2/branches/calibre-integration/src/zopyx/convert2/fop.py 2009-09-05 12:52:28 UTC (rev 103592)
@@ -42,9 +42,12 @@
status, output = runcmd(cmd)
if status != 0:
raise RuntimeError('Error executing: %s' % cmd)
- return output_filename
+ return dict(output_filename=output_filename,
+ status=status,
+ output=output)
+
class HTML2PDF(BaseConverter):
name = 'pdf-fop'
@@ -58,9 +61,9 @@
def convert(self, output_filename=None, **options):
self.convert2FO(**options)
- return fo2pdf(self.fo_filename, output_filename)
+ result = fo2pdf(self.fo_filename, output_filename)
+ return result
fop_available = _check_fop()
from registry import registerConverter
-registerConverter(HTML2PDF)
Modified: zopyx.convert2/branches/calibre-integration/src/zopyx/convert2/prince.py
===================================================================
--- zopyx.convert2/branches/calibre-integration/src/zopyx/convert2/prince.py 2009-09-05 12:39:21 UTC (rev 103591)
+++ zopyx.convert2/branches/calibre-integration/src/zopyx/convert2/prince.py 2009-09-05 12:52:28 UTC (rev 103592)
@@ -44,7 +44,9 @@
status, output = runcmd(cmd)
if status != 0:
raise RuntimeError('Error executing: %s' % cmd)
- return output_filename
+ return dict(output_filename=output_filename,
+ status=status,
+ output=output)
class HTML2PDF(BaseConverter):
@@ -60,9 +62,9 @@
def convert(self, output_filename=None, **prince_options):
tidy_filename = tidyhtml(self.filename, self.encoding)
- output_filename = html2pdf(tidy_filename, output_filename, **prince_options)
+ result = html2pdf(tidy_filename, output_filename, **prince_options)
os.unlink(tidy_filename)
- return output_filename
+ return result
from registry import registerConverter
@@ -74,4 +76,4 @@
'disallow-copy' : None,
'disallow-modify' : None,
'owner-password' : 'foo1',
- 'user-password' : 'foo'})
+ 'user-password' : 'foo'})['output_filename']
Modified: zopyx.convert2/branches/calibre-integration/src/zopyx/convert2/xfc.py
===================================================================
--- zopyx.convert2/branches/calibre-integration/src/zopyx/convert2/xfc.py 2009-09-05 12:39:21 UTC (rev 103591)
+++ zopyx.convert2/branches/calibre-integration/src/zopyx/convert2/xfc.py 2009-09-05 12:52:28 UTC (rev 103592)
@@ -46,8 +46,11 @@
status, output = runcmd(cmd)
if status != 0:
raise RuntimeError('Error executing: %s' % cmd)
- return output_filename
+ return dict(output_filename=output_filename,
+ status=status,
+ output=output)
+
class RTFConverter(BaseConverter):
name = 'rtf-xfc'
Modified: zopyx.convert2/branches/calibre-integration/src/zopyx/convert2/xinc.py
===================================================================
--- zopyx.convert2/branches/calibre-integration/src/zopyx/convert2/xinc.py 2009-09-05 12:39:21 UTC (rev 103591)
+++ zopyx.convert2/branches/calibre-integration/src/zopyx/convert2/xinc.py 2009-09-05 12:52:28 UTC (rev 103592)
@@ -42,9 +42,13 @@
status, output = runcmd(cmd)
if status != 0:
raise RuntimeError('Error executing: %s' % cmd)
- return output_filename
+
+ return dict(output_filename=output_filename,
+ status=status,
+ output=output)
+
class HTML2PDF(BaseConverter):
name = 'pdf-xinc'
@@ -57,9 +61,9 @@
return xinc_available
def convert(self, output_filename=None, **options):
-
self.convert2FO(**options)
- return fo2pdf(self.fo_filename, output_filename)
+ result = fo2pdf(self.fo_filename, output_filename)
+ return result
xinc_available = _check_xinc()
More information about the checkins
mailing list