Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-31 14:33:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix search URL action not changing library if needed

Browse Source
This commit is contained in:
Kovid Goyal 2020-11-21 07:58:16 +05:30
parent 606bf90c13
commit 33dbbb2bee
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/calibre/gui2/ui.py
View File

@ -673,12 +673,7 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin, # {{{
def doit(): def doit():
self.library_view.select_rows((book_id,)) self.library_view.select_rows((book_id,))
if library_id != getattr(self.current_db.new_api, 'server_library_id', None): self.perform_url_action(library_id, library_path, doit)
self.library_moved(library_path)
QTimer.singleShot(0, doit)
else:
doit()
elif action == 'view-book': elif action == 'view-book':
parts = tuple(filter(None, path.split('/'))) parts = tuple(filter(None, path.split('/')))
if len(parts) != 3: if len(parts) != 3:
@ -701,12 +696,7 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin, # {{{
at = at[0] at = at[0]
view.view_format_by_id(book_id, fmt.upper(), open_at=at) view.view_format_by_id(book_id, fmt.upper(), open_at=at)
if library_id != getattr(self.current_db.new_api, 'server_library_id', None): self.perform_url_action(library_id, library_path, doit)
self.library_moved(library_path)
QTimer.singleShot(0, doit)
else:
doit()
elif action == 'search': elif action == 'search':
parts = tuple(filter(None, path.split('/'))) parts = tuple(filter(None, path.split('/')))
if len(parts) != 1: if len(parts) != 1:
@ -723,7 +713,17 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin, # {{{
if sq: if sq:
sq = sq[0] sq = sq[0]
sq = sq or '' sq = sq or ''
self.search.set_search_string(sq)
def doit():
self.search.set_search_string(sq)
self.perform_url_action(library_id, library_path, doit)
def perform_url_action(self, library_id, library_path, func):
if library_id != getattr(self.current_db.new_api, 'server_library_id', None):
self.library_moved(library_path)
QTimer.singleShot(0, func)
else:
func()
def message_from_another_instance(self, msg): def message_from_another_instance(self, msg):
if isinstance(msg, bytes): if isinstance(msg, bytes):