feat(Core): no longer embed OCR model inside binary

Author: BrycensRanch

SnapX.Avalonia/ViewModels/OCRViewModel.cs

@@ -31,34 +31,46 @@ public static readonly (string Display, string Code)[] _languages =
 
     [ObservableProperty]
     public int selectedLanguageIndex;
-    public ObservableCollection<string> LanguageDisplayNames { get; } = new(_languages.Select(l => l.Display));
+    public ObservableCollection<string> LanguageDisplayNames { get; } =
+        new(_languages.Select(l => l.Display));
 
     public string GetLanguageCode(int index) => _languages[index].Code;
 
-    public async Task<string> RunOCRAsync(HistoryItem? Item = null, string? languageCode = null)
+    public async Task<string> RunOCRAsync(
+        HistoryItem? Item = null,
+        string? languageCode = null,
+        Progress<TaskHelpers.OCRProgress>? progressHandler = null
+    )
     {
-        return await Task.Factory.StartNew(async () =>
-            {
-                Image? img = null;
-
-                if (img is null && Item?.BestImageSource is not null)
+        return await Task
+            .Factory.StartNew(
+                async () =>
                 {
-                    if (!Uri.IsWellFormedUriString(Item.BestImageSource, UriKind.Absolute))
-                    {
-                        // It's likely a file path, so no need to download
-                    }
-                    else
+                    Image? img = null;
+
+                    if (img is null && Item?.BestImageSource is not null)
                     {
-                        img = await WebHelpers.DownloadImageAsync(Item.BestImageSource);
+                        if (!Uri.IsWellFormedUriString(Item.BestImageSource, UriKind.Absolute))
+                        {
+                            // It's likely a file path, so no need to download
+                        }
+                        else
+                        {
+                            img = await WebHelpers.DownloadImageAsync(Item.BestImageSource);
+                        }
                     }
-                }
-
 
-                return await TaskHelpers.OCRImage(img, Item?.BestImageSource, TaskSettings.GetDefaultTaskSettings(), languageCode);
-            },
-            CancellationToken.None,
-            TaskCreationOptions.LongRunning,
-            TaskScheduler.Default).Unwrap();
+                    return await TaskHelpers.OCRImage(
+                        img,
+                        Item?.BestImageSource,
+                        TaskSettings.GetDefaultTaskSettings(),
+                        languageCode, progressHandler
+                    );
+                },
+                CancellationToken.None,
+                TaskCreationOptions.LongRunning,
+                TaskScheduler.Default
+            )
+            .Unwrap();
     }
-
 }

SnapX.Avalonia/Views/OCR.axaml.cs

@@ -5,6 +5,7 @@
 using SnapX.Core;
 using SnapX.Core.History;
 using SnapX.Core.Utils;
+using static SnapX.Core.Job.TaskHelpers;
 
 namespace SnapX.Avalonia.Views;
 
@@ -13,7 +14,6 @@ public partial class OCR : AppWindow
     private OCRViewModel _ocrViewModel;
     private HistoryItem? _item;
 
-
     public OCR(HistoryItem? item, OCRViewModel viewModel)
     {
         DataContext = viewModel;
@@ -29,18 +29,22 @@ public OCR(HistoryItem? item, OCRViewModel viewModel)
         // LoadImage();
         // RunOCR(_languages[0]);
     }
-    public OCR() : this(null, new OCRViewModel())
-    {
-    }
-    public OCR(HistoryItem item) : this(item, new OCRViewModel())
-    {
-    }
 
-    private async void LanguageSelector_SelectionChanged(object? sender, SelectionChangedEventArgs e)
+    public OCR()
+        : this(null, new OCRViewModel()) { }
+
+    public OCR(HistoryItem item)
+        : this(item, new OCRViewModel()) { }
+
+    private async void LanguageSelector_SelectionChanged(
+        object? sender,
+        SelectionChangedEventArgs e
+    )
     {
         DebugHelper.WriteLine($"{nameof(LanguageSelector_SelectionChanged)} triggered");
 
-        if (LanguageSelector?.SelectedIndex is not (>= 0 and var index)) return;
+        if (LanguageSelector?.SelectedIndex is not (>= 0 and var index))
+            return;
 
         _ocrViewModel.SelectedLanguageIndex = index;
 
@@ -53,8 +57,21 @@ private async Task RunOCRAsync(string languageCode)
         DebugHelper.WriteLine($"{nameof(RunOCRAsync)} triggered");
         var textBox = this.FindControl<TextBox>("ResultText")!;
         textBox.Text = Lang.Processing;
-        var result = await _ocrViewModel.RunOCRAsync(_item, languageCode);
-        if (SingleLine?.IsChecked ?? false) result = result.Replace("\r", "").Replace("\n", "");
+        LanguageSelector?.IsEnabled = false;
+
+        var progressHandler = new Progress<OCRProgress>(update =>
+        {
+            textBox.Text = $"[{update.Percent}%] {update.Status}";
+        });
+
+        var result = await _ocrViewModel.RunOCRAsync(_item, languageCode, progressHandler);
+
+        if (SingleLine?.IsChecked ?? false)
+        {
+            result = result.Replace("\r", "").Replace("\n", "");
+        }
+        LanguageSelector?.IsEnabled = true;
+
         textBox.Text = result;
     }
 
@@ -76,4 +93,3 @@ private void CopyResult_Click(object? Sender, RoutedEventArgs E)
         Clipboard?.SetTextAsync(ResultText.Text);
     }
 }
-