Skip to content

Commit 5ab3ff0

Browse files
author
Muhammad Fahri
committed
Update version v0.0.3
1 parent 68433d3 commit 5ab3ff0

File tree

6 files changed

+32
-28
lines changed

6 files changed

+32
-28
lines changed

‎lint.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
import os
2+
3+
os.system("flake8 src && mypy src")

‎readme.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,18 +41,18 @@ machine = Fingerprint('192.168.1.175', '80', '123456')
4141
print("Machine Status : "+machine.getStatus()) # connected | disconnected
4242

4343
# get all log data
44-
print(machine.getAttendance()); # return List of Attendance Log
44+
print(machine.getAttendance()) # return List of Attendance Log
4545

4646
# get all log data with date
47-
print(machine.getAttendance('all', '2022-05-01')); # return List of Attendance Log
47+
print(machine.getAttendance('all', '2022-05-01')) # return List of Attendance Log
4848

4949
# get all log data with date range
50-
print(machine.getAttendance('all', '2022-05-01', '2022-05-10')); # return List of Attendance Log
50+
print(machine.getAttendance('all', '2022-05-01', '2022-05-10')) # return List of Attendance Log
5151

5252
# get specific pin log data
53-
print(machine.getAttendance('1')); # return List of Attendance Log
53+
print(machine.getAttendance('1')) # return List of Attendance Log
5454
# OR List
55-
print(machine.getAttendance(['1', '2'])); # return List of Attendance Log
55+
print(machine.getAttendance(['1', '2'])) # return List of Attendance Log
5656

5757
```
5858

@@ -63,18 +63,18 @@ print(machine.getAttendance(['1', '2'])); # return List of Attendance Log
6363
from zksoap import Fingerprint
6464

6565
# initial
66-
machine = Fingerprint('192.168.1.175', '80', '123456');
66+
machine = Fingerprint('192.168.1.175', '80', '123456')
6767

6868
# get machine status
6969
print("Machine Status : "+machine.getStatus()) # connected | disconnected
7070

7171
# get all user data
72-
print(machine.getUserInfo()); # return List of User Info Data
72+
print(machine.getUserInfo()) # return List of User Info Data
7373

7474
# get specific pin user data
75-
print(machine.getUserInfo('1')); # return List of User Info Data
75+
print(machine.getUserInfo('1')) # return List of User Info Data
7676
# OR List
77-
print(machine.getUserInfo(['1', '2'])); # return List of User Info Data
77+
print(machine.getUserInfo(['1', '2'])) # return List of User Info Data
7878

7979
```
8080

