Fix bug 2603: Default to preferred output format in bulk convert.

This commit is contained in:
John Schember 2009-06-14 12:01:35 -04:00
parent e12f0a39c3
commit c47396b072

View File

@ -95,14 +95,13 @@ class BulkConfig(Config):
self.stack.setCurrentIndex(idx) self.stack.setCurrentIndex(idx)
def setup_output_formats(self, db, preferred_output_format): def setup_output_formats(self, db, preferred_output_format):
available_formats = '' if preferred_output_format:
available_formats = set([x.lower() for x in preferred_output_format = preferred_output_format.lower()
available_formats.split(',')])
output_formats = sorted(available_output_formats()) output_formats = sorted(available_output_formats())
output_formats.remove('oeb') output_formats.remove('oeb')
preferred_output_format = preferred_output_format if \ preferred_output_format = preferred_output_format if \
preferred_output_format in output_formats else \ preferred_output_format and preferred_output_format \
sort_formats_by_preference(output_formats, in output_formats else sort_formats_by_preference(output_formats,
OUTPUT_FORMAT_PREFERENCES)[0] OUTPUT_FORMAT_PREFERENCES)[0]
self.output_formats.addItems(list(map(QString, [x.upper() for x in self.output_formats.addItems(list(map(QString, [x.upper() for x in
output_formats]))) output_formats])))