Merge pull request #130 from qalandarov/main

twostraws · Feb 23, 2024 · 9302aa1 · 9302aa1
2 parents 0af227c + 6124b72
commit 9302aa1
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/Sources/CodeScanner/CodeScanner.swift b/Sources/CodeScanner/CodeScanner.swift
@@ -53,8 +53,20 @@ public enum ScanMode {
     /// Keep scanning all codes until dismissed.
     case continuous
 
+    /// Keep scanning all codes - except the ones from the ignored list - until dismissed.
+    case continuousExcept(ignoredList: Set<String>)
+
     /// Scan only when capture button is tapped.
     case manual
+
+    var isManual: Bool {
+        switch self {
+        case .manual:
+            return true
+        case .once, .oncePerCode, .continuous, .continuousExcept:
+            return false
+        }
+    }
 }
 
 /// A SwiftUI view that is able to scan barcodes, QR codes, and more, and send back what was found.
@@ -114,7 +126,7 @@ public struct CodeScannerView: UIViewControllerRepresentable {
         uiViewController.updateViewController(
             isTorchOn: isTorchOn,
             isGalleryPresented: isGalleryPresented.wrappedValue,
-            isManualCapture: scanMode == .manual,
+            isManualCapture: scanMode.isManual,
             isManualSelect: manualSelect
         )
     }

diff --git a/Sources/CodeScanner/ScannerViewController.swift b/Sources/CodeScanner/ScannerViewController.swift
@@ -400,7 +400,7 @@ extension CodeScannerView {
         }
 
         public func readyManualCapture() {
-            guard parentView.scanMode == .manual else { return }
+            guard parentView.scanMode.isManual else { return }
             self.reset()
             lastTime = Date()
         }
@@ -465,6 +465,11 @@ extension CodeScannerView.ScannerViewController: AVCaptureMetadataOutputObjectsD
                     if isPastScanInterval() {
                         found(result)
                     }
+
+                case .continuousExcept(let ignoredList):
+                    if isPastScanInterval() && !ignoredList.contains(stringValue) {
+                        found(result)
+                    }
                 }
             }