user fprint api names instead of winbio

dbus_service/dbus-service

@@ -27,7 +27,7 @@ from validitysensor.sensor import sensor, RebootException
 from validitysensor.sid import sid_from_string
 from validitysensor.tls import tls
 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)
 
@@ -141,13 +141,14 @@ class Device(dbus.service.Object):
         logging.debug('In EnrollStart %s for %s' % (finger_name, user))
 
         # 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
-        generic_finger = '_'.join(finger_name.split('-')[1:]).upper()
-        winbio_name = 'WINBIO_ANSI_381_POS_' + hand + '_' + generic_finger
+        #generic_finger = '_'.join(finger_name.split('-')[1:]).upper()
+        #winbio_name = 'WINBIO_ANSI_381_POS_' + hand + '_' + generic_finger
 
         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):
             if e is not None:

validitysensor/db.py

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

validitysensor/fprint_constants.py

@@ -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