From 96527380c3913770fa56f2fef57e6a5ceee72879 Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Wed, 28 Aug 2024 21:21:38 +0200 Subject: [PATCH] Improved rncp progress status display --- RNS/Utilities/rncp.py | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/RNS/Utilities/rncp.py b/RNS/Utilities/rncp.py index bb6215d..fbfdcfa 100644 --- a/RNS/Utilities/rncp.py +++ b/RNS/Utilities/rncp.py @@ -493,7 +493,8 @@ def fetch(configdir, verbosity = 0, quietness = 0, destination = None, file = No if silent: print(str(file_path)+" copied to "+RNS.prettyhexrep(destination_hash)) else: - print("\r \r"+str(file)+" fetched from "+RNS.prettyhexrep(destination_hash)) + #print("\r \r"+str(file)+" fetched from "+RNS.prettyhexrep(destination_hash)) + print("\n"+str(file)+" fetched from "+RNS.prettyhexrep(destination_hash)) link.teardown() time.sleep(0.15) exit(0) @@ -648,15 +649,19 @@ def send(configdir, verbosity = 0, quietness = 0, destination = None, file = Non else: print("\r \rTransferring file ", end=" ") + def progress_update(i): + time.sleep(0.1) + prg = current_resource.get_progress() + percent = round(prg * 100.0, 1) + stat_str = str(percent)+"% - " + size_str(int(prg*current_resource.total_size)) + " of " + size_str(current_resource.total_size) + " - " +size_str(speed, "b")+"ps" + print("\r \rTransferring file "+syms[i]+" "+stat_str, end=" ") + sys.stdout.flush() + i = (i+1)%len(syms) + return i + while not resource_done: if not silent: - time.sleep(0.1) - prg = current_resource.get_progress() - percent = round(prg * 100.0, 1) - stat_str = str(percent)+"% - " + size_str(int(prg*current_resource.total_size)) + " of " + size_str(current_resource.total_size) + " - " +size_str(speed, "b")+"ps" - print("\r \rTransferring file "+syms[i]+" "+stat_str, end=" ") - sys.stdout.flush() - i = (i+1)%len(syms) + i = progress_update(i) if current_resource.status != RNS.Resource.COMPLETE: if silent: @@ -668,7 +673,8 @@ def send(configdir, verbosity = 0, quietness = 0, destination = None, file = Non if silent: print(str(file_path)+" copied to "+RNS.prettyhexrep(destination_hash)) else: - print("\r \r"+str(file_path)+" copied to "+RNS.prettyhexrep(destination_hash)) + # print("\r \r"+str(file_path)+" copied to "+RNS.prettyhexrep(destination_hash)) + print("\n"+str(file_path)+" copied to "+RNS.prettyhexrep(destination_hash)) link.teardown() time.sleep(0.25) real_file.close()