Mirror/Reticulum
1
0
Fork 0
mirror of https://github.com/markqvist/Reticulum.git synced 2026-07-24 08:48:10 -07:00
Code Issues Packages Projects Releases Wiki Activity

Cleaned up log/print consistency for listener/initiator modes in rncp

Browse Source
This commit is contained in:
Mark Qvist
2026-05-15 14:40:55 +02:00
parent 5667a0bbac
commit d5b64a4af3
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
RNS/Utilities/rncp.py
+8 -8
View File
@@ -163,11 +163,11 @@ def listen(configdir, identitypath = None, verbosity = 0, quietness = 0, allowed
except Exception as e: except Exception as e:
raise ValueError("Invalid destination entered. Check your input.") raise ValueError("Invalid destination entered. Check your input.")
except Exception as e: except Exception as e:
print(str(e)) RNS.log(f"Could not apply allowed identity: {e}", RNS.LOG_ERROR)
RNS.exit(1) RNS.exit(1)
if len(allowed_identity_hashes) < 1 and not disable_auth: if len(allowed_identity_hashes) < 1 and not disable_auth:
print("Warning: No allowed identities configured, rncp will not accept any files!") RNS.log("No allowed identities configured, rncp will not accept any files!", RNS.LOG_WARNING)
def fetch_request(path, data, request_id, link_id, remote_identity, requested_at): def fetch_request(path, data, request_id, link_id, remote_identity, requested_at):
global allow_fetch, fetch_jail, fetch_auto_compress global allow_fetch, fetch_jail, fetch_auto_compress
@@ -217,7 +217,7 @@ def listen(configdir, identitypath = None, verbosity = 0, quietness = 0, allowed
else: else:
destination.register_request_handler("fetch_file", response_generator=fetch_request, allow=RNS.Destination.ALLOW_LIST, allowed_list=allowed_identity_hashes) destination.register_request_handler("fetch_file", response_generator=fetch_request, allow=RNS.Destination.ALLOW_LIST, allowed_list=allowed_identity_hashes)
print("rncp listening on "+RNS.prettyhexrep(destination.hash)) RNS.log("rncp listening on "+RNS.prettyhexrep(destination.hash), RNS.LOG_INFO)
if announce >= 0: if announce >= 0:
def job(): def job():
@@ -271,15 +271,15 @@ def receive_resource_started(resource):
else: else:
id_str = "" id_str = ""
print("Starting resource transfer "+RNS.prettyhexrep(resource.hash)+id_str) RNS.log("Starting resource transfer "+RNS.prettyhexrep(resource.hash)+id_str, RNS.LOG_INFO)
def receive_resource_concluded(resource): def receive_resource_concluded(resource):
global save_path, allow_overwrite_on_receive global save_path, allow_overwrite_on_receive
if resource.status == RNS.Resource.COMPLETE: if resource.status == RNS.Resource.COMPLETE:
print(str(resource)+" completed") RNS.log(f"Incoming resource {resource} completed", RNS.LOG_INFO)
if resource.metadata == None: if resource.metadata == None:
print("Invalid data received, ignoring resource") RNS.log("Invalid data received, ignoring resource", RNS.LOG_WARNING)
return return
else: else:
@@ -306,14 +306,14 @@ def receive_resource_concluded(resource):
full_save_path = saved_filename+"."+str(counter) full_save_path = saved_filename+"."+str(counter)
shutil.move(resource.data.name, full_save_path) shutil.move(resource.data.name, full_save_path)
print("Saved received file to "+full_save_path) RNS.log("Saved received file to "+full_save_path, RNS.LOG_INFO)
except Exception as e: except Exception as e:
RNS.log(f"An error occurred while saving received resource: {e}", RNS.LOG_ERROR) RNS.log(f"An error occurred while saving received resource: {e}", RNS.LOG_ERROR)
return return
else: else:
print("Resource failed") RNS.log("Resource failed", RNS.LOG_INFO)
resource_done = False resource_done = False
current_resource = None current_resource = None