Merge pull request #71 from j2ghz/develop

Integrate develop

src/ModSink.CLI/Program.cs

@@ -11,8 +11,8 @@
 using Microsoft.Extensions.CommandLineUtils;
 using ModSink.Common;
 using ModSink.Common.Client;
-using ModSink.Common.Models.Group;
-using ModSink.Common.Models.Repo;
+using ModSink.Common.Models.DTO.Group;
+using ModSink.Common.Models.DTO.Repo;
 using Serilog;
 using Serilog.Formatting.Compact;
 using Serilog.Sinks.SystemConsole.Themes;

src/ModSink.Common.Tests/Client/ClientServiceTests.cs

@@ -10,8 +10,8 @@
 using DynamicData;
 using FluentAssertions;
 using ModSink.Common.Client;
-using ModSink.Common.Models.Group;
-using ModSink.Common.Models.Repo;
+using ModSink.Common.Models.DTO.Group;
+using ModSink.Common.Models.DTO.Repo;
 using ReactiveUI.Testing;
 using Serilog;
 using Xunit;
@@ -117,9 +117,9 @@ public void DownloadRepo()
             client.GroupUrls.Items.Should().HaveCount(1);
             client.Repos.Items.Should().HaveCount(1);
             client.QueuedDownloads.Items.Should().HaveCount(0);
-            foreach (var r in client.Repos.Items)
-            foreach (var modpack in r.Modpacks)
-                modpack.Selected = true;
+            //foreach (var r in client.Repos.Items)
+            //foreach (var modpack in r.Modpacks)
+            //    modpack.Selected = true;
 
             client.QueuedDownloads.Items.Should().HaveCount(1);
             client.ActiveDownloads.Items.Should().HaveCount(1);

src/ModSink.Common.Tests/ModSink.Common.Tests.csproj

@@ -9,9 +9,9 @@
     <PackageReference Include="Bogus" Version="26.0.1" />
     <PackageReference Include="FluentAssertions" Version="5.6.0" />
     <PackageReference Include="JetBrains.DotMemoryUnit" Version="3.0.20171219.105559" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
     <PackageReference Include="Moq" Version="4.10.1" />
-    <PackageReference Include="ReactiveUI.Testing" Version="9.11.1" />
+    <PackageReference Include="ReactiveUI.Testing" Version="9.11.3" />
     <PackageReference Include="Serilog.Sinks.Debug" Version="1.0.1" />
     <PackageReference Include="System.Reactive" Version="4.2.0-preview.102" />
     <PackageReference Include="xunit" Version="2.4.1" />

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

@@ -3,13 +3,13 @@
 
 namespace ModSink.Common.Tests.Models.Group
 {
-    public class GroupTests : TestWithFaker<Common.Models.Group.Group>
+    public class GroupTests : TestWithFaker<Common.Models.DTO.Group.Group>
     {
-        public static Faker<Common.Models.Group.Group> GroupFaker = new Faker<Common.Models.Group.Group>()
+        public static Faker<Common.Models.DTO.Group.Group> GroupFaker = new Faker<Common.Models.DTO.Group.Group>()
             .StrictMode(true)
             .RuleFor(g => g.BaseUri, f => new Uri(f.Internet.UrlWithPath()))
             .RuleFor(g => g.RepoInfos, _ => RepoInfoTests.RepoInfoFaker.Generate(3));
 
-        public override Faker<Common.Models.Group.Group> Faker { get; } = GroupFaker;
+        public override Faker<Common.Models.DTO.Group.Group> Faker { get; } = GroupFaker;
     }
 }

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

@@ -1,6 +1,6 @@
 using System;
 using Bogus;
-using ModSink.Common.Models.Group;
+using ModSink.Common.Models.DTO.Group;
 
 namespace ModSink.Common.Tests.Models.Group
 {

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

@@ -1,7 +1,7 @@
 using Bogus;
 using FluentAssertions;
 using FluentAssertions.Primitives;
-using ModSink.Common.Models.Repo;
+using ModSink.Common.Models.DTO.Repo;
 using Xunit;
 
 namespace ModSink.Common.Tests.Models.Repo
@@ -22,8 +22,7 @@ public void SameEqual()
         {
             var a = new FileSignature(new HashValue(new byte[] {0x99, 0xE9, 0xD8, 0x51, 0x37, 0xDB, 0x46, 0xEF}), 355);
             var b = new FileSignature(new HashValue(new byte[] {0x99, 0xE9, 0xD8, 0x51, 0x37, 0xDB, 0x46, 0xEF}), 355);
-            a.Equals(b).Should().BeTrue("FileSignature with same properties should be equal")
-                ;
+            a.Equals(b).Should().BeTrue("FileSignature with same properties should be equal");
         }
     }
 }

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

@@ -1,7 +1,7 @@
 using Bogus;
 using FluentAssertions;
 using FluentAssertions.Primitives;
-using ModSink.Common.Models.Repo;
+using ModSink.Common.Models.DTO.Repo;
 using Xunit;
 
 namespace ModSink.Common.Tests.Models.Repo

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

@@ -1,5 +1,5 @@
 using Bogus;
