Merge pull request #3 from ANcpLua/chore/copilot-followup-pr2

Address Copilot review comments from PR #2

Author: ANcpLua

CreatePdf.NET.Tests/OcrServiceTests.cs

@@ -85,4 +85,40 @@ public void TryDeleteDirectory_NonExistentDirectory_DoesNotThrow()
 
         act.Should().NotThrow();
     }
+
+    [Fact]
+    public void TryDeleteDirectory_WhenDeleteThrowsIOException_DoesNotPropagate()
+    {
+        var tempDir = Directory.CreateTempSubdirectory("createpdf-ocr-test-");
+        try
+        {
+            var act = () => OcrService.TryDeleteDirectory(
+                tempDir.FullName,
+                (_, _) => throw new IOException("simulated lock"));
+
+            act.Should().NotThrow();
+        }
+        finally
+        {
+            Directory.Delete(tempDir.FullName, recursive: true);
+        }
+    }
+
+    [Fact]
+    public void TryDeleteDirectory_WhenDeleteThrowsUnauthorizedAccess_DoesNotPropagate()
+    {
+        var tempDir = Directory.CreateTempSubdirectory("createpdf-ocr-test-");
+        try
+        {
+            var act = () => OcrService.TryDeleteDirectory(
+                tempDir.FullName,
+                (_, _) => throw new UnauthorizedAccessException("simulated permission denied"));
+
+            act.Should().NotThrow();
+        }
+        finally
+        {
+            Directory.Delete(tempDir.FullName, recursive: true);
+        }
+    }
 }

CreatePdf.NET.Tests/TesseractOcrProviderTests.cs

@@ -29,6 +29,66 @@ await act.Should().ThrowAsync<FileNotFoundException>()
         processRunner.StartInfos[0].Arguments.Should().Contain("input.png");
     }
 
+    [Theory]
+    [InlineData("out.log", "out.txt")]
+    [InlineData("out", "out.txt")]
+    [InlineData("foo.bar.log", "foo.bar.txt")]
+    [InlineData("out.TXT", "out.txt")]
+    [InlineData("out.", "out.txt")]
+    public async Task ExtractTextFromImageAsync_DerivesActualTxtPathFromBase(string inputName, string expectedName)
+    {
+        var tempDir = Path.GetTempPath();
+        var inputPath = Path.Combine(tempDir, inputName);
+        var expectedPath = Path.Combine(tempDir, expectedName);
+        var checkedPaths = new List<string>();
+        var processRunner = new FakeProcessRunner();
+        var environment = new FakeSystemEnvironment
+        {
+            FileExistsImpl = path =>
+            {
+                checkedPaths.Add(path);
+                return false;
+            }
+        };
+        var engine = new TesseractOcrProvider(environment, processRunner);
+
+        var act = () => engine.ExtractTextFromImageAsync(
+            "input.png",
+            inputPath,
+            new OcrOptions { TesseractPath = "/bin/echo" });
+
+        await act.Should().ThrowAsync<FileNotFoundException>()
+            .Where(e => e.FileName == expectedPath)
+            .ConfigureAwait(true);
+
+        checkedPaths.Should().ContainSingle().Which.Should().Be(expectedPath);
+    }
+
+    [Fact]
+    public async Task ExtractTextFromImageAsync_WithNonTxtInputPath_ReadsFromDerivedTxtPath()
+    {
+        var actualTxtPath = Path.Combine(Path.GetTempPath(), $"createpdf-test-{Guid.NewGuid():N}.txt");
+        var nonTxtInputPath = Path.ChangeExtension(actualTxtPath, ".log");
+        await File.WriteAllTextAsync(actualTxtPath, "Hello\nWorld").ConfigureAwait(true);
+        try
+        {
+            var processRunner = new FakeProcessRunner();
+            var environment = new FakeSystemEnvironment { FileExistsImpl = File.Exists };
+            var engine = new TesseractOcrProvider(environment, processRunner);
+
+            var result = await engine.ExtractTextFromImageAsync(
+                "input.png",
+                nonTxtInputPath,
+                new OcrOptions { TesseractPath = "/bin/echo" }).ConfigureAwait(true);
+
+            result.Should().Be("Hello World");
+        }
+        finally
+        {
+            if (File.Exists(actualTxtPath)) File.Delete(actualTxtPath);
+        }
+    }
+
     [Fact]
     public void GetPdfRasterizerExecutable_UsesExplicitConverterPath()
     {

CreatePdf.NET/Internal/OcrService.cs

@@ -62,9 +62,16 @@ private async Task<string> OcrAsync(string pdfPath, string workDir, OcrOptions o
             .ConfigureAwait(false);
     }
 
-    internal static void TryDeleteDirectory(string path)
+    internal static void TryDeleteDirectory(string path, Action<string, bool>? deleteImpl = null)
     {
-        if (Directory.Exists(path))
-            Directory.Delete(path, recursive: true);
+        try
+        {
+            if (!Directory.Exists(path)) return;
+            (deleteImpl ?? Directory.Delete)(path, true);
+        }
+        catch (Exception ex) when (ex is IOException or UnauthorizedAccessException)
+        {
+            // Best-effort cleanup. Called from finally — must not mask the original exception.
+        }
     }
 }

CreatePdf.NET/Internal/TesseractOcrProvider.cs

@@ -54,6 +54,7 @@ public async Task<string> ExtractTextFromImageAsync(string pngPath, string txtPa
         var outputBase = Path.Combine(
             Path.GetDirectoryName(txtPath) ?? string.Empty,
             Path.GetFileNameWithoutExtension(txtPath));
+        var actualTxtPath = outputBase + ".txt";
 
         await _processRunner.RunAsync(
                 CreateProcessInfo(
@@ -62,10 +63,10 @@ await _processRunner.RunAsync(
                 cancellationToken)
             .ConfigureAwait(false);
 
-        if (!_systemEnvironment.FileExists(txtPath))
-            throw new FileNotFoundException("OCR output file not found. Tesseract execution failed.", txtPath);
+        if (!_systemEnvironment.FileExists(actualTxtPath))
+            throw new FileNotFoundException("OCR output file not found. Tesseract execution failed.", actualTxtPath);
 
-        var text = await File.ReadAllTextAsync(txtPath, cancellationToken).ConfigureAwait(false);
+        var text = await File.ReadAllTextAsync(actualTxtPath, cancellationToken).ConfigureAwait(false);
         return text.Trim().Replace("\n", " ").Replace("\r", " ");
     }