virtual-device: Make possible to use a script to perform enroll operations

2 files changed, 93 insertions, 1 deletions

diff --git a/libfprint/drivers/virtual-device.c b/libfprint/drivers/virtual-device.c
index 17c7786..af589b0 100644
--- a/libfprint/drivers/virtual-device.c
+++ b/libfprint/drivers/virtual-device.c
@@ -613,7 +613,11 @@ dev_enroll (FpDevice *dev)
           if (changed)
             {
               g_set_error (&error, FP_DEVICE_RETRY, FP_DEVICE_RETRY_GENERAL, "ID Mismatch");
-              fpi_device_enroll_progress (dev, self->enroll_stages_passed, NULL, error);
+              fpi_device_enroll_progress (dev, self->enroll_stages_passed, NULL,
+                                          g_steal_pointer (&error));
+
+              if (!should_wait_to_sleep (self, id, error))
+                self->sleep_timeout_id = g_idle_add (sleep_timeout_cb, self);
               return;
             }
         }
@@ -639,6 +643,10 @@ dev_enroll (FpDevice *dev)
           fpi_device_enroll_complete (dev, g_object_ref (print), NULL);
           self->enroll_stages_passed = 0;
         }
+      else if (!should_wait_to_sleep (self, id, error))
+        {
+          self->sleep_timeout_id = g_idle_add (sleep_timeout_cb, self);
+        }
     }
   else
     {
@@ -649,6 +657,9 @@ dev_enroll (FpDevice *dev)
       if (error && error->domain == FP_DEVICE_RETRY)
         {
           fpi_device_enroll_progress (dev, self->enroll_stages_passed, NULL, g_steal_pointer (&error));
+
+          if (!should_wait_to_sleep (self, id, error))
+            self->sleep_timeout_id = g_idle_add (sleep_timeout_cb, self);
         }
       else
         {
diff --git a/tests/virtual-device.py b/tests/virtual-device.py
index 414370b..0d27260 100644
--- a/tests/virtual-device.py
+++ b/tests/virtual-device.py
@@ -427,6 +427,87 @@ class VirtualDevice(VirtualDeviceBase):
             self.check_verify(FPrint.Print.new(self.dev),
                 FPrint.DeviceRetry.TOO_SHORT, match=False)
 
+    def test_enroll_script_interactive(self):
+        enrolled = None
+        def done_cb(dev, res):
+            nonlocal enrolled
+            try:
+                enrolled = dev.enroll_finish(res)
+            except Exception as e:
+                enrolled = e
+
+        enroll_stage = 0
+        enroll_progress_error = None
+        def progress_cb(dev, stage, pnt, data, error):
+            nonlocal enroll_stage, enroll_progress_error
+            enroll_stage = stage
+            enroll_progress_error = error
+
+        def wait_for_next_stage(expected):
+            nonlocal enroll_stage, enroll_progress_error
+            enroll_progress_error = None
+            next_stage = enroll_stage + 1
+            while enroll_stage < next_stage and not enroll_progress_error:
+                ctx.iteration(True)
+
+            if isinstance(expected, FPrint.DeviceRetry):
+                self.assertEqual(enroll_stage, next_stage - 1)
+                self.assertEqual(enroll_progress_error.code, int(expected))
+            else:
+                self.assertEqual(enroll_stage, expected)
+                self.assertIsNone(enroll_progress_error)
+            self.assertIsNone(enrolled)
+
+        self.send_sleep(50)
+        self.send_command('SCAN', 'print-id')
+        self.send_command('SCAN', 'print-id')
+        self.send_auto(FPrint.DeviceRetry.TOO_SHORT)
+        self.send_command('SCAN', 'print-id')
+        self.send_sleep(50)
+        self.send_command('SCAN', 'print-id')
+        self.send_auto(FPrint.DeviceRetry.CENTER_FINGER)
+        self.send_command('SCAN', 'another-id')
+        self.send_command('SCAN', 'print-id')
+
+        self.dev.enroll(FPrint.Print.new(self.dev), callback=done_cb,
+            progress_cb=progress_cb)
+
+        wait_for_next_stage(1)
+        wait_for_next_stage(2)
+        wait_for_next_stage(FPrint.DeviceRetry.TOO_SHORT)
+        wait_for_next_stage(3)
+        wait_for_next_stage(4)
+        wait_for_next_stage(FPrint.DeviceRetry.CENTER_FINGER)
+        wait_for_next_stage(FPrint.DeviceRetry.GENERAL)
+        wait_for_next_stage(5)
+
+        while not enrolled:
+            ctx.iteration(True)
+
+        self.assertEqual(enrolled.get_driver(), self.dev.get_driver())
+
+    def test_enroll_script(self):
+        self.send_command('SET_ENROLL_STAGES', 8)
+        self.send_command('SCAN', 'print-id')
+        self.send_command('SCAN', 'print-id')
+        self.send_auto(FPrint.DeviceRetry.TOO_SHORT)
+        self.send_command('SCAN', 'print-id')
+        self.send_auto(FPrint.DeviceRetry.REMOVE_FINGER)
+        self.send_command('SCAN', 'print-id')
+        self.send_auto(FPrint.DeviceRetry.CENTER_FINGER)
+        self.send_command('SCAN', 'print-id')
+        self.send_sleep(10)
+        self.send_sleep(20)
+        self.send_auto(FPrint.DeviceRetry.GENERAL)
+        self.send_auto(FPrint.DeviceRetry.REMOVE_FINGER)
+        self.send_command('SCAN', 'print-id')
+        self.send_command('SCAN', 'another-id')
+        self.send_command('SCAN', 'print-id')
+        self.send_command('SCAN', 'print-id')
+
+        enrolled = self.dev.enroll_sync(FPrint.Print.new(self.dev))
+        self.assertEqual(enrolled.get_driver(), self.dev.get_driver())
+
     def test_finger_status(self):
         self.start_verify(FPrint.Print.new(self.dev),
             identify=self.dev.supports_identify())