solderpunk
/
AV-98
9
21
Fork 15
Code Issues 4 Pull Requests 4 Releases Wiki Activity

Don't choke on non gopher/gemini/http(s) links. Closes #18.

This commit is contained in:
Solderpunk 2020-06-09 22:13:42 +02:00
parent 44ee42ba8a
commit dfa1dd7fd0
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
av98.py
View File

@ -120,8 +120,6 @@ def fix_ipv6_url(url):
standard_ports = { standard_ports = {
"gemini": 1965, "gemini": 1965,
"gopher": 70, "gopher": 70,
"http": 80,
"https": 443,
} }
class GeminiItem(): class GeminiItem():
@ -134,7 +132,7 @@ class GeminiItem():
parsed = urllib.parse.urlparse(self.url) parsed = urllib.parse.urlparse(self.url)
self.scheme = parsed.scheme self.scheme = parsed.scheme
self.host = parsed.hostname self.host = parsed.hostname
self.port = parsed.port or standard_ports[self.scheme] self.port = parsed.port or standard_ports.get(self.scheme, 0)
self.path = parsed.path self.path = parsed.path
def root(self): def root(self):
@ -316,7 +314,7 @@ Gopher-to-Gemini proxy (such as a running Agena instance), in which case
you'll be able to transparently follow links to Gopherspace!""") you'll be able to transparently follow links to Gopherspace!""")
return return
elif gi.scheme not in ("gemini", "gopher"): elif gi.scheme not in ("gemini", "gopher"):
print("Sorry, no support for " + gi.scheme) print("Sorry, no support for {} links.".format(gi.scheme))
return return
# Obey permanent redirects # Obey permanent redirects
if gi.url in self.permanent_redirects: if gi.url in self.permanent_redirects: