This commit is contained in:
Kovid Goyal 2013-08-23 20:01:38 +05:30
parent 7eb6bcaf39
commit ef3e011d96

View File

@ -71,10 +71,11 @@ class ConvertAction(InterfaceAction):
def auto_convert(self, book_ids, on_card, format):
previous = self.gui.library_view.currentIndex()
rows = [x.row() for x in \
rows = [x.row() for x in
self.gui.library_view.selectionModel().selectedRows()]
jobs, changed, bad = convert_single_ebook(self.gui, self.gui.library_view.model().db, book_ids, True, format)
if jobs == []: return
if jobs == []:
return
self.queue_convert_jobs(jobs, changed, bad, rows, previous,
self.book_auto_converted, extra_job_args=[on_card])
@ -92,16 +93,18 @@ class ConvertAction(InterfaceAction):
jobs, changed, bad = convert_single_ebook(self.gui,
self.gui.library_view.model().db, needed, True, of,
show_no_format_warning=False)
if not jobs: return
if not jobs:
return
self.queue_convert_jobs(jobs, changed, bad, list(needed), previous,
self.book_converted, rows_are_ids=True)
def auto_convert_mail(self, to, fmts, delete_from_library, book_ids, format, subject):
previous = self.gui.library_view.currentIndex()
rows = [x.row() for x in \
rows = [x.row() for x in
self.gui.library_view.selectionModel().selectedRows()]
jobs, changed, bad = convert_single_ebook(self.gui, self.gui.library_view.model().db, book_ids, True, format)
if jobs == []: return
if jobs == []:
return
self.queue_convert_jobs(jobs, changed, bad, rows, previous,
self.book_auto_converted_mail,
extra_job_args=[delete_from_library, to, fmts, subject])
@ -110,31 +113,34 @@ class ConvertAction(InterfaceAction):
previous = self.gui.library_view.currentIndex()
rows = [x.row() for x in self.gui.library_view.selectionModel().selectedRows()]
jobs, changed, bad = convert_single_ebook(self.gui, self.gui.library_view.model().db, book_ids, True, ofmt)
if jobs == []: return
if jobs == []:
return
self.queue_convert_jobs(jobs, changed, bad, rows, previous,
self.book_auto_converted_multiple_mail,
extra_job_args=[delete_from_library, data])
def auto_convert_news(self, book_ids, format):
previous = self.gui.library_view.currentIndex()
rows = [x.row() for x in \
rows = [x.row() for x in
self.gui.library_view.selectionModel().selectedRows()]
jobs, changed, bad = convert_single_ebook(self.gui, self.gui.library_view.model().db, book_ids, True, format)
if jobs == []: return
if jobs == []:
return
self.queue_convert_jobs(jobs, changed, bad, rows, previous,
self.book_auto_converted_news)
def auto_convert_catalogs(self, book_ids, format):
previous = self.gui.library_view.currentIndex()
rows = [x.row() for x in \
rows = [x.row() for x in
self.gui.library_view.selectionModel().selectedRows()]
jobs, changed, bad = convert_single_ebook(self.gui, self.gui.library_view.model().db, book_ids, True, format)
if jobs == []: return
if jobs == []:
return
self.queue_convert_jobs(jobs, changed, bad, rows, previous,
self.book_auto_converted_catalogs)
def get_books_for_conversion(self):
rows = [r.row() for r in \
rows = [r.row() for r in
self.gui.library_view.selectionModel().selectedRows()]
if not rows or len(rows) == 0:
d = error_dialog(self.gui, _('Cannot convert'),
@ -145,12 +151,13 @@ class ConvertAction(InterfaceAction):
def convert_ebook(self, checked, bulk=None):
book_ids = self.get_books_for_conversion()
if book_ids is None: return
if book_ids is None:
return
self.do_convert(book_ids, bulk=bulk)
def do_convert(self, book_ids, bulk=None):
previous = self.gui.library_view.currentIndex()
rows = [x.row() for x in \
rows = [x.row() for x in
self.gui.library_view.selectionModel().selectedRows()]
num = 0
if bulk or (bulk is None and len(book_ids) > 1):
@ -252,7 +259,7 @@ class ConvertAction(InterfaceAction):
with open(temp_files[-1].name, 'rb') as data:
db.add_format(book_id, fmt, data, index_is_id=True)
self.gui.status_bar.show_message(job.description + \
self.gui.status_bar.show_message(job.description +
(' completed'), 2000)
finally:
for f in temp_files: