From 4f0dc1d8c7d968feb31c33eec2371d32009cb7f3 Mon Sep 17 00:00:00 2001 From: John Schember Date: Fri, 15 May 2009 18:47:25 -0400 Subject: [PATCH] Auto convert work --- src/calibre/gui2/device.py | 7 ++++--- src/calibre/gui2/main.py | 8 ++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/calibre/gui2/device.py b/src/calibre/gui2/device.py index b58f90daf6..005e278552 100644 --- a/src/calibre/gui2/device.py +++ b/src/calibre/gui2/device.py @@ -493,6 +493,7 @@ class DeviceGUI(object): return files, _auto_ids = self.library_view.model().get_preferred_formats_from_ids(ids, fmts, paths=True, set_metadata=True, + specific_format=specific_format, exclude_auto=do_auto_convert) if do_auto_convert: ids = list(set(ids).difference(_auto_ids)) @@ -563,9 +564,9 @@ class DeviceGUI(object): autos = [self.library_view.model().db.title(id, index_is_id=True) for id in auto] autos = '\n'.join('%s'%i for i in autos) info_dialog(self, _('No suitable formats'), - _('Auto converting the following books before uploading to ' - 'the device:'), det_msg=autos, show=True) - self.auto_convert_mail(to, delete_from_library, auto, format) + _('Auto converting the following books before sending via ' + 'email:'), det_msg=autos, show=True) + self.auto_convert_mail(to, fmts, delete_from_library, auto, format) if bad: bad = '\n'.join('%s'%(i,) for i in bad) diff --git a/src/calibre/gui2/main.py b/src/calibre/gui2/main.py index 93a8cfc20a..f50bffbb76 100644 --- a/src/calibre/gui2/main.py +++ b/src/calibre/gui2/main.py @@ -1062,7 +1062,7 @@ class Main(MainWindow, Ui_MainWindow, DeviceGUI): current = self.library_view.currentIndex() self.library_view.model().current_changed(current, previous) - def auto_convert_mail(self, to, delete_from_library, book_ids, format): + def auto_convert_mail(self, to, fmts, delete_from_library, book_ids, format): previous = self.library_view.currentIndex() rows = [x.row() for x in \ self.library_view.selectionModel().selectedRows()] @@ -1073,7 +1073,7 @@ class Main(MainWindow, Ui_MainWindow, DeviceGUI): job = self.job_manager.run_job(Dispatcher(self.book_auto_converted_mail), func, args=args, description=desc) self.conversion_jobs[job] = (temp_files, fmt, id, - delete_from_library, to) + delete_from_library, to, fmts) if changed: self.library_view.model().refresh_rows(rows) @@ -1152,7 +1152,7 @@ class Main(MainWindow, Ui_MainWindow, DeviceGUI): self.sync_to_device(on_card, False, specific_format=fmt, send_ids=[book_id], do_auto_convert=False) def book_auto_converted_mail(self, job): - temp_files, fmt, book_id, delete_from_library, to = self.conversion_jobs.pop(job) + temp_files, fmt, book_id, delete_from_library, to, fmts = self.conversion_jobs.pop(job) try: if job.failed: self.job_exception(job) @@ -1173,7 +1173,7 @@ class Main(MainWindow, Ui_MainWindow, DeviceGUI): current = self.library_view.currentIndex() self.library_view.model().current_changed(current, QModelIndex()) - self.send_by_mail(to, fmt, delete_from_library, send_ids=[book_id], do_auto_convert=False) + self.send_by_mail(to, fmts, delete_from_library, specific_format=fmt, send_ids=[book_id], do_auto_convert=False) def book_converted(self, job): temp_files, fmt, book_id = self.conversion_jobs.pop(job)