Improve Performance
This commit is contained in:
parent
485de56f3b
commit
e15cbcbdd6
@ -10,69 +10,98 @@ from pynput.keyboard import Controller
|
|||||||
|
|
||||||
from card_reader import read_card
|
from card_reader import read_card
|
||||||
|
|
||||||
|
GET_UID = [0xFF, 0xCA, 0x00, 0x00, 0x00]
|
||||||
|
|
||||||
class NfcReaderService:
|
class NfcReaderService:
|
||||||
def __init__(self) -> None:
|
def __init__(self) -> None:
|
||||||
self._is_running = True
|
self._is_running = True
|
||||||
self._last_uid = None
|
self._last_uid = None
|
||||||
self._keyboard = Controller()
|
self._keyboard = Controller()
|
||||||
self._last_write = datetime(1900, 1, 1)
|
self._last_write = datetime.min
|
||||||
|
|
||||||
def run(self) -> None:
|
def run(self) -> None:
|
||||||
print("Reader ready.")
|
print("Reader ready.")
|
||||||
|
|
||||||
while self._is_running:
|
while self._is_running:
|
||||||
try:
|
try:
|
||||||
time.sleep(0.1)
|
self._poll_card()
|
||||||
card_request = CardRequest(timeout=None)
|
|
||||||
print("Waiting for card...")
|
except (KeyboardInterrupt, SystemExit):
|
||||||
|
self.stop()
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
print(f"[ERROR] Unexpected failure: {e}")
|
||||||
|
time.sleep(1)
|
||||||
|
|
||||||
|
def _poll_card(self) -> None:
|
||||||
|
card_request = CardRequest(timeout=1)
|
||||||
|
|
||||||
|
try:
|
||||||
card_service = card_request.waitforcard()
|
card_service = card_request.waitforcard()
|
||||||
|
except NoCardException:
|
||||||
|
self._last_uid = None
|
||||||
|
return
|
||||||
|
|
||||||
connection = card_service.connection
|
connection = card_service.connection
|
||||||
print("Connected to card!")
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
connection.connect(CardConnection.T1_protocol)
|
connection.connect(CardConnection.T1_protocol)
|
||||||
|
|
||||||
GET_UID = [0xFF, 0xCA, 0x00, 0x00, 0x00]
|
uid_hex = self._read_uid(connection)
|
||||||
|
if uid_hex is None:
|
||||||
|
return
|
||||||
|
|
||||||
|
# Card still present and unchanged -> ignore
|
||||||
|
if uid_hex == self._last_uid:
|
||||||
|
return
|
||||||
|
|
||||||
|
self._last_uid = uid_hex
|
||||||
|
|
||||||
|
self._handle_card(connection)
|
||||||
|
|
||||||
|
except (CardConnectionException, NoCardException) as e:
|
||||||
|
print(f"[CARD ERROR] {e}")
|
||||||
|
|
||||||
|
finally:
|
||||||
|
try:
|
||||||
|
connection.disconnect()
|
||||||
|
except Exception:
|
||||||
|
pass
|
||||||
|
|
||||||
|
def _read_uid(self, connection) -> Optional[str]:
|
||||||
uid, sw1, sw2 = connection.transmit(GET_UID)
|
uid, sw1, sw2 = connection.transmit(GET_UID)
|
||||||
|
|
||||||
if sw1 != 0x90:
|
if sw1 != 0x90:
|
||||||
raise CardConnectionException("UID read failed")
|
raise CardConnectionException("UID read failed")
|
||||||
|
|
||||||
uid_hex = toHexString(uid)
|
return toHexString(uid)
|
||||||
|
|
||||||
if uid_hex == self._last_uid:
|
|
||||||
connection.disconnect()
|
|
||||||
time.sleep(0.5)
|
|
||||||
self._last_uid = None
|
|
||||||
continue
|
|
||||||
|
|
||||||
self._last_uid = uid_hex
|
|
||||||
|
|
||||||
|
def _handle_card(self, connection) -> None:
|
||||||
user_id = read_card(connection)
|
user_id = read_card(connection)
|
||||||
if user_id is not None:
|
|
||||||
|
if user_id is None:
|
||||||
|
return
|
||||||
|
|
||||||
now = datetime.now()
|
now = datetime.now()
|
||||||
if now - self._last_write > timedelta(seconds=2):
|
|
||||||
self._keyboard.type(str(user_id))
|
# debounce keyboard output
|
||||||
|
if now - self._last_write < timedelta(seconds=2):
|
||||||
|
return
|
||||||
|
|
||||||
|
self._send_to_keyboard(user_id)
|
||||||
self._last_write = now
|
self._last_write = now
|
||||||
|
|
||||||
except (CardConnectionException, NoCardException):
|
def _send_to_keyboard(self, user_id: str) -> None:
|
||||||
pass
|
|
||||||
|
|
||||||
finally:
|
|
||||||
try:
|
try:
|
||||||
connection.disconnect()
|
self._keyboard.type(f"{user_id}\n")
|
||||||
except:
|
except Exception as e:
|
||||||
pass
|
print(f"[KEYBOARD ERROR] {e}")
|
||||||
|
|
||||||
time.sleep(0.5)
|
|
||||||
|
|
||||||
except (KeyboardInterrupt, SystemExit):
|
|
||||||
self.stop()
|
|
||||||
|
|
||||||
def stop(self) -> None:
|
def stop(self) -> None:
|
||||||
|
print("Stopping NFC service.")
|
||||||
self._is_running = False
|
self._is_running = False
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
service = NfcReaderService()
|
service = NfcReaderService()
|
||||||
service.run()
|
service.run()
|
||||||
Loading…
Reference in New Issue
Block a user