From a569112e43cc7d719d7934de5148b17072898fd0 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 29 Jun 2007 02:55:21 +0000 Subject: [PATCH] Fix #113 again --- src/libprs500/ebooks/lrf/html/convert_from.py | 2 +- src/libprs500/ebooks/lrf/lit/convert_from.py | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/libprs500/ebooks/lrf/html/convert_from.py b/src/libprs500/ebooks/lrf/html/convert_from.py index 7d356712ed..eb8ec48a33 100644 --- a/src/libprs500/ebooks/lrf/html/convert_from.py +++ b/src/libprs500/ebooks/lrf/html/convert_from.py @@ -1143,7 +1143,7 @@ def process_file(path, options): im = PILImage.open(os.path.join(cwd, cpath)) cim = im.resize((options.profile.screen_width, options.profile.screen_height), - PILImage.BICUBIC) + PILImage.BICUBIC).convert('RGB') cf = PersistentTemporaryFile(prefix="html2lrf_", suffix=".jpg") cf.close() cim.save(cf.name) diff --git a/src/libprs500/ebooks/lrf/lit/convert_from.py b/src/libprs500/ebooks/lrf/lit/convert_from.py index 4c6d4608cc..e5498b734a 100644 --- a/src/libprs500/ebooks/lrf/lit/convert_from.py +++ b/src/libprs500/ebooks/lrf/lit/convert_from.py @@ -61,8 +61,16 @@ def main(): if not l: l = glob.glob(os.path.join(tdir, '*top*.htm*')) if not l: - raise ConversionError, 'Conversion of lit to html failed.' - htmlfile = l[0] + l = glob.glob(os.path.join(tdir, '*.htm*')) + if not l: + raise ConversionError, 'Conversion of lit to html failed. Cannot find html file.' + maxsize, htmlfile = 0, None + for c in l: + sz = os.path.getsize(c) + if sz > maxsize: + maxsize, htmlfile = sz, c + else: + htmlfile = l[0] for i in range(1, len(sys.argv)): if sys.argv[i] == args[0]: sys.argv.remove(sys.argv[i])