Compare commits

...

2 Commits

Author SHA1 Message Date
Fierelier 110a1939a7 Bump version 2021-03-20 17:24:16 +01:00
Fierelier ebb20248cb Add redirect support 2021-03-20 17:23:38 +01:00
2 changed files with 15 additions and 4 deletions

View File

@ -33,7 +33,7 @@ os.chdir(sp)
distro = os.path.splitext(s.rsplit(os.path.sep)[-1])[0]
version = {
"major": 0,
"minor": 4,
"minor": 5,
"patch": 0,
"stage": "dev"
}
@ -140,6 +140,7 @@ class browserWindow(QMainWindow):
self.update()
start = time.time()
response = downloadPage(self.cUrlBar.text(),{"User-Agent": self.cUserAgent})
self.cUrlBar.setText(response["url"])
end = time.time()
print("Downloading page: " +str(end - start))

View File

@ -12,10 +12,20 @@ def downloadPage(url,headers = False):
"body": None,
"headers": []
}
request = urllib.request.Request(url,headers=headers)
requestHandler = None
class rdrh(urllib.request.HTTPRedirectHandler):
def redirect_request(self,req,fp,code,msg,hdrs,newurl):
response["url"] = newurl
return urllib.request.HTTPRedirectHandler.redirect_request(self, req, fp, code, msg, hdrs, newurl)
opener = urllib.request.build_opener(rdrh)
outHeaders = []
for header in headers:
outHeaders.append((header,headers[header]))
opener.addheaders = outHeaders
requestHandler = opener.open(url)
try:
requestHandler = urllib.request.urlopen(request)
response["headers"] = requestHandler.getheaders()
response["body"] = requestHandler.read()
except urllib.error.HTTPError as e: