Dev 4.13

.claude/settings.local.json

@@ -11,7 +11,8 @@
       "Bash(dotnet build:*)",
       "Bash(dotnet test:*)",
       "Bash(gh pr list:*)",
-      "Bash(/mnt/c/Program Files/dotnet/dotnet.exe:*)"
+      "Bash(/mnt/c/Program Files/dotnet/dotnet.exe:*)",
+      "WebFetch(domain:github.com)"
     ],
     "deny": []
   }

.github/workflows/Release.yml

@@ -14,6 +14,7 @@ on:
 
 permissions:
   contents: write
+  id-token: write
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -27,6 +28,9 @@ env:
   BUILD_X64_SC: 'bld/x64/Text-Grab-Self-Contained'
   BUILD_ARM64: 'bld/arm64'
   BUILD_ARM64_SC: 'bld/arm64/Text-Grab-Self-Contained'
+  ARTIFACT_SIGNING_ENDPOINT: 'https://eus.codesigning.azure.net/'
+  ARTIFACT_SIGNING_ACCOUNT_NAME: 'JoeFinAppsSigningCerts'
+  ARTIFACT_SIGNING_CERTIFICATE_PROFILE_NAME: 'JoeFinApps'
 
 jobs:
   build:
@@ -77,7 +81,7 @@ jobs:
         run: >-
           dotnet publish ${{ env.PROJECT_PATH }}
           --runtime win-x64
-          --self-contained false
+          --no-self-contained
           -c Release
           -v minimal
           -o ${{ env.BUILD_X64 }}
@@ -91,7 +95,7 @@ jobs:
         run: >-
           dotnet publish ${{ env.PROJECT_PATH }}
           --runtime win-x64
-          --self-contained true
+          --self-contained
           -c Release
           -v minimal
           -o ${{ env.BUILD_X64_SC }}
@@ -105,7 +109,7 @@ jobs:
         run: >-
           dotnet publish ${{ env.PROJECT_PATH }}
           --runtime win-arm64
-          --self-contained false
+          --no-self-contained
           -c Release
           -v minimal
           -o ${{ env.BUILD_ARM64 }}
@@ -118,7 +122,7 @@ jobs:
         run: >-
           dotnet publish ${{ env.PROJECT_PATH }}
           --runtime win-arm64
-          --self-contained true
+          --self-contained
           -c Release
           -v minimal
           -o ${{ env.BUILD_ARM64_SC }}
@@ -137,6 +141,73 @@ jobs:
             Rename-Item "${{ env.BUILD_ARM64_SC }}/${{ env.PROJECT }}.exe" 'Text-Grab-arm64.exe'
           }
 
+      - name: Validate Azure Trusted Signing configuration
+        shell: pwsh
+        env:
+          AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
+          AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
+          AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
+        run: |
+          $requiredSecrets = @{
+            AZURE_TENANT_ID = $env:AZURE_TENANT_ID
+            AZURE_CLIENT_ID = $env:AZURE_CLIENT_ID
+            AZURE_SUBSCRIPTION_ID = $env:AZURE_SUBSCRIPTION_ID
+          }
+
+          $missingSecrets = @(
+            $requiredSecrets.GetEnumerator() |
+              Where-Object { [string]::IsNullOrWhiteSpace($_.Value) } |
+              ForEach-Object { $_.Key }
+          )
+
+          if ($missingSecrets.Count -gt 0) {
+            throw "Configure these repository secrets before running the release workflow: $($missingSecrets -join ', ')"
+          }
+
+          $signingConfig = @{
+            ARTIFACT_SIGNING_ENDPOINT = '${{ env.ARTIFACT_SIGNING_ENDPOINT }}'
+            ARTIFACT_SIGNING_ACCOUNT_NAME = '${{ env.ARTIFACT_SIGNING_ACCOUNT_NAME }}'
+            ARTIFACT_SIGNING_CERTIFICATE_PROFILE_NAME = '${{ env.ARTIFACT_SIGNING_CERTIFICATE_PROFILE_NAME }}'
+          }
+
+          $missing = @(
+            $signingConfig.GetEnumerator() |
+              Where-Object {
+                [string]::IsNullOrWhiteSpace($_.Value) -or
+                $_.Value.StartsWith('REPLACE_WITH_') -or
+                $_.Value.Contains('REPLACE_WITH_')
+              } |
+              ForEach-Object { $_.Key }
+          )
+
+          if ($missing.Count -gt 0) {
+            throw "Update the Azure Trusted Signing placeholders in .github/workflows/Release.yml before running the release workflow: $($missing -join ', ')"
+          }
+
+      - name: Azure login for Trusted Signing
+        uses: azure/login@v2
+        with:
+          client-id: ${{ secrets.AZURE_CLIENT_ID }}
+          tenant-id: ${{ secrets.AZURE_TENANT_ID }}
+          subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
+
+      - name: Sign release executables
+        uses: azure/artifact-signing-action@v1
+        with:
+          endpoint: ${{ env.ARTIFACT_SIGNING_ENDPOINT }}
+          signing-account-name: ${{ env.ARTIFACT_SIGNING_ACCOUNT_NAME }}
+          certificate-profile-name: ${{ env.ARTIFACT_SIGNING_CERTIFICATE_PROFILE_NAME }}
+          files: |
+            ${{ github.workspace }}\${{ env.BUILD_X64 }}\${{ env.PROJECT }}.exe
+            ${{ github.workspace }}\${{ env.BUILD_X64_SC }}\${{ env.PROJECT }}.exe
+            ${{ github.workspace }}\${{ env.BUILD_ARM64 }}\Text-Grab-arm64.exe
+            ${{ github.workspace }}\${{ env.BUILD_ARM64_SC }}\Text-Grab-arm64.exe
+          file-digest: SHA256
+          timestamp-rfc3161: http://timestamp.acs.microsoft.com
+          timestamp-digest: SHA256
+          description: Text Grab
+          description-url: https://github.com/TheJoeFin/Text-Grab
+
       - name: Create self-contained archives
         shell: pwsh
         run: |

Tests/BarcodeUtilitiesTests.cs

@@ -0,0 +1,82 @@
+using System.Drawing;
+using System.Drawing.Imaging;
+using System.IO;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Text_Grab;
+using Text_Grab.Models;
+using Text_Grab.Utilities;
+using UnitsNet;
+using Windows.Storage.Streams;
+using static System.Net.Mime.MediaTypeNames;
+
+namespace Tests;
+
+public class BarcodeUtilitiesTests
+{
+    [Fact]
+    public void TryToReadBarcodes_WithDisposedBitmap_ReturnsEmptyList()
+    {
+        Bitmap disposedBitmap = new(8, 8);
+        disposedBitmap.Dispose();
+
+        List<OcrOutput> results = BarcodeUtilities.TryToReadBarcodes(disposedBitmap);
+
+        Assert.Empty(results);
+    }
+
+    [Fact]
+    public void TryToReadBarcodes_WithTwoQrCodes_ReturnsTwoResults()
+    {
+        // Build a side-by-side bitmap containing two different QR codes
+        using Bitmap qr1 = BarcodeUtilities.GetQrCodeForText("https://example.com", ZXing.QrCode.Internal.ErrorCorrectionLevel.M);
+        using Bitmap qr2 = BarcodeUtilities.GetQrCodeForText("https://example.org", ZXing.QrCode.Internal.ErrorCorrectionLevel.M);
+
+        using Bitmap combined = new(qr1.Width + qr2.Width, Math.Max(qr1.Height, qr2.Height));
+        using (Graphics g = Graphics.FromImage(combined))
+        {
+            g.Clear(Color.White);
+            g.DrawImage(qr1, 0, 0);
+            g.DrawImage(qr2, qr1.Width, 0);
+        }
+
+        List<OcrOutput> results = BarcodeUtilities.TryToReadBarcodes(combined);
+
+        Assert.Equal(2, results.Count);
+        Assert.All(results, r => Assert.Equal(OcrOutputKind.Barcode, r.Kind));
+        Assert.Contains(results, r => r.RawOutput == "https://example.com");
+        Assert.Contains(results, r => r.RawOutput == "https://example.org");
+    }
+
+    [WpfFact]
+    public void ReadTestSingleQRCode()
+    {
+        string expectedOutput = "This is a test of the QR Code system";
+        string testFilePath = FileUtilities.GetPathToLocalFile(@".\Images\QrCodeTestImage.png");
+
+        Bitmap testBmp = new(testFilePath);
+
+        List<OcrOutput> result = BarcodeUtilities.TryToReadBarcodes(testBmp);
+
+        Assert.Single(result);
+        Assert.Equal(expectedOutput, result[0].RawOutput);
+    }
+
+    [Fact]
+    public async Task GetBitmapFromIRandomAccessStream_ReturnsBitmapIndependentOfSourceStream()
+    {
+        using Bitmap sourceBitmap = new(8, 8);
+        sourceBitmap.SetPixel(0, 0, Color.Red);
+
+        using MemoryStream memoryStream = new();
+        sourceBitmap.Save(memoryStream, ImageFormat.Png);
+
+        using InMemoryRandomAccessStream randomAccessStream = new();
+        _ = await randomAccessStream.WriteAsync(memoryStream.ToArray().AsBuffer());
+
+        Bitmap clonedBitmap = ImageMethods.GetBitmapFromIRandomAccessStream(randomAccessStream);
+
+        Assert.Equal(8, clonedBitmap.Width);
+        Assert.Equal(8, clonedBitmap.Height);
+        Assert.Equal(Color.Red.ToArgb(), clonedBitmap.GetPixel(0, 0).ToArgb());
+    }
+}