Merge branch 'Galnet_403' into develop

Author: Tkael

ChangeLog.md

@@ -8,6 +8,8 @@ Full details of the variables available for each noted event, and VoiceAttack in
     * Fixed localized default personality selection so custom personalities are upgraded using the selected EDDI UI language rather than the Windows system language. (#2801)
     * Fixed `Scan organic` recording a bonus of 0 credits at the `Analyze` scan stage. (#2800)
     * Revised installer to allow installation when the VoiceAttack 1 and VoiceAttack 2 registry hives point to the same location (e.g. when VoiceAttack 2 is installed over an existing VoiceAttack 1 installation). (#2803)
+  * Galnet Monitor
+    * Fixed an error preventing Galnet RSS from being read correctly. (#2804) (thanks to @rodan123)
   * Speech Responder
     * Fixed vertical whitespace characters being removed from speechresponder.out. (#2797)
     * Custom Functions

GalnetMonitor/GalnetMonitor.cs

@@ -19,6 +19,7 @@
 using System.Threading.Tasks;
 using System.Windows.Controls;
 using System.Xml;
+using System.Net.Http;
 using Utilities;
 
 namespace EddiGalnetMonitor
@@ -30,14 +31,15 @@ namespace EddiGalnetMonitor
     [UsedImplicitly]
     public class GalnetMonitor : IEddiMonitor
     {
-        private static Dictionary<string, string> locales = [ ];
+        private static Dictionary<string, string> locales;
         private static string locale;
         private GalnetConfiguration configuration = ConfigService.Instance.galnetConfiguration;
         private static readonly ResourceManager resourceManager = Properties.GalnetMonitor.ResourceManager;
 
         private CancellationTokenSource cancellationTokenSource;
         private bool running;
         private DateTime journalTimeStamp;
+        private static HttpClient httpClient;
 
         /// <summary>
         /// The name of the monitor; shows up in EDDI's configuration window
@@ -77,7 +79,14 @@ public void Start ()
         {
             cancellationTokenSource = new CancellationTokenSource();
             running = true;
-            locales = GetGalnetLocales();
+            locales ??= GetGalnetLocales();
+            if ( httpClient is null )
+            {
+                httpClient = new HttpClient();
+                // Add a User-Agent header (required by many servers)
+                httpClient.DefaultRequestHeaders.Add( "User-Agent", $"EDDI/{Constants.EDDI_VERSION}" );
+            }
+            
             MonitorAsync().GetAwaiter().GetResult();
         }
 
@@ -118,7 +127,7 @@ private async Task MonitorAsync ()
                 {
                     if ( configuration.galnetAlwaysOn )
                     {
-                        FetchGalnet();
+                        await FetchGalnetAsync().ConfigureAwait(false);
                         await Task.Delay( passiveIntervalMilliSecs , cancellationTokenSource.Token ).ConfigureAwait(false);
                     }
                     else
@@ -133,7 +142,7 @@ private async Task MonitorAsync ()
                                 await Task.Delay( inGameOnlyStartDelayMilliSecs, cancellationTokenSource.Token ).ConfigureAwait( false );
                             }
 
-                            FetchGalnet();
+                            await FetchGalnetAsync().ConfigureAwait(false);
                             await Task.Delay( activeIntervalMilliSecs , cancellationTokenSource.Token ).ConfigureAwait(false);
                         }
                         else
@@ -150,7 +159,7 @@ private async Task MonitorAsync ()
             }
         }
 
-        private void FetchGalnet ()
+        private async Task FetchGalnetAsync ()
         {
             var newsItems = new List<News>();
             string firstUid = null;
@@ -159,7 +168,7 @@ private void FetchGalnet ()
             var url = GetGalnetResource("sourceURL");
 
             Logging.Debug( "Fetching Galnet articles from " + url );
-            var items = GetFeedItems( url );
+            var items = await GetFeedItemsAsync( url ).ConfigureAwait(false);
             if ( items != null )
             {
                 try
@@ -218,34 +227,34 @@ private void FetchGalnet ()
                 }
             }
         }
-        private static List<FeedItem> GetFeedItems ( string url, bool fromAltUrl = false )
+
+        private static async Task<List<FeedItem>> GetFeedItemsAsync ( string url, bool fromAltUrl = false )
         {
             var items = new List<FeedItem>();
             try
             {
-                using ( var reader = XmlReader.Create( url ) )
+                await using ( var stream = await httpClient.GetStreamAsync( url ).ConfigureAwait( false ) )
                 {
-                    var feed = SyndicationFeed.Load( reader );
-                    var normalizer = new GalnetFeedItemNormalizer( fromAltUrl );
-                    foreach ( var syndicationItem in feed.Items )
+                    using ( var reader = XmlReader.Create( stream ) )
                     {
-                        var feedItem = normalizer.Normalize( feed, syndicationItem );
-                        if ( feedItem != null )
+                        var feed = SyndicationFeed.Load( reader );
+                        var normalizer = new GalnetFeedItemNormalizer( fromAltUrl );
+                        foreach ( var syndicationItem in feed.Items )
                         {
-                            items.Add( feedItem );
+                            var feedItem = normalizer.Normalize( feed, syndicationItem );
+                            if ( feedItem != null )
+                            {
+                                items.Add( feedItem );
+                            }
                         }
                     }
                 }
             }
-            catch ( WebException wex )
-            {
-                Logging.Warn( $"The remote server at {url} has rejected the request: ", wex );
-            }
-            catch ( XmlException xex )
+            catch ( Exception ex ) when ( ex is HttpRequestException or WebException )
             {
-                Logging.Error( "Exception attempting to obtain galnet feed: ", xex );
+                Logging.Warn( $"The remote server at {url} has rejected the request: ", ex );
             }
-            catch ( FileNotFoundException ex )
+            catch ( Exception ex ) when ( ex is XmlException or FileNotFoundException )
             {
                 Logging.Error( "Exception attempting to obtain galnet feed: ", ex );
             }