Mirrors/tuya-cloudcutter
2
0
Fork 0
mirror of https://github.com/tuya-cloudcutter/tuya-cloudcutter.git synced 2026-02-19 21:51:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Don't fail when failing to extract storage, as it isn't always needed, just print a message.

Browse Source
This commit is contained in:
Cossid
2025-12-08 20:46:54 -06:00
parent c2b105deb2
commit a9e84b6556
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
profile-building/extract_rtl8710bn.py
View File

@@ -25,18 +25,18 @@ def run(full_filename: str, process_inactive_app: bool = False):
f.seek(0) # Reset file pointer to beginning after split.
result = KVStorage.find_storage(f.read())
if not result:
raise ValueError("File doesn't contain known storage area")
raise ValueError("[!] File doesn't contain known storage area")
_, data = result
try:
kvs = KVStorage.decrypt_and_unpack(data)
except Exception:
raise RuntimeError("Couldn't unpack storage data - see program logs")
raise RuntimeError("[!] Couldn't unpack storage data - see program logs")
try:
storage = kvs.read_all_values_parsed()
except Exception:
raise RuntimeError("Couldn't parse storage data - see program logs")
raise RuntimeError("[!] Couldn't parse storage data - see program logs")
storage = json.dumps(storage, indent="\t")
with open(os.path.join(extract_folder_path, base_name + "_storage.json"), 'wb') as storageFile:
@@ -47,7 +47,6 @@ def run(full_filename: str, process_inactive_app: bool = False):
upkFile.write(json.dumps(json_data["user_param_key"], indent="\t").encode('utf-8'))
except Exception as ex:
print(ex)
raise ex
dirListing = os.listdir(extract_folder_path)

7
profile-building/extract_rtl8720cf.py
View File

@@ -25,18 +25,18 @@ def run(full_filename: str, process_inactive_app: bool = False):
f.seek(0) # Reset file pointer to beginning after split.
result = KVStorage.find_storage(f.read())
if not result:
raise ValueError("File doesn't contain known storage area")
raise ValueError("[!] File doesn't contain known storage area")
_, data = result
try:
kvs = KVStorage.decrypt_and_unpack(data)
except Exception:
raise RuntimeError("Couldn't unpack storage data - see program logs")
raise RuntimeError("[!] Couldn't unpack storage data - see program logs")
try:
storage = kvs.read_all_values_parsed()
except Exception:
raise RuntimeError("Couldn't parse storage data - see program logs")
raise RuntimeError("[!] Couldn't parse storage data - see program logs")
storage = json.dumps(storage, indent="\t")
with open(os.path.join(extract_folder_path, base_name + "_storage.json"), 'wb') as storageFile:
@@ -47,7 +47,6 @@ def run(full_filename: str, process_inactive_app: bool = False):
upkFile.write(json.dumps(json_data["user_param_key"], indent="\t").encode('utf-8'))
except Exception as ex:
print(ex)
raise ex
dirListing = os.listdir(extract_folder_path)