cubetiq/pyztk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

broken responses on tcp

Browse Source
This commit is contained in:
Arturo Hernandez 2018-06-06 18:12:22 -04:00
parent 199aa96aeb
commit 8a5af7d447
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
zk/base.py
View File

@ -387,7 +387,7 @@ class ZK(object):
response_size = 1024 response_size = 1024
cmd_response = self.__send_command(command, command_string, response_size) cmd_response = self.__send_command(command, command_string, response_size)
if cmd_response.get('status'): if cmd_response.get('status'):
serialnumber = self.__data.split(b'=')[-1].split(b'\x00')[0] serialnumber = self.__data.split(b'=', 1)[-1].split(b'\x00')[0]
return serialnumber.decode() # string? return serialnumber.decode() # string?
else: else:
raise ZKErrorResponse("can't read serial number") raise ZKErrorResponse("can't read serial number")
@ -402,7 +402,7 @@ class ZK(object):
cmd_response = self.__send_command(command, command_string, response_size) cmd_response = self.__send_command(command, command_string, response_size)
if cmd_response.get('status'): if cmd_response.get('status'):
platform = self.__data.split(b'=')[-1].split(b'\x00')[0] platform = self.__data.split(b'=', 1)[-1].split(b'\x00')[0]
return platform.decode() return platform.decode()
else: else:
raise ZKErrorResponse("can't get platform") raise ZKErrorResponse("can't get platform")
@ -417,7 +417,7 @@ class ZK(object):
cmd_response = self.__send_command(command, command_string, response_size) cmd_response = self.__send_command(command, command_string, response_size)
if cmd_response.get('status'): if cmd_response.get('status'):
mac = self.__data.split(b'=')[-1].split(b'\x00')[0] mac = self.__data.split(b'=', 1)[-1].split(b'\x00')[0]
return mac.decode() return mac.decode()
else: else:
raise ZKErrorResponse("can't get mac") raise ZKErrorResponse("can't get mac")
@ -432,7 +432,7 @@ class ZK(object):
cmd_response = self.__send_command(command, command_string, response_size) cmd_response = self.__send_command(command, command_string, response_size)
if cmd_response.get('status'): if cmd_response.get('status'):
device = self.__data.split(b'=')[-1].split(b'\x00')[0] device = self.__data.split(b'=', 1)[-1].split(b'\x00')[0]
return device.decode() return device.decode()
else: else:
return "" #no name return "" #no name
@ -448,7 +448,7 @@ class ZK(object):
cmd_response = self.__send_command(command, command_string, response_size) cmd_response = self.__send_command(command, command_string, response_size)
if cmd_response.get('status'): if cmd_response.get('status'):
response = self.__data.split(b'=')[-1].split(b'\x00')[0] response = self.__data.split(b'=', 1)[-1].split(b'\x00')[0]
return int(response) if response else 0 return int(response) if response else 0
else: else:
return None return None
@ -463,7 +463,7 @@ class ZK(object):
cmd_response = self.__send_command(command, command_string, response_size) cmd_response = self.__send_command(command, command_string, response_size)
if cmd_response.get('status'): if cmd_response.get('status'):
response = self.__data.split(b'=')[-1].split(b'\x00')[0] response = self.__data.split(b'=', 1)[-1].split(b'\x00')[0]
return int(response) if response else 0 return int(response) if response else 0
else: else:
return None return None
@ -478,7 +478,7 @@ class ZK(object):
cmd_response = self.__send_command(command, command_string, response_size) cmd_response = self.__send_command(command, command_string, response_size)
if cmd_response.get('status'): if cmd_response.get('status'):
fmt = (self.__data.split(b'=')[-1].split(b'\x00')[0]) fmt = (self.__data.split(b'=', 1)[-1].split(b'\x00')[0])
#definitivo? seleccionar firmware aqui? #definitivo? seleccionar firmware aqui?
return int(fmt) if fmt else 0 return int(fmt) if fmt else 0
else: else:
@ -494,7 +494,7 @@ class ZK(object):
cmd_response = self.__send_command(command, command_string, response_size) cmd_response = self.__send_command(command, command_string, response_size)
if cmd_response.get('status'): if cmd_response.get('status'):
fmt = (self.__data.split(b'=')[-1].split(b'\x00')[0]) fmt = (self.__data.split(b'=', 1)[-1].split(b'\x00')[0])
#definitivo? seleccionar firmware aqui? #definitivo? seleccionar firmware aqui?
return int(fmt) if fmt else 0 return int(fmt) if fmt else 0
else: else:
@ -510,7 +510,7 @@ class ZK(object):
cmd_response = self.__send_command(command, command_string, response_size) cmd_response = self.__send_command(command, command_string, response_size)
if cmd_response.get('status'): if cmd_response.get('status'):
response = (self.__data.split(b'=')[-1].split(b'\x00')[0]) response = (self.__data.split(b'=', 1)[-1].split(b'\x00')[0])
#definitivo? seleccionar firmware aqui? #definitivo? seleccionar firmware aqui?
return int(response) if response else 0 return int(response) if response else 0
else: else:
@ -526,7 +526,7 @@ class ZK(object):
cmd_response = self.__send_command(command, command_string, response_size) cmd_response = self.__send_command(command, command_string, response_size)
if cmd_response.get('status'): if cmd_response.get('status'):
response = (self.__data.split(b'=')[-1].split(b'\x00')[0]) response = (self.__data.split(b'=', 1)[-1].split(b'\x00')[0])
#definitivo? seleccionar firmware aqui? #definitivo? seleccionar firmware aqui?
return int(response) if response else 0 return int(response) if response else 0
else: else:
@ -538,13 +538,13 @@ class ZK(object):
gate = b'' gate = b''
cmd_response = self.__send_command(const.CMD_OPTIONS_RRQ, b'IPAddress', 1024) cmd_response = self.__send_command(const.CMD_OPTIONS_RRQ, b'IPAddress', 1024)
if cmd_response.get('status'): if cmd_response.get('status'):
ip = (self.__data.split(b'=')[-1].split(b'\x00')[0]) ip = (self.__data.split(b'=', 1)[-1].split(b'\x00')[0])
cmd_response = self.__send_command(const.CMD_OPTIONS_RRQ, b'NetMask', 1024) cmd_response = self.__send_command(const.CMD_OPTIONS_RRQ, b'NetMask', 1024)
if cmd_response.get('status'): if cmd_response.get('status'):
mask = (self.__data.split(b'=')[-1].split(b'\x00')[0]) mask = (self.__data.split(b'=', 1)[-1].split(b'\x00')[0])
cmd_response = self.__send_command(const.CMD_OPTIONS_RRQ, b'GATEIPAddress', 1024) cmd_response = self.__send_command(const.CMD_OPTIONS_RRQ, b'GATEIPAddress', 1024)
if cmd_response.get('status'): if cmd_response.get('status'):
gate = (self.__data.split(b'=')[-1].split(b'\x00')[0]) gate = (self.__data.split(b'=', 1)[-1].split(b'\x00')[0])
return {'ip': ip.decode(), 'mask': mask.decode(), 'gateway': gate.decode()} return {'ip': ip.decode(), 'mask': mask.decode(), 'gateway': gate.decode()}
def get_pin_width(self): def get_pin_width(self):