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

update function get_users

Browse Source
This commit is contained in:
Fanani M. Ihsan 2016-05-23 22:42:45 +07:00
parent 98ba866d1a
commit b94bf295b1
2 changed files with 58 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
test.py
View File

@ -8,14 +8,14 @@ zk = zk.ZK('192.168.1.201')
status, message = zk.connect() status, message = zk.connect()
if status: if status:
print 'Firmware Version: : {}'.format(zk.get_firmware_version()) print 'Firmware Version: : {}'.format(zk.get_firmware_version())
# users = zk.get_users() users = zk.get_users()
# if users: if users:
# for uid in users: for uid in users:
# if users[uid][2] == 14: if users[uid][2] == 14:
# level = 'Admin' level = 'Admin'
# else: else:
# level = 'User' level = 'User'
# print "[UID %d]: ID: %s, Name: %s, Level: %s, Password: %s" % ( uid, users[uid][0], users[uid][1], level, users[uid][3] ) print "[UID %d]: ID: %s, Name: %s, Level: %s, Password: %s" % ( uid, users[uid][0], users[uid][1], level, users[uid][3] )
print zk.disconnect() print zk.disconnect()
else: else:

98
zk/base.py
View File

@ -157,66 +157,68 @@ class ZK(object):
except Exception, e: except Exception, e:
return (False, e) return (False, e)
# def __get_size_user(self): def __get_size_user(self):
# """Checks a returned packet to see if it returned CMD_PREPARE_DATA, """Checks a returned packet to see if it returned CMD_PREPARE_DATA,
# indicating that data packets are to be sent indicating that data packets are to be sent
# Returns the amount of bytes that are going to be sent""" Returns the amount of bytes that are going to be sent"""
# response = self.__response response = self.__response
# if response == const.CMD_PREPARE_DATA: if response == const.CMD_PREPARE_DATA:
# size = unpack('I', self.__data_recv[8:12])[0] size = unpack('I', self.__data_recv[8:12])[0]
# return size return size
# else: else:
# return 0 return 0
# def get_users(self): def get_users(self):
# """Start a connection with the time clock""" command = const.CMD_USERTEMP_RRQ
# command = const.CMD_USERTEMP_RRQ command_string = chr(5)
# command_string = '\x05'
# chksum = 0
# buf = self.__create_header(command=command, chksum=chksum, session_id=self.__sesion_id, reply_id=self.__reply_id, command_string=command_string) try:
# self.__sending_packet(buf) buf = self.__create_header(command=command, session_id=self.__sesion_id, reply_id=self.__reply_id, command_string=command_string)
# try: self.__sending_packet(buf)
# bytes = self.__get_size_user() self.__receive_packet(1024)
# userdata = []
# while bytes > 0:
# data_recv, addr = self.__sock.recvfrom(1032)
# userdata.append(data_recv)
# bytes -= 1024
# self.__sock.recvfrom(8) bytes = self.__get_size_user()
userdata = []
# users = {} if bytes:
# if len(userdata) > 0: while bytes > 0:
# # The first 4 bytes don't seem to be related to the user data_recv, addr = self.__sock.recvfrom(1032)
# for x in xrange(len(userdata)): userdata.append(data_recv)
# if x > 0: bytes -= 1024
# userdata[x] = userdata[x][8:]
# userdata = ''.join(userdata) self.__receive_packet(8)
# userdata = userdata[11:]
# while len(userdata) > 72: users = {}
# uid, role, password, name, userid = unpack( '2s2s8s28sx31s', userdata.ljust(72)[:72]) if len(userdata) > 0:
# The first 4 bytes don't seem to be related to the user
for x in xrange(len(userdata)):
if x > 0:
userdata[x] = userdata[x][8:]
# uid = int( uid.encode("hex"), 16) userdata = ''.join(userdata)
# # Clean up some messy characters from the user name userdata = userdata[11:]
# password = password.split('\x00', 1)[0]
# password = unicode(password.strip('\x00|\x01\x10x'), errors='ignore')
# userid = unicode(userid.strip('\x00|\x01\x10x'), errors='ignore') while len(userdata) > 72:
uid, role, password, name, userid = unpack( '2s2s8s28sx31s', userdata.ljust(72)[:72])
# name = name.split('\x00', 1)[0] uid = int( uid.encode("hex"), 16)
# Clean up some messy characters from the user name
password = password.split('\x00', 1)[0]
password = unicode(password.strip('\x00|\x01\x10x'), errors='ignore')
# if not name: userid = unicode(userid.strip('\x00|\x01\x10x'), errors='ignore')
# name = uid
# users[uid] = (userid, name, int( role.encode("hex"), 16 ), password) name = name.split('\x00', 1)[0]
# userdata = userdata[72:] if not name:
name = uid
# return users users[uid] = (userid, name, int( role.encode("hex"), 16 ), password)
# except Exception, e:
# return (False, e) userdata = userdata[72:]
return users
except Exception, e:
return (False, e)