Update packages and refactor main application components

- Updated package versions in `Directory.Packages.props` for Microsoft.Extensions and `PuppeteerSharp`.
- Modified `btn_Cancel` style in `MainForm.Designer.cs`.
- Replaced `IEventAggregator` subscriptions with new event handlers in `MainForm.cs`.
- Added methods in `MainForm.cs` for updating UI with page, link, and queue counts.
- Improved error handling in `MainForm.cs` by removing `_aggregator` usage.
- Updated `ExtractTargetLinksAsync` in `BlogScraper.cs` to accept a `CancellationToken`.
- Refactored `DataLayer.cs` for better error handling and added asynchronous methods.
- Enhanced `UrlDownloader.cs` with new events for download completion and failure.
- Improved `WebAutomationService.cs` with methods for text extraction and browser health checks.
- Added configuration files for Data API Builder setup.
- Refactored `Program.cs` for better dependency injection and logging setup.

Author: KyleC69

.env

@@ -0,0 +1 @@
+dab-connection-string=Data Source=(LocalDB)\MSSQLLocalDB;AttachDbFilename=C:\Users\kcrow\Documents\Data\Solutions\MediaRecycler\MediaRecycler\Model\Database1.mdf;Integrated Security=True;Connect Timeout=30

Directory.Packages.props

@@ -15,15 +15,15 @@
     <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="10.0.0-preview.5.25277.114" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0-preview.5.25277.114" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0-preview.5.25277.114" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.6" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.0-preview.5.25277.114" />
     <PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.0-preview.5.25277.114" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.0-preview.5.25277.114" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="10.0.0-preview.5.25277.114" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="10.0.0-preview.5.25277.114" />
     <PackageVersion Include="Microsoft.Extensions.Options" Version="10.0.0-preview.5.25277.114" />
     <PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="10.0.0-preview.5.25277.114" />
     <PackageVersion Include="Polly" Version="8.6.1" />
-    <PackageVersion Include="PuppeteerSharp" Version="20.1.3" />
+    <PackageVersion Include="PuppeteerSharp" Version="20.2.0" />
     <PackageVersion Include="puppeteersharp.dom" Version="5.0.43" />
     <PackageVersion Include="System.Text.Json" Version="10.0.0-preview.5.25277.114" />
   </ItemGroup>

Forms/MainForm.Designer.cs

@@ -21,7 +21,6 @@ namespace MediaRecycler;
 public partial class MainForm : Form
 {
 
-    private readonly IEventAggregator _aggregator = new EventAggregator();
 
     //private UrlDownloader? _downloadManager;
     //private readonly IScraper? _scraper;
@@ -41,22 +40,64 @@ public MainForm(IBlogScraper blogScraper)
         _blogScraper = blogScraper;
 
         // subscribe to the aggregator for the events we are interested in and assign the handlers
-        _aggregator.Subscribe<StatusMessage>(OnStatusMessageReceived);
-        _aggregator.Subscribe<PageNumberMessage>(OnPageCountUpdates);
-        _aggregator.Subscribe<QueueCountMessage>(OnQueueCountUpdates);
-        _aggregator.Subscribe<StatusBarMessage>(OnStatusBarMessageReceivced);
+
+        Log.UIUpdateQueue += (i) => UpdateQueueDelegate(i);
+        Log.UIUpdateLinkCount += (i) => UpdateLinkCount(i);
+        Log.UIUpdatePageCount += (i) => UpdatePageCount(i);
+
+
+
+    }
 
 
 
 
 
+
+    private void UpdatePageCount(int i)
+    {
+        if (InvokeRequired)
+        {
+            Invoke(new Action<int>(UpdatePageCount), i);
+            return;
+        }
+
+        tb_pages.Text = i.ToString();
     }
 
 
 
 
 
 
