From 8f1690eff73f23535a182294560948988a0650da Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Wed, 5 Sep 2018 23:18:04 +0200 Subject: [PATCH] Move pdfjs error page to pdfjs.py --- qutebrowser/browser/pdfjs.py | 6 +++++- qutebrowser/browser/webkit/webpage.py | 7 +------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/qutebrowser/browser/pdfjs.py b/qutebrowser/browser/pdfjs.py index 5ce3d866e..379b30240 100644 --- a/qutebrowser/browser/pdfjs.py +++ b/qutebrowser/browser/pdfjs.py @@ -24,7 +24,7 @@ import os from PyQt5.QtCore import QUrl -from qutebrowser.utils import utils, javascript +from qutebrowser.utils import utils, javascript, jinja class PDFJSNotFound(Exception): @@ -49,6 +49,10 @@ def generate_pdfjs_page(url): Args: url: The url of the pdf as QUrl. """ + if not is_available(): + return jinja.render('no_pdfjs.html', + url=url.toDisplayString(), + title="PDF.js not found") viewer = get_pdfjs_res('web/viewer.html').decode('utf-8') script = _generate_pdfjs_script(url) html_page = viewer.replace('', diff --git a/qutebrowser/browser/webkit/webpage.py b/qutebrowser/browser/webkit/webpage.py index 4e0701329..90e56ec56 100644 --- a/qutebrowser/browser/webkit/webpage.py +++ b/qutebrowser/browser/webkit/webpage.py @@ -208,12 +208,7 @@ class BrowserPage(QWebPage): def _show_pdfjs(self, reply): """Show the reply with pdfjs.""" - try: - page = pdfjs.generate_pdfjs_page(reply.url()) - except pdfjs.PDFJSNotFound: - page = jinja.render('no_pdfjs.html', - url=reply.url().toDisplayString(), - title="PDF.js not found") + page = pdfjs.generate_pdfjs_page(reply.url()) self.mainFrame().setContent(page.encode('utf-8'), 'text/html', reply.url()) reply.deleteLater()