Add Combine for Uri

src/ModSink.CLI/Program.cs

@@ -128,13 +128,16 @@ private static void AddDump(this CommandLineApplication app)
                     else
                     {
                         var formatter = new BinaryFormatter();
-                        foreach (var repoUri in ((Group) formatter.Deserialize(groupUriStr.GetStreamAsync().GetAwaiter()
-                                .GetResult()))
-                            .RepoInfos)
+                        var group = (Group) formatter.Deserialize(groupUriStr.GetStreamAsync().GetAwaiter()
+                            .GetResult());
+                        group.BaseUri = groupUri;
+                        foreach (var repoInfo in group.RepoInfos)
                         {
-                            var repo = (Repo) formatter.Deserialize(new Uri(groupUri, repoUri.Uri).ToString()
+                            var repoUri = group.CombineBaseUri(repoInfo.Uri);
+                            var repo = (Repo) formatter.Deserialize(repoUri.ToString()
                                 .GetStreamAsync().GetAwaiter()
                                 .GetResult());
+                            repo.BaseUri = repoUri;
                             DumpRepo(repo);
                         }
                     }
@@ -328,15 +331,15 @@ private static void DumpRepo(Repo repo)
         {
             Console.WriteLine($"Repo at {repo.BaseUri}");
             Console.WriteLine("Files:");
-            foreach (var file in repo.Files.OrderBy(f=>f.Key))
-                Console.WriteLine($"\t{file.Key} at {new Uri(repo.BaseUri, file.Value)}");
+            foreach (var file in repo.Files.OrderBy(f => f.Key))
+                Console.WriteLine($"\t{file.Key} at {repo.CombineBaseUri(file.Value)}");
 
             Console.WriteLine("ModPacks:");
-            foreach (var modpack in repo.Modpacks.OrderBy(m=>m.Name))
+            foreach (var modpack in repo.Modpacks.OrderBy(m => m.Name))
             {
                 Console.WriteLine($"\tModpack '{modpack.Name}'");
                 Console.WriteLine("\tMods:");
-                foreach (var mod in modpack.Mods.OrderBy(m=>m.Mod.Name))
+                foreach (var mod in modpack.Mods.OrderBy(m => m.Mod.Name))
                     Console.WriteLine($"\t\tMod: '{mod.Mod.Name}' [{mod.Mod.Files.Count} files]");
             }
         }

src/ModSink.Common.Tests/Models/WithBaseUriTests.cs

@@ -0,0 +1,24 @@
+using System;
+using FluentAssertions;
+using ModSink.Common.Models;
+using Xunit;
+
+namespace ModSink.Common.Tests.Models
+{
+    public class WithBaseUriTests
+    {
+        [Theory]
+        [InlineData("http://example.com/group.bin", "Repo/repo.bin", "http://example.com/Repo/repo.bin")]
+        [InlineData("http://example.com/Repo/repo.bin","Modpack/Mod/File.bin", "http://example.com/Repo/Modpack/Mod/File.bin")]
+        public void CombinesCorrectly(string @base, string relative, string expected)
+        {
+            var withBaseUri = new WithBaseUriTestClass(){BaseUri = new Uri(@base) };
+            var actual = withBaseUri.CombineBaseUri(new Uri(relative,UriKind.Relative));
+            actual.Should().Be(new Uri(expected));
+        }
+        private class WithBaseUriTestClass : WithBaseUri
+        {
+
+        }
+    }
+}

src/ModSink.Common/Client/ClientService.cs

@@ -108,7 +108,7 @@ private Stream GetTemporaryFileStream(FileSignature argFileSignature)
             return fileAccessService.Write(argFileSignature, true);
         }
 
-        private async Task<T> Load<T>(Uri uri) where T : IBaseUri
+        private async Task<T> Load<T>(Uri uri) where T : WithBaseUri
         {
             LogTo.Information("Loading {T} from {url}", typeof(T), uri);
             using (var mem = new MemoryStream())

src/ModSink.Common/Client/DynamicDataChain.cs

@@ -34,7 +34,7 @@ public static IObservable<IChangeSet<OnlineFile, FileSignature>> GetOnlineFileFr
         {
             return repos
                 .TransformMany(
-                    repo => repo.Files.Select(kvp => new OnlineFile(kvp.Key, new Uri(repo.BaseUri, kvp.Value))),
+                    repo => repo.Files.Select(kvp => new OnlineFile(kvp.Key, repo.CombineBaseUri(kvp.Value))),
                     of => of.FileSignature);
         }
 
@@ -45,7 +45,7 @@ public static IObservable<IChangeSet<Repo, Uri>> GetReposFromGroups(
             return groups
                 .Transform(g => new Uri(g))
                 .TransformAsync(loadGroup)
-                .TransformMany(g => g.RepoInfos.Select(r => new Uri(g.BaseUri, r.Uri)), repoUri => repoUri)
+                .TransformMany(g => g.RepoInfos.Select(r => g.CombineBaseUri(r.Uri)), repoUri => repoUri)
                 .TransformAsync(loadRepo)
                 .OnItemUpdated((repo, _) => LogTo.Information("Repo from {url} has been loaded", repo.BaseUri));
         }

src/ModSink.Common/Models/Group/Group.cs

@@ -4,9 +4,8 @@
 namespace ModSink.Common.Models.Group
 {
     [Serializable]
-    public class Group : IBaseUri
+    public class Group : WithBaseUri
     {
         public ICollection<RepoInfo> RepoInfos { get; set; }
-        public Uri BaseUri { get; set; }
     }
 }

src/ModSink.Common/Models/Repo/Repo.cs

@@ -4,11 +4,10 @@
 namespace ModSink.Common.Models.Repo
 {
     [Serializable]
-    public class Repo : IBaseUri
+    public class Repo : WithBaseUri
     {
         public IDictionary<FileSignature, Uri> Files { get; set; }
 
         public ICollection<Modpack> Modpacks { get; set; }
-        public Uri BaseUri { get; set; }
     }
 }

src/ModSink.Common/Models/WithBaseUri.cs

@@ -0,0 +1,15 @@
+using System;
+
+namespace ModSink.Common.Models
+{
+    [Serializable]
+    public abstract class WithBaseUri
+    {
+        public Uri BaseUri { get; set; }
+
+        public Uri CombineBaseUri(Uri relative)
+        {
+            return new Uri(BaseUri, relative);
+        }
+    }
+}