William/Reticulum
1
0
Fork 0
mirror of https://github.com/markqvist/Reticulum.git synced 2024-11-26 15:30:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 2f0199a739 into b15bd19de5

Browse Source
This commit is contained in:
faragher 2023-12-30 22:03:39 +01:00 committed by GitHub
commit 49a8d2ef41
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
RNS/Utilities/rnodeconf.py
View File

@ -1045,6 +1045,35 @@ def ensure_firmware_file(fw_filename):
try: try:
if selected_hash == None: if selected_hash == None:
if not os.path.isfile(UPD_DIR+"/"+selected_version+"/"+fw_filename+".version"):
RNS.log("No hash file found for "+fw_filename+" version "+selected_version)
if not upd_nocheck:
try:
RNS.log("Retrieving hash...")
selected_firmware_version_url = "broken" #"https://unsigned.io/firmware/latest/?v="+selected_version+"&variant="+fw_filename
fallback_selected_version_url = "https://github.com/markqvist/rnode_firmware/releases/download/"+selected_version+"/release.json"
urlretrieve(selected_firmware_version_url, UPD_DIR+"/"+selected_version+"/"+fw_filename+".version")
except Exception as e:
RNS.log("")
RNS.log("WARNING!")
RNS.log("Failed to retrieve latest version hash for your board from the default server")
RNS.log("Will retry using the following fallback URL: "+fallback_selected_version_url)
RNS.log("This is currently expected.")
RNS.log("")
RNS.log("Hit enter if you want to proceed")
input()
try:
urlretrieve(fallback_selected_version_url, UPD_DIR+"/fallback_release_info.json")
import json
with open(UPD_DIR+"/fallback_release_info.json", "rb") as rif:
rdat = json.loads(rif.read())
variant = rdat[fw_filename]
with open(UPD_DIR+"/"+selected_version+"/"+fw_filename+".version", "wb") as verf:
inf_str = str(variant["version"])+" "+str(variant["hash"])
verf.write(inf_str.encode("utf-8"))
except Exception as e:
RNS.log("Error while trying fallback URL: "+str(e))
raise e
try: try:
file = open(UPD_DIR+"/"+selected_version+"/"+fw_filename+".version", "rb") file = open(UPD_DIR+"/"+selected_version+"/"+fw_filename+".version", "rb")
release_info = file.read().decode("utf-8").strip() release_info = file.read().decode("utf-8").strip()