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

Reload book if set_path() fails for any reason

Browse Source
This commit is contained in:
Kovid Goyal 2019-11-05 10:11:01 +05:30
parent bc83a98ddf
commit c46a5f8127
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/calibre/gui2/viewer/ui.py
View File

@ -363,7 +363,7 @@ class EbookViewer(MainWindow):
else: else:
if DEBUG: if DEBUG:
print('Book prepared in {:.2f} seconds'.format(monotonic() - start_time)) print('Book prepared in {:.2f} seconds'.format(monotonic() - start_time))
self.book_prepared.emit(True, {'base': ans, 'pathtoebook': pathtoebook, 'open_at': open_at}) self.book_prepared.emit(True, {'base': ans, 'pathtoebook': pathtoebook, 'open_at': open_at, 'reloaded': reload_book})
def prepare_notify(self): def prepare_notify(self):
self.book_preparation_started.emit() self.book_preparation_started.emit()
@ -384,7 +384,13 @@ class EbookViewer(MainWindow):
self.loading_overlay.hide() self.loading_overlay.hide()
self.web_view.show_home_page() self.web_view.show_home_page()
return return
try:
set_book_path(data['base'], data['pathtoebook']) set_book_path(data['base'], data['pathtoebook'])
except Exception:
if data['reloaded']:
raise
self.load_ebook(data['pathtoebook'], open_at=data['open_at'], reload_book=True)
return
self.current_book_data = data self.current_book_data = data
self.current_book_data['annotations_map'] = defaultdict(list) self.current_book_data['annotations_map'] = defaultdict(list)
self.current_book_data['annotations_path_key'] = path_key(data['pathtoebook']) + '.json' self.current_book_data['annotations_path_key'] = path_key(data['pathtoebook']) + '.json'