Git-Mirrors/NomadNet
1
0
Fork 0
mirror of https://github.com/markqvist/NomadNet.git synced 2025-02-09 11:58:30 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updated RNS API calls.

Browse Source
This commit is contained in:
Mark Qvist 2021-09-03 14:17:00 +02:00
parent 39c2db321f
commit b4d056e9ef
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
nomadnet/ui/textui/Browser.py
View File

@ -26,7 +26,7 @@ class BrowserFrame(urwid.Frame):
class Browser: class Browser:
DEFAULT_PATH = "/page/index.mu" DEFAULT_PATH = "/page/index.mu"
DEFAULT_TIMEOUT = 5 DEFAULT_TIMEOUT = 10
NO_PATH = 0x00 NO_PATH = 0x00
PATH_REQUESTED = 0x01 PATH_REQUESTED = 0x01
@ -331,8 +331,7 @@ class Browser:
data = None, data = None,
response_callback = self.response_received, response_callback = self.response_received,
failed_callback = self.request_failed, failed_callback = self.request_failed,
progress_callback = self.response_progressed, progress_callback = self.response_progressed
timeout = self.timeout
) )
if receipt: if receipt:
@ -400,7 +399,7 @@ class Browser:
def response_progressed(self, request_receipt): def response_progressed(self, request_receipt):
self.response_progress = request_receipt.progress self.response_progress = request_receipt.progress
self.response_time = request_receipt.response_time() self.response_time = request_receipt.get_response_time()
self.response_size = request_receipt.response_size self.response_size = request_receipt.response_size
self.response_transfer_size = request_receipt.response_transfer_size self.response_transfer_size = request_receipt.response_transfer_size
self.update_display() self.update_display()
@ -408,7 +407,11 @@ class Browser:
def status_text(self): def status_text(self):
if self.response_transfer_size != None: if self.response_transfer_size != None:
response_time_str = "{:.2f}".format(self.response_time) if self.response_time != None:
response_time_str = "{:.2f}".format(self.response_time)
else:
response_time_str = "None"
stats_string = " "+self.g["page"]+size_str(self.response_size) stats_string = " "+self.g["page"]+size_str(self.response_size)
stats_string += " "+self.g["arrow_d"]+size_str(self.response_transfer_size)+" in "+response_time_str stats_string += " "+self.g["arrow_d"]+size_str(self.response_transfer_size)+" in "+response_time_str
stats_string += "s "+self.g["speed"]+size_str(self.response_transfer_size/self.response_time, suffix="b")+"/s" stats_string += "s "+self.g["speed"]+size_str(self.response_transfer_size/self.response_time, suffix="b")+"/s"