+    private void UpdateLinkCount(int i)
+    {
+        if (InvokeRequired)
+        {
+            Invoke(new Action<int>(UpdateLinkCount), i);
+            return;
+        }
+
+        tb_videos.Text = i.ToString();
+    }
+
+
+
+
+
+
+    private void UpdateQueueDelegate(int i)
+    {
+        if (InvokeRequired)
+        {
+           Invoke(new Action<int>(UpdateQueueDelegate),i);
+        }
+
+        tb_dlque.Text = i.ToString();
+    }
+
+
+
 #pragma warning disable IDE0032
     /// <summary>
     ///     Text box used for logging output in the main viewer.
@@ -118,7 +159,6 @@ private async void btn_download_Click(object sender, EventArgs e)
         {
 
             Log.LogError(ex, "An unhandled error occured. Attempting to save progress before aborting...");
-            _aggregator.Publish(new StatusBarMessage("Downloading of videos ended in failure."));
 
 
 
@@ -127,7 +167,6 @@ private async void btn_download_Click(object sender, EventArgs e)
         {
 
 
-            _aggregator.Publish(new StatusBarMessage("Downloading of videos complete."));
             Log.LogInformation("Video Queue finished.");
         }
 
@@ -145,7 +184,7 @@ private async void btn_Process_Click(object sender, EventArgs e)
 
         try
         {
-            await _blogScraper.ExtractTargetLinksAsync();
+            await _blogScraper.ExtractTargetLinksAsync(cts.Token);
         }
         catch (Exception)
         {
@@ -358,20 +397,11 @@ private void MainForm_FormClosing(object sender, FormClosingEventArgs e)
         // Ensure resources are stopped and disposed of properly
         try
         {
-            /*
-            if (_scraper != null)
-            {
-                await _scraper.CancelAsync();
-                await _scraper.DisposeAsync();
-            }
+
+            _blogScraper?.CancelAsync();
+            _blogScraper?.DisposeAsync();
 
 
-            if (_downloadManager != null)
-            {
-                await _downloadManager.StopAllTasksAsync();
-                await _downloadManager.DisposeAsync();
-            }
-            */
         }
         catch (Exception ex)
         {
@@ -380,8 +410,6 @@ private void MainForm_FormClosing(object sender, FormClosingEventArgs e)
         finally
         {
             Log.LogInformation("MainForm is closing. PuppeteerManager disposed.");
-            _aggregator.Unsubscribe<StatusMessage>(OnStatusMessageReceived);
-            _aggregator.Unsubscribe<PageNumberMessage>(OnPageCountUpdates);
         }
     }
 
@@ -400,44 +428,6 @@ private void MainForm_Load(object sender, EventArgs e)
 
 
 
-    /// <summary>
-    ///     A registered handler for <see cref="EventAggregator" />  Handles updates to the page count by processing the
-    ///     provided <see cref="PageNumberMessage" />.
-    /// </summary>
-    /// <param name="pageNumberMessage">
-    ///     The message containing the updated page number information.
-    /// </param>
-    private void OnPageCountUpdates(PageNumberMessage pageNumberMessage)
-    {
-        if (InvokeRequired)
-        {
-            _ = BeginInvoke(() => OnPageCountUpdates(pageNumberMessage));
-            return;
-        }
-
-        tb_pages.Text = pageNumberMessage.PageNumber.ToString();
-    }
-
-
-
-
-
-
-    private void OnQueueCountUpdates(QueueCountMessage obj)
-    {
-        if (InvokeRequired)
-        {
-            _ = BeginInvoke(() => OnQueueCountUpdates(obj));
-            return;
-
-
-        }
-
-        tb_dlque.Text = obj.QueueCount.ToString();
-    }
-
-
-
 
 
 

Forms/MainForm.cs

@@ -16,6 +16,60 @@
 namespace MediaRecycler.Logging;
 
 
+/// <summary>
+///     Represents a formatted log message and its named values for structured logging.
+///     <para>
+///         <b>Purpose:</b> This struct is used to format log messages with named placeholders (e.g., "User {UserId} logged
+///         in")
+///         and expose both the formatted string and its named values as key-value pairs. This enables efficient structured
+///         logging,
+///         where log consumers can access both the rendered message and its parameters.
+///     </para>
+///     <para>
+///         <b>How it works:</b>
+///         <list type="bullet">
+///             <item>
+///                 <description>
+///                     When constructed, it takes a format string and an array of values. If the format string and values
+///                     are valid,
+///                     it uses a cached <see cref="LogValuesFormatter" /> to parse and format the message. The cache is
+///                     limited to <see cref="MaxCachedFormatters" /> entries for efficiency.
+///                 </description>
+///             </item>
+///             <item>
+///                 <description>
+///                     The struct implements <see cref="IReadOnlyList{T}" /> of
+///                     <see cref="KeyValuePair{String, Object}" />, exposing each named value in the format string,
+///                     plus a final entry with the key "{OriginalFormat}" containing the original format string.
+///                 </description>
+///             </item>
+///             <item>
+///                 <description>
+///                     The <see cref="ToString" /> method returns the formatted message, caching the result for repeated
+///                     calls.
+///                 </description>
+///             </item>
+///             <item>
+///                 <description>
+///                     If no formatter is available (e.g., null or empty format/values), it simply returns the original
+///                     message or a "[null]" placeholder.
+///                 </description>
+///             </item>
+///         </list>
+///     </para>
+///     <para>
+///         <b>Example:</b>
+///         <code>
+/// var logValues = new FormattedLogValues("User {UserId} logged in at {Time}", 42, DateTime.Now);
+/// string message = logValues.ToString(); // "User 42 logged in at 7/2/2025 10:00:00 AM"
+/// foreach (var pair in logValues)
+/// {
+///     // pair.Key: "UserId", "Time", "{OriginalFormat}"
+///     // pair.Value: 42, DateTime.Now, "User {UserId} logged in at {Time}"
+/// }
+/// </code>
+///     </para>
+/// </summary>
 internal struct FormattedLogValues : IReadOnlyList<KeyValuePair<string, object?>>
 {
 

Logging/FormattedLogValues.cs

@@ -289,6 +289,58 @@ private static void WriteLog(string formattedMessage)
 
 
 
+    public static void UpdateQueue(int value)
+    {
+        lock (_lock)
+        {
+            UIUpdateQueue?.Invoke(value);
+        }
+    }
+
+
+
+
+
+
+    public static void UpdatePageCount(int value)
+    {
+        lock (_lock)
+        {
+            UIUpdatePageCount?.Invoke(value);
+        }
+    }
+
+    public static void UpdateLinkCount(int value)
+    {
+        lock (_lock)
+        {
+            UIUpdateLinkCount?.Invoke(value);
+        }
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
     public static Action<string>? WriteMessage;
 
+    /// <summary>
+    /// Action for queue textbox UI updates
+    /// </summary>
+    public static Action<int>? UIUpdateQueue;
+
+
+    /// <summary>
+    /// Action for page number textbox update
+    /// </summary>
+    public static Action<int>? UIUpdatePageCount;
+
+
+    /// <summary>
+    /// Represents an action that updates the UI with the current link count.
+    /// </summary>
+    /// <remarks>This delegate can be assigned to a method that takes an integer parameter,  representing the
+    /// number of links, and performs a UI update based on that value. If not assigned, no action will be performed when
+    /// invoked.</remarks>
+    public static Action<int>? UIUpdateLinkCount;
+
 }

Logging/Log.cs

@@ -19,6 +19,7 @@
     <UserSecretsId>fd576e9f-aea8-4045-a046-1df6c55b5f5c</UserSecretsId>
     <NuGetAuditMode>direct</NuGetAuditMode>
     <NuGetAuditLevel>critical</NuGetAuditLevel>
+    <SupportedOSPlatformVersion>8.0</SupportedOSPlatformVersion>
   </PropertyGroup>
   <ItemGroup>
     <Compile Remove="Migrations\**" />