wip

romanmazeev · Dec 1, 2023 · ebcc9ee · ebcc9ee
1 parent b1847c3
commit ebcc9ee
Show file tree

Hide file tree

Showing 32 changed files with 552 additions and 509 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.github/.DS_Store b/.github/.DS_Store
diff --git a/.github/workflows/.DS_Store b/.github/workflows/.DS_Store
diff --git a/.gitignore b/.gitignore
@@ -88,3 +88,6 @@ fastlane/test_output
 # https://github.com/johnno1962/injectionforxcode
 
 iOSInjectionProject/
+
+# OS X Finder
+.DS_Store
diff --git a/Docs/.DS_Store b/Docs/.DS_Store
diff --git a/Example/.DS_Store b/Example/.DS_Store
diff --git a/...ple/MRZScannerExample.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/...ple/MRZScannerExample.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,13 +1,67 @@
 {
   "pins" : [
+    {
+      "identity" : "combine-schedulers",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/pointfreeco/combine-schedulers",
+      "state" : {
+        "revision" : "9dc9cbe4bc45c65164fa653a563d8d8db61b09bb",
+        "version" : "1.0.0"
+      }
+    },
     {
       "identity" : "mrzparser",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/romanmazeev/MRZParser.git",
       "state" : {
-        "revision" : "2c1c4809379f081c01297f0ac92df2e94c6db54a",
+        "revision" : "d6d24fa2f9d1eac229bba8ffdf812e715690338d",
         "version" : "1.1.3"
       }
+    },
+    {
+      "identity" : "swift-clocks",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/pointfreeco/swift-clocks",
+      "state" : {
+        "revision" : "d1fd837326aa719bee979bdde1f53cd5797443eb",
+        "version" : "1.0.0"
+      }
+    },
+    {
+      "identity" : "swift-concurrency-extras",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/pointfreeco/swift-concurrency-extras.git",
+      "state" : {
+        "revision" : "bb5059bde9022d69ac516803f4f227d8ac967f71",
+        "version" : "1.1.0"
+      }
+    },
+    {
+      "identity" : "swift-dependencies",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/pointfreeco/swift-dependencies",
+      "state" : {
+        "revision" : "9783b58167f7618cb86011156e741cbc6f4cc864",
+        "version" : "1.1.2"
+      }
+    },
+    {
+      "identity" : "swift-syntax",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-syntax",
+      "state" : {
+        "revision" : "6ad4ea24b01559dde0773e3d091f1b9e36175036",
+        "version" : "509.0.2"
+      }
+    },
+    {
+      "identity" : "xctest-dynamic-overlay",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/pointfreeco/xctest-dynamic-overlay.git",
+      "state" : {
+        "revision" : "23cbf2294e350076ea4dbd7d5d047c1e76b03631",
+        "version" : "1.0.2"
+      }
     }
   ],
   "version" : 2

diff --git a/Example/MRZScannerExample/.DS_Store b/Example/MRZScannerExample/.DS_Store
diff --git a/Example/MRZScannerExample/ViewModel.swift b/Example/MRZScannerExample/ViewModel.swift
@@ -27,7 +27,7 @@ final class ViewModel: ObservableObject {
     }
 
     // MARK: Scanning
-    @Published var boundingRects: ScanedBoundingRects?
+    @Published var boundingRects: ScannedBoundingRects?
     @Published var mrzRect: CGRect?
     @Published var mrzResult: MRZResult?
 
@@ -36,11 +36,18 @@ final class ViewModel: ObservableObject {
     func startMRZScanning() async throws {
         guard let cameraRect, let mrzRect else { return }
 
-        let correctedMRZRect = correctCoordinates(to: .leftTop, rect: mrzRect)
-        let roi = MRZScanner.convertRect(to: .normalizedRect, rect: correctedMRZRect, imageWidth: Int(cameraRect.width), imageHeight: Int(cameraRect.height))
         let scanningStream = MRZScanner.scanLive(
             imageStream: camera.imageStream,
-            configuration: .init(orientation: .up, regionOfInterest: roi, minimumTextHeight: 0.1, recognitionLevel: .fast)
+            configuration: .init(
+                orientation: .up,
+                regionOfInterest: VNNormalizedRectForImageRect(
+                    correctCoordinates(to: .leftTop, rect: mrzRect),
+                    Int(cameraRect.width),
+                    Int(cameraRect.height)
+                ),
+                minimumTextHeight: 0.1,
+                recognitionLevel: .fast
+            )
         )
 
         scanningTask = Task {
@@ -66,7 +73,7 @@ final class ViewModel: ObservableObject {
         case leftTop
     }
 
-    private func correctBoundingRects(to type: CorrectionType, rects: ScanedBoundingRects) -> ScanedBoundingRects {
+    private func correctBoundingRects(to type: CorrectionType, rects: ScannedBoundingRects) -> ScannedBoundingRects {
         guard let mrzRect else { fatalError("Camera rect must be set") }
 
         let convertedCoordinates = rects.convertedToImageRects(imageWidth: Int(mrzRect.width), imageHeight: Int(mrzRect.height))

diff --git a/Package.resolved b/Package.resolved
@@ -1,13 +1,67 @@
 {
   "pins" : [
+    {
+      "identity" : "combine-schedulers",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/pointfreeco/combine-schedulers",
+      "state" : {
+        "revision" : "9dc9cbe4bc45c65164fa653a563d8d8db61b09bb",
+        "version" : "1.0.0"
+      }
+    },
     {
       "identity" : "mrzparser",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/romanmazeev/MRZParser.git",
       "state" : {
-        "revision" : "2c1c4809379f081c01297f0ac92df2e94c6db54a",
+        "revision" : "d6d24fa2f9d1eac229bba8ffdf812e715690338d",
         "version" : "1.1.3"
       }
+    },
+    {
+      "identity" : "swift-clocks",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/pointfreeco/swift-clocks",
+      "state" : {
+        "revision" : "d1fd837326aa719bee979bdde1f53cd5797443eb",
+        "version" : "1.0.0"
+      }
+    },
+    {
+      "identity" : "swift-concurrency-extras",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/pointfreeco/swift-concurrency-extras.git",
+      "state" : {
+        "revision" : "bb5059bde9022d69ac516803f4f227d8ac967f71",
+        "version" : "1.1.0"
+      }
+    },
+    {
+      "identity" : "swift-dependencies",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/pointfreeco/swift-dependencies",
+      "state" : {
+        "revision" : "9783b58167f7618cb86011156e741cbc6f4cc864",
+        "version" : "1.1.2"
+      }
+    },
+    {
+      "identity" : "swift-syntax",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-syntax",
+      "state" : {
+        "revision" : "6ad4ea24b01559dde0773e3d091f1b9e36175036",
+        "version" : "509.0.2"
+      }
+    },
+    {
+      "identity" : "xctest-dynamic-overlay",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/pointfreeco/xctest-dynamic-overlay.git",
+      "state" : {
+        "revision" : "23cbf2294e350076ea4dbd7d5d047c1e76b03631",
+        "version" : "1.0.2"
+      }
     }
   ],
   "version" : 2

diff --git a/Package.swift b/Package.swift
@@ -13,12 +13,29 @@ let package = Package(
         ),
     ],
     dependencies: [
-        .package(url: "https://github.com/romanmazeev/MRZParser.git", .upToNextMajor(from: "1.1.3"))
+        .package(url: "https://github.com/romanmazeev/MRZParser.git", .upToNextMajor(from: "1.1.3")),
+        .package(url: "https://github.com/pointfreeco/xctest-dynamic-overlay.git", .upToNextMajor(from: "1.0.2")),
+        .package(url: "https://github.com/pointfreeco/swift-concurrency-extras.git", .upToNextMajor(from: "1.1.0")),
+        .package(url: "https://github.com/pointfreeco/swift-dependencies", from: "1.1.2")
     ],
     targets: [
         .target(
             name: "MRZScanner",
-            dependencies: ["MRZParser"]
+            dependencies: [
+                "MRZParser",
+                .product(
+                    name: "XCTestDynamicOverlay",
+                    package: "xctest-dynamic-overlay"
+                ),
+                .product(
+                    name: "ConcurrencyExtras",
+                    package: "swift-concurrency-extras"
+                ),
+                .product(
+                    name: "Dependencies",
+                    package: "swift-dependencies"
+                )
+            ]
         ),
         .testTarget(
             name: "MRZScannerTests",

diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ Library for scanning documents via [MRZ](https://en.wikipedia.org/wiki/Machine-r
 ### Swift Package Manager
 ```swift
 dependencies: [
-    .package(url: "https://github.com/romanmazeev/MRZScanner.git", .upToNextMajor(from: "1.0.0"))
+    .package(url: "https://github.com/romanmazeev/MRZScanner.git", .upToNextMajor(from: "2.0.0"))
 ]
 ```
 *The library has an SPM [dependency](https://github.com/romanmazeev/MRZParser) for MRZ code parsing.*
@@ -28,17 +28,12 @@ ScanningConfiguration(orientation: .up, regionOfInterest: roi, minimumTextHeight
 2. After you need to start scanning
 ```swift
 /// Live scanning
-for try await scanningResult in MRZScanner.scanLive(imageStream: imageStream, configuration: configuration) {
+for try await scanningResult in imageStream.scanForMRZCode(configuration: configuration) {
     // Handle `scanningResult` here
 }
 
 /// Single scanning
-let scanningResult = try await MRZScanner.scanSingle(image: image, configuration: configuration)
-```
-
-*Also, for the convenience of transforming coordinates into a normalized form and back, there is a static method `convertRect`*
-```swift
-MRZScanner.convertRect(to: .normalizedRect, rect: rect, imageWidth: imageWidth, imageHeight: imageHeight)
+let scanningResult = try await image.scanForMRZCode(configuration: configuration)
 ```
 
 ## Example

diff --git a/Sources/.DS_Store b/Sources/.DS_Store
diff --git a/Sources/MRZScanner/.DS_Store b/Sources/MRZScanner/.DS_Store
diff --git a/Sources/MRZScanner/MRZFrequencyTracker.swift b/Sources/MRZScanner/MRZFrequencyTracker.swift
diff --git a/Sources/MRZScanner/MRZScanner.swift b/Sources/MRZScanner/MRZScanner.swift