Macintosh-HW/RASCSI
1
0
Fork 0
mirror of https://github.com/akuker/RASCSI.git synced 2024-09-11 18:56:58 +00:00
Code Issues Projects Releases Wiki Activity

Update RaCtlCmds methods to return JSON serializable results

Browse Source
This commit is contained in:
nucleogenic 2022-09-10 02:58:35 +01:00
parent 016a616b72
commit edf65a8768
No known key found for this signature in database
GPG Key ID: 04A5E4E319C4271D
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
python/common/src/rascsi/ractl_cmds.py
View File

@ -40,7 +40,7 @@ class RaCtlCmds:
version = (str(result.server_info.version_info.major_version) + "." + version = (str(result.server_info.version_info.major_version) + "." +
str(result.server_info.version_info.minor_version) + "." + str(result.server_info.version_info.minor_version) + "." +
str(result.server_info.version_info.patch_version)) str(result.server_info.version_info.patch_version))
log_levels = result.server_info.log_level_info.log_levels log_levels = list(result.server_info.log_level_info.log_levels)
current_log_level = result.server_info.log_level_info.current_log_level current_log_level = result.server_info.log_level_info.current_log_level
reserved_ids = list(result.server_info.reserved_ids_info.ids) reserved_ids = list(result.server_info.reserved_ids_info.ids)
image_dir = result.server_info.image_files_info.default_image_folder image_dir = result.server_info.image_files_info.default_image_folder
@ -113,7 +113,7 @@ class RaCtlCmds:
result = proto.PbResult() result = proto.PbResult()
result.ParseFromString(data) result.ParseFromString(data)
ifs = result.network_interfaces_info.name ifs = result.network_interfaces_info.name
return {"status": result.status, "ifs": ifs} return {"status": result.status, "ifs": list(ifs)}
def get_device_types(self): def get_device_types(self):
""" """
@ -140,7 +140,7 @@ class RaCtlCmds:
"removable": device.properties.removable, "removable": device.properties.removable,
"supports_file": device.properties.supports_file, "supports_file": device.properties.supports_file,
"params": params, "params": params,
"block_sizes": device.properties.block_sizes, "block_sizes": list(device.properties.block_sizes),
} }
return {"status": result.status, "device_types": device_types} return {"status": result.status, "device_types": device_types}
@ -394,7 +394,7 @@ class RaCtlCmds:
dpath = result.devices_info.devices[i].file.name dpath = result.devices_info.devices[i].file.name
dfile = dpath.replace(image_files_info["images_dir"] + "/", "") dfile = dpath.replace(image_files_info["images_dir"] + "/", "")
dparam = result.devices_info.devices[i].params dparam = dict(result.devices_info.devices[i].params)
dven = result.devices_info.devices[i].vendor dven = result.devices_info.devices[i].vendor
dprod = result.devices_info.devices[i].product dprod = result.devices_info.devices[i].product
drev = result.devices_info.devices[i].revision drev = result.devices_info.devices[i].revision