muehe/onefinity-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

modifying json

Browse Source
This commit is contained in:
sanjayk03-dev
2024-06-08 01:08:16 +05:30
parent 96e965fda9
commit 54c291ee37
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/py/bbctrl/FileHandler.py
View File

@@ -93,7 +93,6 @@ class FileHandler(bbctrl.APIHandler):
else: else:
filename = self.get_upload(self.uploadFilename).encode('utf8') filename = self.get_upload(self.uploadFilename).encode('utf8')
safe_remove(filename) safe_remove(filename)
self.get_log('FileHandler').info('uploadFile.name ' + self.uploadFile.name)
os.link(self.uploadFile.name, filename) os.link(self.uploadFile.name, filename)
self.uploadFile.close() self.uploadFile.close()

11
src/py/bbctrl/Web.py
View File

@@ -326,7 +326,16 @@ class ConfigRestoreHandler(bbctrl.APIHandler):
if file =="config.json": if file =="config.json":
with open(file_path, 'r') as json_file: with open(file_path, 'r') as json_file:
json_data = json.load(json_file) json_data = json.load(json_file)
json_data["macros_list"] = [{"file_name": item["file_name"]} for item in json_data["gcode_list"]]
if "macros" in json_data and isinstance(json_data['macros'], list):
json_data["macros_list"] = [
{"file_name": item["file_name"]}
for item in json_data["macros"]
if isinstance(item, dict) and "file_name" in item
]
else:
json_data["macros_list"] = []
keys_to_remove = ['non_macros_list','gcode_list'] keys_to_remove = ['non_macros_list','gcode_list']
for key in keys_to_remove: for key in keys_to_remove:
if key in json_data: if key in json_data: