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

Viewer: Show nicer error message for DRMed books

Browse Source 
Fixes #1847468 [Error when reading DRM protected file from amazon](https://bugs.launchpad.net/calibre/+bug/1847468)
This commit is contained in:
Kovid Goyal 2019-10-09 16:26:38 +05:30
parent be146674de
commit 7b1e665186
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,6 +19,7 @@ from PyQt5.Qt import (
from calibre import prints from calibre import prints
from calibre.customize.ui import available_input_formats from calibre.customize.ui import available_input_formats
from calibre.gui2 import choose_files, error_dialog from calibre.gui2 import choose_files, error_dialog
from calibre.gui2.dialogs.drm_error import DRMErrorMessage
from calibre.gui2.image_popup import ImagePopup from calibre.gui2.image_popup import ImagePopup
from calibre.gui2.main_window import MainWindow from calibre.gui2.main_window import MainWindow
from calibre.gui2.viewer.annotations import ( from calibre.gui2.viewer.annotations import (
@ -320,9 +321,14 @@ class EbookViewer(MainWindow):
open_at, self.pending_open_at = self.pending_open_at, None open_at, self.pending_open_at = self.pending_open_at, None
if not ok: if not ok:
self.setWindowTitle(self.base_window_title) self.setWindowTitle(self.base_window_title)
error_dialog(self, _('Loading book failed'), _( tb = data['tb']
'Failed to open the book at {0}. Click "Show details" for more info.').format(data['pathtoebook']), last_line = tuple(tb.strip().splitlines())[-1]
det_msg=data['tb'], show=True) if last_line.startswith('calibre.ebooks.DRMError'):
DRMErrorMessage(self).exec_()
else:
error_dialog(self, _('Loading book failed'), _(
'Failed to open the book at {0}. Click "Show details" for more info.').format(data['pathtoebook']),
det_msg=data['tb'], show=True)
self.web_view.show_home_page() self.web_view.show_home_page()
return return
set_book_path(data['base'], data['pathtoebook']) set_book_path(data['base'], data['pathtoebook'])