‎setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
setuptools.setup(
77
name='zksoap',
8-
version='0.0.2',
8+
version='0.0.3',
99
author='Muhammad Fahri',
1010
author_email='[email protected]',
1111
long_description = long_description,

‎src/zksoap.egg-info/PKG-INFO

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Metadata-Version: 2.1
22
Name: zksoap
3-
Version: 0.0.2
3+
Version: 0.0.3
44
Author: Muhammad Fahri
55
Author-email: [email protected]
66
License: MIT
@@ -51,18 +51,18 @@ machine = Fingerprint('192.168.1.175', '80', '123456')
5151
print("Machine Status : "+machine.getStatus()) # connected | disconnected
5252

5353
# get all log data
54-
print(machine.getAttendance()); # return List of Attendance Log
54+
print(machine.getAttendance()) # return List of Attendance Log
5555

5656
# get all log data with date
57-
print(machine.getAttendance('all', '2022-05-01')); # return List of Attendance Log
57+
print(machine.getAttendance('all', '2022-05-01')) # return List of Attendance Log
5858

5959
# get all log data with date range
60-
print(machine.getAttendance('all', '2022-05-01', '2022-05-10')); # return List of Attendance Log
60+
print(machine.getAttendance('all', '2022-05-01', '2022-05-10')) # return List of Attendance Log
6161

6262
# get specific pin log data
63-
print(machine.getAttendance('1')); # return List of Attendance Log
63+
print(machine.getAttendance('1')) # return List of Attendance Log
6464
# OR List
65-
print(machine.getAttendance(['1', '2'])); # return List of Attendance Log
65+
print(machine.getAttendance(['1', '2'])) # return List of Attendance Log
6666

6767
```
6868

@@ -73,18 +73,18 @@ print(machine.getAttendance(['1', '2'])); # return List of Attendance Log
7373
from zksoap import Fingerprint
7474

7575
# initial
76-
machine = Fingerprint('192.168.1.175', '80', '123456');
76+
machine = Fingerprint('192.168.1.175', '80', '123456')
7777

7878
# get machine status
7979
print("Machine Status : "+machine.getStatus()) # connected | disconnected
8080

8181
# get all user data
82-
print(machine.getUserInfo()); # return List of User Info Data
82+
print(machine.getUserInfo()) # return List of User Info Data
8383

8484
# get specific pin user data
85-
print(machine.getUserInfo('1')); # return List of User Info Data
85+
print(machine.getUserInfo('1')) # return List of User Info Data
8686
# OR List
87-
print(machine.getUserInfo(['1', '2'])); # return List of User Info Data
87+
print(machine.getUserInfo(['1', '2'])) # return List of User Info Data
8888

8989
```
9090

‎src/zksoap/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
'UserInfo',
55
'UserAttendance',
66
'Fingerprint',
7-
]
7+
]

‎src/zksoap/fingerprint.py

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ class UserInfo:
1414
card: str
1515
pin2: str
1616

17+
1718
@dataclass
1819
class UserAttendance:
1920
pin: str
@@ -22,6 +23,7 @@ class UserAttendance:
2223
status: str
2324
workcode: str
2425

26+
2527
class Fingerprint(object):
2628

2729
payload = {
@@ -34,7 +36,6 @@ def __init__(self, ip: str, port: int = 80, comkey: str = '') -> None:
3436
self.__ip = ip
3537
self.__port = port if isinstance(port, int) else int(port)
3638
self.__comkey = comkey
37-
self.__conn = None
3839
self.connect()
3940

4041
def connect(self) -> None:
@@ -47,7 +48,7 @@ def connect(self) -> None:
4748
def getStatus(self) -> str:
4849
return 'connected' if self.__conn else 'disconnected'
4950

50-
def getUserInfo(self, pin: Union[str, list] = "all") -> Optional[list]:
51+
def getUserInfo(self, pin: Union[str, list] = "all") -> List[UserInfo]:
5152
self.connect()
5253
if isinstance(pin, list):
5354
listpin = ""
@@ -61,8 +62,8 @@ def getUserInfo(self, pin: Union[str, list] = "all") -> Optional[list]:
6162
{'key': "#PIN", 'value': pin}
6263
)
6364
data = self.__send(payload)
64-
if "<GetUserInfoResponse>" not in data:
65-
return None
65+
if data and "<GetUserInfoResponse>" not in data:
66+
return []
6667

6768
return self.__parseUserInfoData(data)
6869

@@ -188,7 +189,7 @@ def __parseAttendanceData(
188189
if date_start is not None and date_end is not None:
189190
DR = self.__dateRange(date_start, date_end)
190191

191-
dateCheck = dt.split(" ")[0];
192+
dateCheck = dt.split(" ")[0]
192193

193194
if dateCheck in DR:
194195
user = UserAttendance(
@@ -208,9 +209,9 @@ def __parseAttendanceData(
208209
workcode=workcode,
209210
)
210211
userData.append(user)
211-
return userData
212+
return userData
212213

213-
def __send(self, payload: bytes) -> Optional[str]:
214+
def __send(self, payload: bytes) -> str:
214215
self.__conn.sendall(payload) # type: ignore
215216
data = ''
216217
while True:

0 commit comments

Comments
 (0)