Fix response value check
These commands were not implemented like this before. At least on the camera i used for testing (RLC-411) the return value was always a list and the status code is an int.
This commit is contained in:
@@ -16,8 +16,8 @@ class DeviceAPIMixin:
|
|||||||
:return: bool
|
:return: bool
|
||||||
"""
|
"""
|
||||||
body = [{"cmd": "Format", "action": 0, "param": {"HddInfo": {"id": hdd_id}}}]
|
body = [{"cmd": "Format", "action": 0, "param": {"HddInfo": {"id": hdd_id}}}]
|
||||||
r_data = self._execute_command('Format', body)
|
r_data = self._execute_command('Format', body)[0]
|
||||||
if r_data["value"]["rspCode"] == "200":
|
if r_data["value"]["rspCode"] == 200:
|
||||||
return True
|
return True
|
||||||
print("Could not format HDD/SD. Camera responded with:", r_data["value"])
|
print("Could not format HDD/SD. Camera responded with:", r_data["value"])
|
||||||
return False
|
return False
|
||||||
|
|||||||
@@ -40,8 +40,8 @@ class DisplayAPIMixin:
|
|||||||
"osdTime": {"enable": osd_time_enabled, "pos": osd_time_pos}
|
"osdTime": {"enable": osd_time_enabled, "pos": osd_time_pos}
|
||||||
}
|
}
|
||||||
}}]
|
}}]
|
||||||
r_data = self._execute_command('SetOsd', body)
|
r_data = self._execute_command('SetOsd', body)[0]
|
||||||
if r_data["value"]["rspCode"] == "200":
|
if r_data["value"]["rspCode"] == 200:
|
||||||
return True
|
return True
|
||||||
print("Could not set OSD. Camera responded with status:", r_data["value"])
|
print("Could not set OSD. Camera responded with status:", r_data["value"])
|
||||||
return False
|
return False
|
||||||
|
|||||||
12
api/user.py
12
api/user.py
@@ -28,8 +28,8 @@ class UserAPIMixin:
|
|||||||
"""
|
"""
|
||||||
body = [{"cmd": "AddUser", "action": 0,
|
body = [{"cmd": "AddUser", "action": 0,
|
||||||
"param": {"User": {"userName": username, "password": password, "level": level}}}]
|
"param": {"User": {"userName": username, "password": password, "level": level}}}]
|
||||||
r_data = self._execute_command('AddUser', body)
|
r_data = self._execute_command('AddUser', body)[0]
|
||||||
if r_data["value"]["rspCode"] == "200":
|
if r_data["value"]["rspCode"] == 200:
|
||||||
return True
|
return True
|
||||||
print("Could not add user. Camera responded with:", r_data["value"])
|
print("Could not add user. Camera responded with:", r_data["value"])
|
||||||
return False
|
return False
|
||||||
@@ -42,8 +42,8 @@ class UserAPIMixin:
|
|||||||
:return: whether the user was modified successfully
|
:return: whether the user was modified successfully
|
||||||
"""
|
"""
|
||||||
body = [{"cmd": "ModifyUser", "action": 0, "param": {"User": {"userName": username, "password": password}}}]
|
body = [{"cmd": "ModifyUser", "action": 0, "param": {"User": {"userName": username, "password": password}}}]
|
||||||
r_data = self._execute_command('ModifyUser', body)
|
r_data = self._execute_command('ModifyUser', body)[0]
|
||||||
if r_data["value"]["rspCode"] == "200":
|
if r_data["value"]["rspCode"] == 200:
|
||||||
return True
|
return True
|
||||||
print("Could not modify user:", username, "\nCamera responded with:", r_data["value"])
|
print("Could not modify user:", username, "\nCamera responded with:", r_data["value"])
|
||||||
return False
|
return False
|
||||||
@@ -55,8 +55,8 @@ class UserAPIMixin:
|
|||||||
:return: whether the user was deleted successfully
|
:return: whether the user was deleted successfully
|
||||||
"""
|
"""
|
||||||
body = [{"cmd": "DelUser", "action": 0, "param": {"User": {"userName": username}}}]
|
body = [{"cmd": "DelUser", "action": 0, "param": {"User": {"userName": username}}}]
|
||||||
r_data = self._execute_command('DelUser', body)
|
r_data = self._execute_command('DelUser', body)[0]
|
||||||
if r_data["value"]["rspCode"] == "200":
|
if r_data["value"]["rspCode"] == 200:
|
||||||
return True
|
return True
|
||||||
print("Could not delete user:", username, "\nCamera responded with:", r_data["value"])
|
print("Could not delete user:", username, "\nCamera responded with:", r_data["value"])
|
||||||
return False
|
return False
|
||||||
|
|||||||
Reference in New Issue
Block a user