Moved generic code to Atom package + minor changes

hwndmaster · Aug 13, 2021 · b0471c2 · b0471c2
1 parent d4ae2a1
commit b0471c2
Show file tree

Hide file tree

Showing 98 changed files with 248 additions and 1,893 deletions.
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -8,11 +8,16 @@
     <PackageReference Update="Microsoft.Extensions.Logging" Version="5.0.0" />
     <PackageReference Update="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" />
 
+    <!-- Atom Framework -->
+    <PackageReference Update="Genius.Atom.Infrastructure" Version="0.0.2" />
+    <PackageReference Update="Genius.Atom.UI.Forms" Version="0.0.2" />
+
     <!-- Misc -->
-    <PackageReference Update="Humanizer.Core" Version="2.10.1" />
-    <PackageReference Update="MahApps.Metro" Version="2.4.5" />
-    <PackageReference Update="WpfAnimatedGif" Version="2.0.0" />
-    <PackageReference Update="ReactiveUI" Version="13.3.2" />
+    <PackageReference Update="Hardcodet.NotifyIcon.Wpf" Version="1.1.0" />
+    <PackageReference Update="Humanizer.Core" Version="2.11.10" />
+    <PackageReference Update="MahApps.Metro" Version="2.4.7" />
+    <PackageReference Update="ReactiveUI" Version="14.3.1" />
+    <PackageReference Update="ReactiveUI.WPF" Version="14.3.1" />
   </ItemGroup>
 
   <!-- Automated Testing components -->
@@ -23,12 +28,12 @@
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.0.1">
+    <PackageReference Include="coverlet.collector" Version="3.1.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
 
-    <PackageReference Include="AutoFixture" Version="4.16.0" />
+    <PackageReference Include="AutoFixture" Version="4.17.0" />
     <PackageReference Include="Moq" Version="4.16.1" />
   </ItemGroup>
 

diff --git a/PriceChecker.Core.Tests/PriceChecker.Core.Tests.csproj b/PriceChecker.Core.Tests/PriceChecker.Core.Tests.csproj
@@ -8,7 +8,10 @@
 
   <ItemGroup>
     <ProjectReference Include="..\PriceChecker.Core\PriceChecker.Core.csproj" />
-    <ProjectReference Include="..\PriceChecker.Infrastructure\PriceChecker.Infrastructure.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Genius.Atom.Infrastructure" />
   </ItemGroup>
 
 </Project>
diff --git a/PriceChecker.Core.Tests/Repositories/AgentRepositoryTests.cs b/PriceChecker.Core.Tests/Repositories/AgentRepositoryTests.cs
@@ -2,11 +2,11 @@
 using System.Collections.Generic;
 using System.Linq;
 using AutoFixture;
+using Genius.Atom.Infrastructure.Events;
 using Genius.PriceChecker.Core.Messages;
 using Genius.PriceChecker.Core.Models;
 using Genius.PriceChecker.Core.Repositories;
 using Genius.PriceChecker.Core.Services;
-using Genius.PriceChecker.Infrastructure.Events;
 using Microsoft.Extensions.Logging;
 using Moq;
 using Xunit;
@@ -19,9 +19,7 @@ public class AgentRepositoryTests
         private readonly Fixture _fixture = new();
         private readonly Mock<IEventBus> _eventBusMock = new();
         private readonly Mock<IPersister> _persisterMock = new();
-        private readonly Mock<IAgentRepository> _agentRepoMock = new();
 
-        private readonly List<Product> _products = new();
         private readonly List<Agent> _agents = new();
 
         public AgentRepositoryTests()

diff --git a/PriceChecker.Core.Tests/Repositories/ProductRepositoryTests.cs b/PriceChecker.Core.Tests/Repositories/ProductRepositoryTests.cs
@@ -6,7 +6,7 @@
 using Genius.PriceChecker.Core.Models;
 using Genius.PriceChecker.Core.Repositories;
 using Genius.PriceChecker.Core.Services;
-using Genius.PriceChecker.Infrastructure.Events;
+using Genius.Atom.Infrastructure.Events;
 using Microsoft.Extensions.Logging;
 using Moq;
 using Xunit;

diff --git a/PriceChecker.Core.Tests/Repositories/SettingsRepositoryTests.cs b/PriceChecker.Core.Tests/Repositories/SettingsRepositoryTests.cs
@@ -4,7 +4,7 @@
 using Genius.PriceChecker.Core.Models;
 using Genius.PriceChecker.Core.Repositories;
 using Genius.PriceChecker.Core.Services;
