Escl: Add SearchTimeout option

cyanfish · Dec 12, 2023 · ef64c48 · ef64c48
1 parent 962159b
commit ef64c48
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/NAPS2.Sdk/Scan/EsclOptions.cs b/NAPS2.Sdk/Scan/EsclOptions.cs
@@ -2,4 +2,8 @@
 
 public class EsclOptions
 {
+    /// <summary>
+    /// The maximum time (in ms) to search for ESCL devices when calling GetDevices or at the start of a scan.
+    /// </summary>
+    public int SearchTimeout { get; set; } = 5000;
 }
diff --git a/NAPS2.Sdk/Scan/Internal/Escl/EsclScanDriver.cs b/NAPS2.Sdk/Scan/Internal/Escl/EsclScanDriver.cs
@@ -56,7 +56,7 @@ public async Task GetDevices(ScanOptions options, CancellationToken cancelToken,
         locator.Start();
         try
         {
-            await Task.Delay(2000, cancelToken);
+            await Task.Delay(options.EsclOptions.SearchTimeout, cancelToken);
         }
         catch (TaskCanceledException)
         {
@@ -221,7 +221,7 @@ private static void VerifyStatus(EsclScannerStatus status, EsclScanSettings scan
                 foundTcs.TrySetResult(service);
             }
         });
-        Task.Delay(2000).ContinueWith(_ => foundTcs.TrySetResult(null)).AssertNoAwait();
+        Task.Delay(options.EsclOptions.SearchTimeout).ContinueWith(_ => foundTcs.TrySetResult(null)).AssertNoAwait();
         locator.Logger = _scanningContext.Logger;
         locator.Start();
         return await foundTcs.Task;