From 1aba6365aa5c7feade50c0b185206b8029a4938e Mon Sep 17 00:00:00 2001 From: Matt Singleton Date: Mon, 7 Sep 2020 16:18:18 -0500 Subject: move redirect logic into gemini module --- browser.py | 35 ++--------------------------------- 1 file changed, 2 insertions(+), 33 deletions(-) (limited to 'browser.py') diff --git a/browser.py b/browser.py index 21e9293..16f1c29 100755 --- a/browser.py +++ b/browser.py @@ -11,8 +11,6 @@ class GViewport(QtWidgets.QTextBrowser): hoverUrlChanged = QtCore.Signal(str) def __init__(self, address_bar): - self._current_url = None - self._last_redirect = (QtCore.QUrl(), {}) self.address_bar = address_bar self._hover_url = None QtWidgets.QTextBrowser.__init__(self) @@ -20,49 +18,20 @@ class GViewport(QtWidgets.QTextBrowser): def mouseMoveEvent(self, event): cur = self.cursorForPosition(event.localPos().toPoint()) hover_url = cur.charFormat().anchorHref() - hover_url = gemini.urljoin(self._current_url, hover_url) + hover_url = gemini.urljoin(self.address_bar.text(), hover_url) if hover_url != self._hover_url: self._hover_url = hover_url self.hoverUrlChanged.emit(self._hover_url) return super().mouseMoveEvent(event) def loadResource(self, type_, url): - current_url = QtCore.QUrl(self._current_url) - if self._last_redirect[0].toString() == url.toString(): - gem = self._last_redirect[1] - else: - if not url.scheme(): - url.setScheme(current_url.scheme()) - if not url.host(): - url.setHost(current_url.host()) - if url.port() == -1: - url.setPort(1965) - if not url.path().startswith('/'): - url.setPath(current_url.path().rsplit('/', 1)[0] + '/' + url.path()) - gem = gemini.get(gemini.urljoin(current_url.toString(), url.toString())) + gem = gemini.get(url.toString()) if 'body' in gem: html = gemini.gem2html(gem['body']) else: html = '

{} {}

'.format(gem['status'], gem['meta']) - self._current_url = url.toString() return html - def setSource(self, url): - if url.scheme() != 'gemini': - return - gem = gemini.get(gemini.urljoin(self._current_url, url.toString())) - while gem['status'][0] == '3': - url = QtCore.QUrl(gem['meta']) - if url.port() == 1965: - url.setPort(-1) - print('redirect: {}'.format(url)) - gem = gemini.get(gemini.urljoin(self._current_url, url.toString())) - self._last_redirect = (url, gem) - if url.port() == 1965: - url.setPort(-1) - print('setSource: {}'.format(url)) - return super().setSource(url) - def setRawSource(self): return self.setSource(QtCore.QUrl(self.address_bar.text())) -- cgit v1.2.3