-using Genius.PriceChecker.Infrastructure.Events;
+using Genius.Atom.Infrastructure.Events;
 using Microsoft.Extensions.Logging;
 using Moq;
 using Xunit;

diff --git a/PriceChecker.Core/Messages/AgentDeletedEvent.cs b/PriceChecker.Core/Messages/AgentDeletedEvent.cs
@@ -1,5 +1,5 @@
 using Genius.PriceChecker.Core.Models;
-using Genius.PriceChecker.Infrastructure.Events;
+using Genius.Atom.Infrastructure.Events;
 
 namespace Genius.PriceChecker.Core.Messages
 {

diff --git a/PriceChecker.Core/Messages/AgentsUpdatedEvent.cs b/PriceChecker.Core/Messages/AgentsUpdatedEvent.cs
@@ -1,4 +1,4 @@
-using Genius.PriceChecker.Infrastructure.Events;
+using Genius.Atom.Infrastructure.Events;
 
 namespace Genius.PriceChecker.Core.Messages
 {

diff --git a/PriceChecker.Core/Messages/ProductAddedEvent.cs b/PriceChecker.Core/Messages/ProductAddedEvent.cs
@@ -1,5 +1,5 @@
 using Genius.PriceChecker.Core.Models;
-using Genius.PriceChecker.Infrastructure.Events;
+using Genius.Atom.Infrastructure.Events;
 
 namespace Genius.PriceChecker.Core.Messages
 {

diff --git a/PriceChecker.Core/Messages/ProductAutoScanStartedEvent.cs b/PriceChecker.Core/Messages/ProductAutoScanStartedEvent.cs
@@ -1,4 +1,4 @@
-using Genius.PriceChecker.Infrastructure.Events;
+using Genius.Atom.Infrastructure.Events;
 
 namespace Genius.PriceChecker.Core.Messages
 {

diff --git a/PriceChecker.Core/Messages/ProductScanFailedEvent.cs b/PriceChecker.Core/Messages/ProductScanFailedEvent.cs
@@ -1,5 +1,5 @@
 using Genius.PriceChecker.Core.Models;
-using Genius.PriceChecker.Infrastructure.Events;
+using Genius.Atom.Infrastructure.Events;
 
 namespace Genius.PriceChecker.Core.Messages
 {

diff --git a/PriceChecker.Core/Messages/ProductScanStartedEvent.cs b/PriceChecker.Core/Messages/ProductScanStartedEvent.cs
@@ -1,5 +1,5 @@
 using Genius.PriceChecker.Core.Models;
-using Genius.PriceChecker.Infrastructure.Events;
+using Genius.Atom.Infrastructure.Events;
 
 namespace Genius.PriceChecker.Core.Messages
 {

diff --git a/PriceChecker.Core/Messages/ProductScannedEvent.cs b/PriceChecker.Core/Messages/ProductScannedEvent.cs
@@ -1,5 +1,5 @@
 using Genius.PriceChecker.Core.Models;
-using Genius.PriceChecker.Infrastructure.Events;
+using Genius.Atom.Infrastructure.Events;
 
 namespace Genius.PriceChecker.Core.Messages
 {

diff --git a/PriceChecker.Core/Messages/ProductUpdatedEvent.cs b/PriceChecker.Core/Messages/ProductUpdatedEvent.cs
@@ -1,5 +1,5 @@
 using Genius.PriceChecker.Core.Models;
-using Genius.PriceChecker.Infrastructure.Events;
+using Genius.Atom.Infrastructure.Events;
 
 namespace Genius.PriceChecker.Core.Messages
 {

diff --git a/PriceChecker.Core/Messages/SettingsUpdatedEvent.cs b/PriceChecker.Core/Messages/SettingsUpdatedEvent.cs
@@ -1,5 +1,5 @@
 using Genius.PriceChecker.Core.Models;
-using Genius.PriceChecker.Infrastructure.Events;
+using Genius.Atom.Infrastructure.Events;
 
 namespace Genius.PriceChecker.Core.Messages
 {

diff --git a/PriceChecker.Core/PriceChecker.Core.csproj b/PriceChecker.Core/PriceChecker.Core.csproj
@@ -15,12 +15,9 @@
     <None Include="..\agents.json" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\PriceChecker.Infrastructure\PriceChecker.Infrastructure.csproj" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
+    <PackageReference Include="Genius.Atom.Infrastructure" />
   </ItemGroup>
 </Project>
diff --git a/PriceChecker.Core/Repositories/AgentRepository.cs b/PriceChecker.Core/Repositories/AgentRepository.cs
@@ -1,10 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Genius.Atom.Infrastructure.Events;
 using Genius.PriceChecker.Core.Messages;
 using Genius.PriceChecker.Core.Models;
 using Genius.PriceChecker.Core.Services;
-using Genius.PriceChecker.Infrastructure.Events;
 using Microsoft.Extensions.Logging;
 
 namespace Genius.PriceChecker.Core.Repositories

diff --git a/PriceChecker.Core/Repositories/ProductRepository.cs b/PriceChecker.Core/Repositories/ProductRepository.cs
@@ -4,7 +4,7 @@
 using Genius.PriceChecker.Core.Messages;
 using Genius.PriceChecker.Core.Models;
 using Genius.PriceChecker.Core.Services;
-using Genius.PriceChecker.Infrastructure.Events;
+using Genius.Atom.Infrastructure.Events;
 using Microsoft.Extensions.Logging;
 
 namespace Genius.PriceChecker.Core.Repositories

diff --git a/PriceChecker.Core/Repositories/SettingsRepository.cs b/PriceChecker.Core/Repositories/SettingsRepository.cs
@@ -2,7 +2,7 @@
 using Genius.PriceChecker.Core.Messages;
 using Genius.PriceChecker.Core.Models;
 using Genius.PriceChecker.Core.Services;
-using Genius.PriceChecker.Infrastructure.Events;
+using Genius.Atom.Infrastructure.Events;
 using Microsoft.Extensions.Logging;
 
 namespace Genius.PriceChecker.Core.Repositories

diff --git a/PriceChecker.Core/Services/ProductPriceManager.cs b/PriceChecker.Core/Services/ProductPriceManager.cs
@@ -7,7 +7,7 @@
 using Genius.PriceChecker.Core.Messages;
 using Genius.PriceChecker.Core.Models;
 using Genius.PriceChecker.Core.Repositories;
-using Genius.PriceChecker.Infrastructure.Events;
+using Genius.Atom.Infrastructure.Events;
 using Microsoft.Extensions.Logging;
 
 namespace Genius.PriceChecker.Core.Services

diff --git a/PriceChecker.Core/Services/TrickyHttpClient.cs b/PriceChecker.Core/Services/TrickyHttpClient.cs
@@ -82,14 +82,14 @@ private async Task<string> DownloadInternal(string url, CancellationToken cancel
             return null;
         }
 
-        private string CreateRandomUserAgent()
+        private static string CreateRandomUserAgent()
         {
             var platform = new [] { "Machintosh", "Windows", "X11" }.TakeRandom();
             var os = (platform switch {
                 "Machintosh" => new [] { "68K", "PPC" },
                 "Windows" => new [] { "Win3.11", "WinNT3.51", "WinNT4.0", "Windows NT 5.0", "Windows NT 5.1", "Windows NT 5.2", "Windows NT 6.0", "Windows NT 6.1", "Windows NT 6.2", "Win95", "Win98", "Win 9x 4.90", "WindowsCE" },
                 "X11" => new [] { "Linux i686", "Linux x86_64" },
-                _ => new string[] {}
+                _ => Array.Empty<string>()
             }).TakeRandom();
             var browser = new [] { "Chrome", "Firefox", "IE" }.TakeRandom();
 

diff --git a/PriceChecker.Infrastructure/CompositeDisposable.cs b/PriceChecker.Infrastructure/CompositeDisposable.cs
diff --git a/PriceChecker.Infrastructure/DisposableAction.cs b/PriceChecker.Infrastructure/DisposableAction.cs
diff --git a/PriceChecker.Infrastructure/Events/EventBus.cs b/PriceChecker.Infrastructure/Events/EventBus.cs
diff --git a/PriceChecker.Infrastructure/Events/EventPublishedArgs.cs b/PriceChecker.Infrastructure/Events/EventPublishedArgs.cs
diff --git a/PriceChecker.Infrastructure/Events/IEventMessage.cs b/PriceChecker.Infrastructure/Events/IEventMessage.cs
diff --git a/PriceChecker.Infrastructure/ExpressionHelpers.cs b/PriceChecker.Infrastructure/ExpressionHelpers.cs