From 04d229da87168f00b000efb703412e9f4775c57f Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Wed, 25 Jan 2012 11:50:25 +0100 Subject: [PATCH 1/1] packager change --- librarian/packagers.py | 13 ++++++++++--- scripts/book2partner | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/librarian/packagers.py b/librarian/packagers.py index 36a7b60..ddfd7c8 100644 --- a/librarian/packagers.py +++ b/librarian/packagers.py @@ -75,7 +75,7 @@ class PrestigioPdfPackager(PdfPackager): flags = ('less-advertising',) -class VirtualoEpubPackager(Packager): +class VirtualoPackager(Packager): @staticmethod def utf_trunc(text, limit): """ truncates text to at most `limit' bytes in utf-8 """ @@ -133,9 +133,16 @@ class VirtualoEpubPackager(Packager): cover.VirtualoCover(info).save(os.path.join(outfile_dir, slug+'.jpg')) outfile = os.path.join(outfile_dir, '1.epub') outfile_sample = os.path.join(outfile_dir, '1.sample.epub') - doc.save_output_file(epub.transform(doc), + doc.save_output_file(doc.as_epub(), output_path=outfile) - doc.save_output_file(epub.transform(doc, sample=25), + doc.save_output_file(doc.as_epub(doc, sample=25), + output_path=outfile_sample) + outfile = os.path.join(outfile_dir, '1.mobi') + outfile_sample = os.path.join(outfile_dir, '1.sample.mobi') + doc.save_output_file(doc.as_mobi(cover=cover.VirtualoCover), + output_path=outfile) + doc.save_output_file( + doc.as_mobi(doc, cover=cover.VirtualoCover, sample=25), output_path=outfile_sample) except ParseError, e: print '%(file)s:%(name)s:%(message)s' % { diff --git a/scripts/book2partner b/scripts/book2partner index 0488273..4b84c2f 100755 --- a/scripts/book2partner +++ b/scripts/book2partner @@ -46,7 +46,7 @@ if __name__ == '__main__': if options.gandalf_pdf: packagers.GandalfPdfPackager.prepare(input_filenames, options.output_dir, options.verbose) if options.virtualo: - packagers.VirtualoEpubPackager.prepare(input_filenames, options.output_dir, options.verbose) + packagers.VirtualoPackager.prepare(input_filenames, options.output_dir, options.verbose) if options.prestigio: packagers.PrestigioEpubPackager.prepare(input_filenames, options.output_dir, options.verbose) if options.prestigio_pdf: -- 2.20.1