oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix error handling (was: unbound local variable)

Browse source
This commit is contained in:
caryoscelus 2023-07-24 10:29:25 +00:00
parent 62f14371bd
commit d924e9bb2e
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Site/SiteStorage.py
View file

@ -452,19 +452,21 @@ class SiteStorage(object):
bad_files.append(file_inner_path) bad_files.append(file_inner_path)
continue continue
error = None
if quick_check: if quick_check:
ok = os.path.getsize(file_path) == content["files"][file_relative_path]["size"] ok = os.path.getsize(file_path) == content["files"][file_relative_path]["size"]
if not ok: if not ok:
err = "Invalid size" error = "Invalid size"
else: else:
try: try:
ok = self.site.content_manager.verifyFile(file_inner_path, open(file_path, "rb")) ok = self.site.content_manager.verifyFile(file_inner_path, open(file_path, "rb"))
except Exception as err: except Exception as err:
error = err
ok = False ok = False
if not ok: if not ok:
back["num_file_invalid"] += 1 back["num_file_invalid"] += 1
self.log.debug("[INVALID] %s: %s" % (file_inner_path, err)) self.log.debug("[INVALID] %s: %s" % (file_inner_path, error))
if add_changed or content.get("cert_user_id"): # If updating own site only add changed user files if add_changed or content.get("cert_user_id"): # If updating own site only add changed user files
bad_files.append(file_inner_path) bad_files.append(file_inner_path)

5
src/main.py
View file

@ -272,18 +272,19 @@ class Actions(object):
for content_inner_path in site.content_manager.contents: for content_inner_path in site.content_manager.contents:
s = time.time() s = time.time()
logging.info("Verifing %s signature..." % content_inner_path) logging.info("Verifing %s signature..." % content_inner_path)
err = None error = None
try: try:
file_correct = site.content_manager.verifyFile( file_correct = site.content_manager.verifyFile(
content_inner_path, site.storage.open(content_inner_path, "rb"), ignore_same=False content_inner_path, site.storage.open(content_inner_path, "rb"), ignore_same=False
) )
except Exception as err: except Exception as err:
file_correct = False file_correct = False
error = err
if file_correct is True: if file_correct is True:
logging.info("[OK] %s (Done in %.3fs)" % (content_inner_path, time.time() - s)) logging.info("[OK] %s (Done in %.3fs)" % (content_inner_path, time.time() - s))
else: else:
logging.error("[ERROR] %s: invalid file: %s!" % (content_inner_path, err)) logging.error("[ERROR] %s: invalid file: %s!" % (content_inner_path, error))
input("Continue?") input("Continue?")
bad_files += content_inner_path bad_files += content_inner_path