From c47396b0726cc22cbecf51a2b9eed3aadabf7b36 Mon Sep 17 00:00:00 2001 From: John Schember Date: Sun, 14 Jun 2009 12:01:35 -0400 Subject: [PATCH] Fix bug 2603: Default to preferred output format in bulk convert. --- src/calibre/gui2/convert/bulk.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/calibre/gui2/convert/bulk.py b/src/calibre/gui2/convert/bulk.py index 23336037a1..0b48f2521b 100644 --- a/src/calibre/gui2/convert/bulk.py +++ b/src/calibre/gui2/convert/bulk.py @@ -95,14 +95,13 @@ class BulkConfig(Config): self.stack.setCurrentIndex(idx) def setup_output_formats(self, db, preferred_output_format): - available_formats = '' - available_formats = set([x.lower() for x in - available_formats.split(',')]) + if preferred_output_format: + preferred_output_format = preferred_output_format.lower() output_formats = sorted(available_output_formats()) output_formats.remove('oeb') preferred_output_format = preferred_output_format if \ - preferred_output_format in output_formats else \ - sort_formats_by_preference(output_formats, + preferred_output_format and preferred_output_format \ + in output_formats else sort_formats_by_preference(output_formats, OUTPUT_FORMAT_PREFERENCES)[0] self.output_formats.addItems(list(map(QString, [x.upper() for x in output_formats])))