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

test read_sizes and fixed finger repack

Browse Source
This commit is contained in:
Arturo Hernandez 2018-06-06 08:48:30 -04:00
parent 9157826077
commit 4bfbcf6b49
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
zk/base.py
View File

@ -576,11 +576,12 @@ class ZK(object):
response_size = 1024 response_size = 1024
cmd_response = self.__send_command(command,b'', response_size) cmd_response = self.__send_command(command,b'', response_size)
if cmd_response.get('status'): if cmd_response.get('status'):
if self.verbose: print(codecs.encode(self.__data,'hex'))
size = len(self.__data) size = len(self.__data)
if size == 80: if size == 80:
fields = unpack('iiiiiiiiiiiiiiiiiiii', self.__data) fields = unpack('iiiiiiiiiiiiiiiiiiii', self.__data)
else: #92? else: #92?
fields = unpack('iiiiiiiiiiiiiiiiiiiiiii', self.__data) fields = unpack('iiiiiiiiiiiiiiiiiiiiiii', self.__data[:92]) #dirty hack! we need more information
self.users = fields[4] self.users = fields[4]
self.fingers = fields[6] self.fingers = fields[6]
self.records = fields[8] self.records = fields[8]
@ -851,9 +852,16 @@ class ZK(object):
""" """
Delete specific template Delete specific template
for tcp via user_id: for tcp via user_id:
command = 134 # unknown?
command_string = pack('<24sB', user_id, temp_id)
""" """
if self.tcp and user_id:
command = 134 # unknown?
command_string = pack('<24sB', str(user_id), temp_id)
cmd_response = self.__send_command(command, command_string)
# users = list(filter(lambda x: x.uid==uid, users))
if cmd_response.get('status'):
return True #refres_data (1013)?
else:
return False # probably empty!
if not uid: if not uid:
users = self.get_users() users = self.get_users()
users = list(filter(lambda x: x.user_id==str(user_id), users)) users = list(filter(lambda x: x.user_id==str(user_id), users))
@ -896,6 +904,8 @@ class ZK(object):
if not cmd_response.get('status'): if not cmd_response.get('status'):
raise ZKErrorResponse("can't delete user") raise ZKErrorResponse("can't delete user")
self.refresh_data() self.refresh_data()
if uid == (self.next_uid - 1):
self.next_uid = uid # quick undo
def get_user_template(self, uid, temp_id=0, user_id=''): def get_user_template(self, uid, temp_id=0, user_id=''):
""" ZKFinger VX10.0 """ ZKFinger VX10.0

2
zk/finger.py
View File

@ -15,7 +15,7 @@ class Finger(object):
return pack("HHbb%is" % (self.size), self.size+6, self.uid, self.fid, self.valid, self.template) return pack("HHbb%is" % (self.size), self.size+6, self.uid, self.fid, self.valid, self.template)
def repack_only(self): #only template def repack_only(self): #only template
return pack("H%is" % (self.size), self.size+2, self.template) return pack("H%is" % (self.size), self.size, self.template)
def __eq__(self, other): def __eq__(self, other):
return self.__dict__ == other.__dict__ return self.__dict__ == other.__dict__