refactoring

Author: fgsfds

Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Version>1.3.1</Version>
+    <Version>1.3.2</Version>
     <TargetFramework>net9.0</TargetFramework>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>

Web.Blazor/ControllersV2/AddonsController.cs renamed to Web.Blazor/Controllers/AddonsController.cs

@@ -3,7 +3,7 @@
 using MediatR;
 using Microsoft.AspNetCore.Mvc;
 
-namespace Web.Blazor.ControllersV2;
+namespace Web.Blazor.Controllers;
 
 [ApiController]
 [Route("api/addons")]

Web.Blazor/ControllersV2/ReleasesController.cs renamed to Web.Blazor/Controllers/ReleasesController.cs

@@ -3,7 +3,7 @@
 using MediatR;
 using Microsoft.AspNetCore.Mvc;
 
-namespace Web.Blazor.ControllersV2;
+namespace Web.Blazor.Controllers;
 
 [ApiController]
 [Route("api/releases")]

Web.Blazor/ControllersV1/AddonsController.cs

@@ -1,7 +1,6 @@
 using Amazon.Runtime;
 using Amazon.S3;
 using Amazon.S3.Model;
-using Common.Helpers;
 
 namespace Web.Blazor.Helpers;
 

Web.Blazor/ControllersV1/ReleasesController.cs

@@ -56,10 +56,10 @@ public static void Main(string[] args)
         _ = builder.Services.AddSingleton<DatabaseAddonsRetriever>();
         _ = builder.Services.AddSingleton<IRetriever<Dictionary<PortEnum, GeneralReleaseEntity>?>>();
 
-        _ = builder.Services.AddSingleton<HttpClient>(CreateHttpClient);
+        _ = builder.Services.AddSingleton(CreateHttpClient);
         _ = builder.Services.AddSingleton<S3Client>();
 
-        _ = builder.Services.AddSingleton<DatabaseContextFactory>(x => new(builder.Environment.IsDevelopment()));
+        _ = builder.Services.AddSingleton<DatabaseContextFactory>(_ => new(builder.Environment.IsDevelopment()));
 
         _ = builder.Services.AddMediatR(cfg => cfg.RegisterServicesFromAssemblyContaining<Program>());
 

Web.Blazor/ControllersV1/StorageController.cs

@@ -13,7 +13,7 @@ public sealed class DatabaseAddonsRetriever
     private readonly ILogger<DatabaseAddonsRetriever> _logger;
     private readonly DatabaseContextFactory _dbContextFactory;
 
-    public GeneralReleaseEntity? AppRelease { get; private set; }
+    public GeneralReleaseEntity? AppRelease { get; }
 
     public DatabaseAddonsRetriever(
         ILogger<DatabaseAddonsRetriever> logger,
@@ -123,7 +123,7 @@ internal int IncreaseNumberOfInstalls(string addonId)
         }
         else
         {
-            fix.Installs += 1;
+            fix.Installs++;
             newInstalls = fix.Installs;
         }
 

Web.Blazor/Helpers/S3Client.cs

@@ -1,5 +1,3 @@
 namespace Addons.Addons;
 
-public sealed class StandaloneAddon : BaseAddon
-{
-}
+public sealed class StandaloneAddon : BaseAddon;

Web.Blazor/Program.cs

@@ -82,7 +82,7 @@ private static bool CheckDependencies(
                     {
                         continue;
                     }
-                    
+
                     if (dependentAddon.Value is null)
                     {
                         passedDependenciesCount++;
@@ -107,54 +107,52 @@ private static bool CheckDependencies(
     /// </summary>
     private static bool CheckIncompatibles(AutoloadMod autoloadMod, IAddon campaign, Dictionary<AddonVersion, IAddon> mods)
     {
-        if (autoloadMod.IncompatibleAddons is not null)
+        if (autoloadMod.IncompatibleAddons is null)
+        {
+            return true;
+        }
+
+        foreach (var incompatibleAddon in autoloadMod.IncompatibleAddons)
         {
-            foreach (var incompatibleAddon in autoloadMod.IncompatibleAddons)
+            //What a fucking mess...
+            //if campaign id equals addon id
+            if (campaign.Id.Equals(incompatibleAddon.Key, StringComparison.InvariantCultureIgnoreCase) &&
+                //AND either incompatible addon's version is null
+                (incompatibleAddon.Value is null ||
+                //OR campaign's version is null
+                campaign.Version is null ||
+                //OR addon's and campaigns's versions match
+                VersionComparer.Compare(campaign.Version, incompatibleAddon.Value)
+                ))
             {
-                //What a fucking mess...
-                //if campaign id equals addon id
-                if (campaign.Id.Equals(incompatibleAddon.Key, StringComparison.InvariantCultureIgnoreCase) &&
-                    //AND either incompatible addon's version is null
-                    (incompatibleAddon.Value is null ||
-                    //OR campaign's version is null
-                    campaign.Version is null ||
-                    //OR addon's version is not null and matches the comparer
-                    (incompatibleAddon.Value is not null && VersionComparer.Compare(campaign.Version, incompatibleAddon.Value))
-                    ))
+                //the addon is incompatible
+                return false;
+            }
+
+            foreach (var addon in mods)
+            {
+                if (incompatibleAddon.Key != addon.Key.Id)
                 {
-                    //the addon is incompatible
-                    return false;
+                    continue;
                 }
 
-                foreach (var addon in mods)
+                if (addon.Value is AutoloadMod aMod &&
+                    !aMod.IsEnabled)
                 {
-                    if (incompatibleAddon.Key != addon.Key.Id)
-                    {
-                        continue;
-                    }
+                    continue;
+                }
 
-                    if (addon.Value is AutoloadMod aMod &&
-                        !aMod.IsEnabled)
-                    {
-                        continue;
-                    }
-                    
-                    if (incompatibleAddon.Value is null)
-                    {
-                        return false;
-                    }
-                    else if (VersionComparer.Compare(addon.Key.Version, incompatibleAddon.Value))
-                    {
-                        return false;
-                    }
+                if (incompatibleAddon.Value is null)
+                {
+                    return false;
+                }
+                else if (VersionComparer.Compare(addon.Key.Version, incompatibleAddon.Value))
+                {
+                    return false;
                 }
             }
-
-            return true;
-        }
-        else
-        {
-            return true;
         }
+
+        return true;
     }
 }

Web.Blazor/Providers/DatabaseAddonsRetriever.cs

@@ -142,7 +142,7 @@ public ImmutableList<IDownloadableAddon> GetDownloadableAddons(AddonTypeEnum add
                 {
                     downloadableAddon.Value.HasNewerVersion = true;
 
-                    if (VersionComparer.Compare(downloadableAddon.Value.Version, existingVersion!, "<="))
+                    if (VersionComparer.Compare(downloadableAddon.Value.Version, existingVersion, "<="))
                     {
                         downloadableAddon.Value.HasNewerVersion = false;
                         break;

src/Addons/Addons/StandaloneAddon.cs

@@ -31,7 +31,7 @@ public sealed class InstalledAddonsProvider : IInstalledAddonsProvider
 
     public event AddonChanged? AddonsChangedEvent;
 
-    [Obsolete($"Don't create directly. Use {nameof(InstalledAddonsProvider)}.")]
+    [Obsolete($"Don't create directly. Use {nameof(InstalledAddonsProviderFactory)}.")]
     public InstalledAddonsProvider(
         IGame game,
         IConfigProvider config,