Console: Don't use GUI settings for OCR with --noprofile

cyanfish · Jan 12, 2024 · 6b17c5e · 6b17c5e
1 parent aa62214
commit 6b17c5e
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 2 deletions.
diff --git a/NAPS2.Lib.Tests/Automation/CommandLineIntegrationTests.cs b/NAPS2.Lib.Tests/Automation/CommandLineIntegrationTests.cs
@@ -63,6 +63,25 @@ await _automationHelper.RunCommand(
         AssertRecoveryCleanedUp();
     }
 
+    [Fact]
+    public async Task ScanWithNoOcr()
+    {
+        SetUpFakeOcr(new()
+        {
+            { LoadImage(ImageResources.ocr_test), "ADVERTISEMENT." }
+        });
+        var path = $"{FolderPath}/test.pdf";
+        await _automationHelper.RunCommand(
+            new AutomatedScanningOptions
+            {
+                OutputPath = path,
+                Verbose = true
+            },
+            ImageResources.ocr_test);
+        PdfAsserts.AssertDoesNotContainText("ADVERTISEMENT.", path);
+        AssertRecoveryCleanedUp();
+    }
+
     [Fact]
     public async Task ScanWithOcrLang()
     {
@@ -132,6 +151,30 @@ await _automationHelper.WithContainer(container =>
         AssertRecoveryCleanedUp();
     }
 
+    [Fact]
+    public async Task ScanWithOcrSettingsFromGui()
+    {
+        SetUpFakeOcr(new()
+        {
+            { LoadImage(ImageResources.ocr_test), "ADVERTISEMENT." }
+        });
+        var path = $"{FolderPath}/test.pdf";
+        await _automationHelper.WithContainer(container =>
+        {
+            var config = container.Resolve<Naps2Config>();
+            config.User.Set(c => c.OcrLanguageCode, "eng");
+            config.User.Set(c => c.EnableOcr, true);
+        }).RunCommand(
+            new AutomatedScanningOptions
+            {
+                OutputPath = path,
+                Verbose = true
+            },
+            ImageResources.ocr_test);
+        PdfAsserts.AssertContainsTextOnce("ADVERTISEMENT.", path);
+        AssertRecoveryCleanedUp();
+    }
+
     [Fact]
     public async Task ImportAndExportWithOcr()
     {
@@ -993,12 +1036,15 @@ await _automationHelper.WithContainer(container =>
             profile.BitDepth = ScanBitDepth.Grayscale;
             profile.Resolution = ScanDpi.Dpi300;
             profile.PageSize = ScanPageSize.A4;
+            var config = container.Resolve<Naps2Config>();
+            config.User.Set(c => c.EnableOcr, true);
+            config.User.Set(c => c.OcrLanguageCode, "eng");
         }).RunCommand(
             new AutomatedScanningOptions
             {
                 NoProfile = true,
                 Device = "name1",
-                OutputPath = $"{FolderPath}/test.jpg",
+                OutputPath = $"{FolderPath}/test.pdf",
                 Verbose = true
             },
             scanDriverFactoryMock);
@@ -1008,7 +1054,8 @@ await _automationHelper.WithContainer(container =>
                 options.PaperSource == PaperSource.Flatbed &&
                 options.BitDepth == BitDepth.Color &&
                 options.Dpi == 200 &&
-                options.PageSize == PageSize.Letter),
+                options.PageSize == PageSize.Letter &&
+                options.OcrParams.LanguageCode == null),
             Arg.Any<CancellationToken>(),
             Arg.Any<IScanEvents>(),
             Arg.Any<Action<IMemoryImage>>());

diff --git a/NAPS2.Lib/Automation/AutomatedScanning.cs b/NAPS2.Lib/Automation/AutomatedScanning.cs
@@ -164,6 +164,11 @@ public async Task Execute()
 
     private void ConfigureOcr()
     {
+        if (_options.NoProfile)
+        {
+            // Don't use OCR-enabled settings from the GUI if --noprofile is set
+            _config.Run.Set(c => c.EnableOcr, false);
+        }
         bool canUseOcr = IsPdfFile(_options.OutputPath) || IsPdfFile(_options.EmailFileName);
         if (!canUseOcr)
         {