From 358a3bf54154e4f3648b20ce2c274d3cb6af358f Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 3 May 2017 08:32:31 +0530 Subject: [PATCH] A spot of refactoring --- src/calibre/gui2/actions/add.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/calibre/gui2/actions/add.py b/src/calibre/gui2/actions/add.py index c263495cdc..9b0da5d4e5 100644 --- a/src/calibre/gui2/actions/add.py +++ b/src/calibre/gui2/actions/add.py @@ -284,9 +284,7 @@ class AddAction(InterfaceAction): fmts = [pt.name] ids.append(db.import_book(mi, fmts)) tuple(map(os.remove, orig_fmts)) - self.gui.library_view.model().books_added(num) - self.gui.refresh_cover_browser() - self.gui.tags_view.recount() + self.refresh_gui(num) if ids: ids.reverse() self.gui.library_view.select_rows(ids) @@ -438,6 +436,13 @@ class AddAction(InterfaceAction): Adder(paths, db=None if to_device else self.gui.current_db, parent=self.gui, callback=partial(self._files_added, on_card=on_card), pool=self.gui.spare_pool()) + def refresh_gui(self, num, set_current_row=-1): + self.gui.library_view.model().books_added(num) + if set_current_row > -1: + self.gui.library_view.set_current_row(0) + self.gui.refresh_cover_browser() + self.gui.tags_view.recount() + def _files_added(self, adder, on_card=None): if adder.items: paths, infos, names = [], [], [] @@ -451,10 +456,7 @@ class AddAction(InterfaceAction): return if adder.number_of_books_added > 0: - self.gui.library_view.model().books_added(adder.number_of_books_added) - self.gui.library_view.set_current_row(0) - self.gui.refresh_cover_browser() - self.gui.tags_view.recount() + self.refresh_gui(adder.number_of_books_added, set_current_row=0) if adder.merged_books: merged = defaultdict(list)