dece/Bebop
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity

browser: minor fixes

Browse source
This commit is contained in:
dece 2021-02-18 01:41:14 +01:00
parent 34f7ef0a95
commit 8fdf23689d
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
bebop/browser.py
View file

@ -190,8 +190,8 @@ class Browser:
self.set_status_error(f"Certificate has been changed ({url}).") self.set_status_error(f"Certificate has been changed ({url}).")
# TODO propose the user ways to handle this. # TODO propose the user ways to handle this.
elif req.state == Request.STATE_CONNECTION_FAILED: elif req.state == Request.STATE_CONNECTION_FAILED:
error = f": {req.error}" if req.error else "" error = f": {req.error}" if req.error else "."
self.set_status_error(f"Connection failed ({url}){error}.") self.set_status_error(f"Connection failed ({url}){error}")
else: else:
self.set_status_error(f"Connection failed ({url}).") self.set_status_error(f"Connection failed ({url}).")
return return
@ -213,13 +213,13 @@ class Browser:
if response.code == 20: if response.code == 20:
self.load_page(response.content) self.load_page(response.content)
if self.current_url and history: if self.current_url and history:
self.history.append(self.current_url) self.history.push(self.current_url)
self.current_url = url self.current_url = url
self.set_status(url) self.set_status(url)
elif response.generic_code == 30 and response.meta: elif response.generic_code == 30 and response.meta:
self.open_url(response.meta, redirections=redirections + 1) self.open_url(response.meta, redirections=redirections + 1)
elif response.generic_code in (40, 50): elif response.generic_code in (40, 50):
error = f"Server error: {response.meta or Response.code.name}." error = f"Server error: {response.meta or Response.code.name}"
self.set_status_error(error) self.set_status_error(error)
elif response.generic_code == 10: elif response.generic_code == 10:
self.handle_input_request(url, response) self.handle_input_request(url, response)
@ -319,6 +319,8 @@ class Browser:
# Else, focus the command line to let the user input more digits. # Else, focus the command line to let the user input more digits.
validator = lambda ch: self._validate_link_digit(ch, links, max_digits) validator = lambda ch: self._validate_link_digit(ch, links, max_digits)
link_input = self.command_line.focus("&", validator, digit) link_input = self.command_line.focus("&", validator, digit)
if not link_input:
return
try: try:
link_id = int(link_input) link_id = int(link_input)
except ValueError as exc: except ValueError as exc: