Git-Mirrors/Reticulum
1
0
Fork 0
mirror of https://github.com/markqvist/Reticulum.git synced 2025-05-06 16:35:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Implemented progress on resource initiator side. Made MDUs more obvious.

Browse source
This commit is contained in:
Mark Qvist 2020-04-28 20:50:57 +02:00
parent a9c4d0e78d
commit c9d1c938ff
7 changed files with 34 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

14
RNS/Resource.py
View file

@ -11,7 +11,7 @@ class Resource:
WINDOW_MAX = 7
WINDOW = 4
MAPHASH_LEN = 4
SDU = RNS.Reticulum.MTU - RNS.Packet.HEADER_MAXSIZE
SDU = RNS.Packet.MDU
RANDOM_HASH_SIZE = 4
# TODO: Should be allocated more
@ -89,6 +89,7 @@ class Resource:
self.hmu_retry_ok = False
self.watchdog_lock = False
self.__watchdog_job_id = 0
self.__progress_callback = progress_callback
self.rtt = None
if data != None:
@ -96,7 +97,8 @@ class Resource:
while not hashmap_ok:
self.initiator = True
self.callback = callback
self.progress_callback = progress_callback
# TODO: Remove
#self.progress_callback = progress_callback
self.random_hash = RNS.Identity.getRandomHash()[:Resource.RANDOM_HASH_SIZE]
self.uncompressed_data = data
self.compressed_data = bz2.compress(self.uncompressed_data)
@ -478,6 +480,9 @@ class Resource:
if self.sent_parts == len(self.parts):
self.status = Resource.AWAITING_PROOF
if self.__progress_callback != None:
self.__progress_callback(self)
def cancel(self):
if self.status < Resource.COMPLETE:
self.status = Resource.FAILED
@ -497,7 +502,10 @@ class Resource:
self.__progress_callback = callback
def progress(self):
progress = self.received_count / float(self.total_parts)
if self.initiator:
progress = self.sent_parts / len(self.parts)
else:
progress = self.received_count / float(self.total_parts)
return progress
def __str__(self):