Support multiple mirror feeds

Added possibility to specify multiple PackageSources in the appsettings.
lkonrad-q-soft · Jul 19, 2024 · 400c35d · 400c35d
2 parents fe7781d + ab5c5f3
commit 400c35d
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 29 deletions.
diff --git a/src/BaGetter.Core/Configuration/MirrorOptions.cs b/src/BaGetter.Core/Configuration/MirrorOptions.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Linq;
 
 namespace BaGetter.Core;
 
@@ -79,28 +78,3 @@ private void UpdateSources()
         Sources = [new MirrorSource { PackageSource = PackageSource, Legacy = Legacy }]; 
     }
 }
-
-public class MirrorSource
-{
-    public Uri PackageSource { get; set; }
-    public bool Legacy { get; set; }
-
-    public override bool Equals(object obj)
-    {
-        // Check for null and compare run-time types.
-        if (obj is null || !GetType().Equals(obj.GetType()))
-        {
-            return false;
-        }
-        else
-        {
-            var ms = (MirrorSource)obj;
-            return (PackageSource.Equals(ms.PackageSource)) && (Legacy == ms.Legacy);
-        }
-    }
-
-    public override int GetHashCode()
-    {
-        return HashCode.Combine(PackageSource, Legacy);
-    }
-}
diff --git a/src/BaGetter.Core/Configuration/MirrorSource.cs b/src/BaGetter.Core/Configuration/MirrorSource.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BaGetter.Core;
+
+public class MirrorSource
+{
+    public Uri PackageSource { get; set; }
+    public bool Legacy { get; set; }
+
+    public override bool Equals(object obj)
+    {
+        // Check for null and compare run-time types.
+        if (obj is null || !GetType().Equals(obj.GetType()))
+        {
+            return false;
+        }
+        else
+        {
+            var ms = (MirrorSource)obj;
+            return (PackageSource.Equals(ms.PackageSource)) && (Legacy == ms.Legacy);
+        }
+    }
+
+    public override int GetHashCode()
+    {
+        return HashCode.Combine(PackageSource, Legacy);
+    }
+}
+
diff --git a/src/BaGetter.Core/Extensions/DependencyInjectionExtensions.cs b/src/BaGetter.Core/Extensions/DependencyInjectionExtensions.cs
@@ -214,8 +214,8 @@ private static List<IUpstreamClient> CreateUpstreamClients(IServiceProvider prov
     private static V2UpstreamClient CreateV2Client(IServiceProvider scopedProvider, MirrorSource mirrorSource)
     {
         var logger = scopedProvider.GetRequiredService<ILogger<V2UpstreamClient>>();
-        var mirrorOptions = new MirrorOptions() { PackageSource = mirrorSource.PackageSource, Legacy = true };
-
+        var mirrorOptions = new MirrorSource() { PackageSource = mirrorSource.PackageSource, Legacy = true };
+      
         return new V2UpstreamClient(mirrorOptions, logger);
     }
 

diff --git a/src/BaGetter.Core/Upstream/Clients/V2UpstreamClient.cs b/src/BaGetter.Core/Upstream/Clients/V2UpstreamClient.cs
@@ -31,7 +31,7 @@ public class V2UpstreamClient : IUpstreamClient, IDisposable
     private static readonly char[] AuthorsSeparators = new[] { ',', ';', '\t', '\n', '\r' };
 
     public V2UpstreamClient(
-        MirrorOptions options,
+        MirrorSource options,
         ILogger logger)
     {
         ArgumentNullException.ThrowIfNull(options);