-using ModSink.Common.Models.Repo;
+using ModSink.Common.Models.DTO.Repo;
 
 namespace ModSink.Common.Tests.Models.Repo
 {

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

@@ -2,7 +2,7 @@
 using System.IO;
 using System.Linq;
 using Bogus;
-using ModSink.Common.Models.Repo;
+using ModSink.Common.Models.DTO.Repo;
 
 namespace ModSink.Common.Tests.Models.Repo
 {

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

@@ -1,14 +1,13 @@
 using Bogus;
-using ModSink.Common.Models.Repo;
+using ModSink.Common.Models.DTO.Repo;
 
 namespace ModSink.Common.Tests.Models.Repo
 {
     public class ModpackTests : TestWithFaker<Modpack>
     {
         public static readonly Faker<Modpack> ModpackFaker = new Faker<Modpack>().StrictMode(true)
             .RuleFor(m => m.Name, f => f.Company.CompanyName())
-            .RuleFor(m => m.Mods, ModEntryTests.ModEntryFaker.Generate(3))
-            .RuleFor(m => m.Selected, f => f.Random.Bool());
+            .RuleFor(m => m.Mods, ModEntryTests.ModEntryFaker.Generate(3));
 
         public override Faker<Modpack> Faker { get; } = ModpackFaker;
     }

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

@@ -5,17 +5,17 @@
 
 namespace ModSink.Common.Tests.Models.Repo
 {
-    public class RepoTests : TestWithFaker<Common.Models.Repo.Repo>
+    public class RepoTests : TestWithFaker<Common.Models.DTO.Repo.Repo>
     {
-        public static readonly Faker<Common.Models.Repo.Repo> RepoFaker =
-            new Faker<Common.Models.Repo.Repo>().StrictMode(true)
+        public static readonly Faker<Common.Models.DTO.Repo.Repo> RepoFaker =
+            new Faker<Common.Models.DTO.Repo.Repo>().StrictMode(true)
                 .RuleFor(r => r.BaseUri, f => new Uri(f.Internet.UrlWithPath()))
                 .RuleFor(r => r.Modpacks, f => ModpackTests.ModpackFaker.Generate(3))
                 .RuleFor(r => r.Files,
                     f => f.Make(3, () => FileSignatureTests.FileSignature)
                         .ToDictionary(fs => fs, fs => new Uri(f.Internet.UrlWithPath())));
 
-        public override Faker<Common.Models.Repo.Repo> Faker { get; } = RepoFaker;
+        public override Faker<Common.Models.DTO.Repo.Repo> Faker { get; } = RepoFaker;
 
         [Fact(Skip = "Test breaks, but it works")]
         public override void IsSerializeable()

src/ModSink.Common.Tests/XXHash64Tests.cs

@@ -1,7 +1,7 @@
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
-using ModSink.Common.Models.Repo;
+using ModSink.Common.Models.DTO.Repo;
 using Xunit;
 
 namespace ModSink.Common.Tests

src/ModSink.Common/Client/ClientService.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Reactive.Disposables;
@@ -8,12 +7,13 @@
 using System.Threading.Tasks;
 using Anotar.Serilog;
 using DynamicData;
-using DynamicData.Kernel;
 using Humanizer;
 using ModSink.Common.Models;
 using ModSink.Common.Models.Client;
-using ModSink.Common.Models.Group;
-using ModSink.Common.Models.Repo;
+using ModSink.Common.Models.DTO.Repo;
+using Group = ModSink.Common.Models.DTO.Group.Group;
+using Modpack = ModSink.Common.Models.Client.Modpack;
+using Repo = ModSink.Common.Models.DTO.Repo.Repo;
 
 namespace ModSink.Common.Client
 {
@@ -48,39 +48,9 @@ public ClientService(IDownloader downloader, IFormatter serializationFormatter,
                     repo => repo.Files.Select(kvp => new OnlineFile(kvp.Key, repo.CombineBaseUri(kvp.Value))),
                     of => of.FileSignature).AsObservableCache();
             d.Add(OnlineFiles);
-            Modpacks = DynamicDataChain.GetModpacksFromRepos(Repos.Connect()).AsObservableCache();
+            Modpacks = Repos.Connect()
+                .TransformMany(r => r.Modpacks.Select(m => new Modpack(m)), m => m.Id).AsObservableCache();
             d.Add(Modpacks);
-            QueuedDownloads = DynamicDataChain.GetDownloadsFromModpacks(Modpacks.Connect())
-                .LeftJoin(filesAvailable.Connect(), f => f,
-                    (required, available) => !available.HasValue
-                        ? Optional<FileSignature>.Create(required)
-                        : Optional<FileSignature>.None)
-                .Filter(opt => opt.HasValue)
-                .Transform(opt => opt.Value)
-                .InnerJoin(OnlineFiles.Connect(), of => of.FileSignature,
-                    (fs, of) => new QueuedDownload(fs, of.Uri))
-                .AsObservableCache();
-            d.Add(QueuedDownloads);
-            ActiveDownloads = QueuedDownloads.Connect()
-                .Sort(Comparer<QueuedDownload>.Create((_, __) => 0))
-                .Top(5)
-                .LogVerbose("activeDownloadsSimple")
-                .Transform(qd =>
-                {
-                    var destination = new Lazy<Stream>(() => GetTemporaryFileStream(qd.FileSignature));
-                    return new ActiveDownload(
-                        downloader.Download(qd.Source, destination,
-                            qd.FileSignature.Length),
-                        () =>
-                        {
-                            destination.Value.Dispose();
-                            LogTo.Verbose("ActiveDownload {name} finished", qd.FileSignature.Hash);
-                            AddNewFile(qd.FileSignature);
-                        }, qd.FileSignature.ToString());
-                })
-                .LogVerbose("activeDownloads")
-                .AsObservableCache();
-            d.Add(ActiveDownloads);
         }
 
         public IObservableCache<ActiveDownload, FileSignature> ActiveDownloads { get; }