danvics/python-validity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

user fprint api names instead of winbio

Browse source
This commit is contained in:
baschi29 2022-04-20 22:09:05 +02:00
parent c94c243bce
commit 14df228ba6
No known key found for this signature in database
GPG key ID: 9EB0ABD4D51E8DFD
3 changed files with 25 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
dbus_service/dbus-service
View file

@ -27,7 +27,7 @@ from validitysensor.sensor import sensor, RebootException
from validitysensor.sid import sid_from_string from validitysensor.sid import sid_from_string
from validitysensor.tls import tls from validitysensor.tls import tls
from validitysensor.usb import usb from validitysensor.usb import usb
from validitysensor.winbio_constants import finger_ids from validitysensor.fprint_constants import finger_ids
dbus.mainloop.glib.DBusGMainLoop(set_as_default=True) dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
@ -141,13 +141,14 @@ class Device(dbus.service.Object):
logging.debug('In EnrollStart %s for %s' % (finger_name, user)) logging.debug('In EnrollStart %s for %s' % (finger_name, user))
# left-ring-finger => LH # left-ring-finger => LH
hand = 'LH' if finger_name[0] == 'l' else 'RH' #hand = 'LH' if finger_name[0] == 'l' else 'RH'
# left-ring-finger => RING_FINGER # left-ring-finger => RING_FINGER
generic_finger = '_'.join(finger_name.split('-')[1:]).upper() #generic_finger = '_'.join(finger_name.split('-')[1:]).upper()
winbio_name = 'WINBIO_ANSI_381_POS_' + hand + '_' + generic_finger #winbio_name = 'WINBIO_ANSI_381_POS_' + hand + '_' + generic_finger
usr = self.user2identity(user) usr = self.user2identity(user)
index = finger_ids.get(winbio_name, None) #index = finger_ids.get(winbio_name, None)
index = finger_ids.get(finger_name, None)
def update_cb(rsp, e): def update_cb(rsp, e):
if e is not None: if e is not None:

2
validitysensor/db.py
View file

@ -7,7 +7,7 @@ from .flash import call_cleanups
from .sid import SidIdentity, sid_from_bytes from .sid import SidIdentity, sid_from_bytes
from .tls import tls from .tls import tls
from .util import assert_status from .util import assert_status
from .winbio_constants import finger_names from .fprint_constants import finger_names
class UserStorage: class UserStorage:

18
validitysensor/fprint_constants.py Normal file
View file

@ -0,0 +1,18 @@
finger_ids = {
# https://fprint.freedesktop.org/fprintd-dev/Device.html#fingerprint-names
"right-thumb": 1,
"right-index-finger": 2,
"right-middle-finger": 3,
"right-ring-finger": 4,
"right-little-finger": 5,
"left-thumb": 6,
"left-index-finger": 7,
"left-middle-finger": 8,
"left-ring-finger": 9,
"left-little-finger": 10,
}
# Store the keys in the reverse order for faster lookups
finger_names = {}
for name, index in finger_ids.items():
finger_names[index] = name