From bbcb87e434d547cf8b801d76955ee93af4c5546c Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Thu, 6 Sep 2018 00:57:14 +0200 Subject: [PATCH] Get PDF.js to work We need to use the /web/viewer.html path so relative references are correct. --- qutebrowser/browser/pdfjs.py | 2 +- qutebrowser/browser/qutescheme.py | 2 +- tests/unit/browser/test_pdfjs.py | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/qutebrowser/browser/pdfjs.py b/qutebrowser/browser/pdfjs.py index fe38121d9..79ec69ac8 100644 --- a/qutebrowser/browser/pdfjs.py +++ b/qutebrowser/browser/pdfjs.py @@ -214,7 +214,7 @@ def should_use_pdfjs(mimetype): def get_main_url(filename): """Get the URL to be opened to view a local PDF.""" - url = QUrl('qute://pdfjs/') + url = QUrl('qute://pdfjs/web/viewer.html') file_url = QUrl('qute://pdfjs/file') file_url_query = QUrlQuery() diff --git a/qutebrowser/browser/qutescheme.py b/qutebrowser/browser/qutescheme.py index 388c02494..135089d11 100644 --- a/qutebrowser/browser/qutescheme.py +++ b/qutebrowser/browser/qutescheme.py @@ -533,7 +533,7 @@ def qute_pdfjs(url): mimetype = 'application/octet-stream' return mimetype, data - if url.path() == '/': + if url.path() == '/web/viewer.html': filepath = QUrlQuery(url).queryItemValue("file") data = pdfjs.generate_pdfjs_page(QUrl.fromLocalFile(filepath)) return 'text/html', data diff --git a/tests/unit/browser/test_pdfjs.py b/tests/unit/browser/test_pdfjs.py index 20d91ab9c..a33dae5bf 100644 --- a/tests/unit/browser/test_pdfjs.py +++ b/tests/unit/browser/test_pdfjs.py @@ -17,7 +17,10 @@ # You should have received a copy of the GNU General Public License # along with qutebrowser. If not, see . +import textwrap + import pytest +from PyQt5.QtCore import QUrl from qutebrowser.browser import pdfjs