added support for favorite addons, addon id refactoring

Author: fgsfds

Web.Blazor/Pages/Error.cshtml.cs

@@ -1,6 +1,6 @@
-using Microsoft.AspNetCore.Mvc;
+using System.Diagnostics;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
-using System.Diagnostics;
 
 namespace Web.Blazor.Pages;
 

Web.Blazor/Providers/DatabaseAddonsRetriever.cs

@@ -1,11 +1,11 @@
-using Common.Common.Serializable.Downloadable;
+using System.Diagnostics;
+using Common.Common.Serializable.Downloadable;
 using Common.Enums;
 using Common.Serializable.Addon;
 using CommunityToolkit.Diagnostics;
 using Database.Server;
 using Database.Server.DbEntities;
 using Microsoft.EntityFrameworkCore;
-using System.Diagnostics;
 
 namespace Web.Blazor.Providers;
 

src/Addons/Addons/BaseAddonEntity.cs

@@ -1,8 +1,8 @@
-using Common;
+using System.Collections.Immutable;
+using System.Text;
+using Common;
 using Common.Enums;
 using Common.Interfaces;
-using System.Collections.Immutable;
-using System.Text;
 
 namespace Addons.Addons;
 
@@ -11,6 +11,9 @@ namespace Addons.Addons;
 /// </summary>
 public abstract class BaseAddonEntity : IAddon
 {
+    /// <inheritdoc/>
+    public required AddonId AddonId { get; init; }
+
     /// <inheritdoc/>
     public required AddonTypeEnum Type { get; init; }
 
@@ -20,15 +23,9 @@ public abstract class BaseAddonEntity : IAddon
     /// <inheritdoc/>
     public required ImmutableArray<FeatureEnum>? RequiredFeatures { get; init; }
 
-    /// <inheritdoc/>
-    public required string Id { get; init; }
-
     /// <inheritdoc/>
     public required string Title { get; init; }
 
-    /// <inheritdoc/>
-    public required string? Version { get; init; }
-
     /// <inheritdoc/>
     public required string? Author { get; init; }
 
@@ -62,6 +59,9 @@ public abstract class BaseAddonEntity : IAddon
     /// <inheritdoc/>
     public required bool IsFolder { get; init; }
 
+    /// <inheritdoc/>
+    public bool IsFavorite { get; set; }
+
     /// <inheritdoc/>
     public required IReadOnlyDictionary<OSEnum, string>? Executables { get; init; }
 
@@ -76,9 +76,9 @@ public string ToMarkdownString()
     {
         StringBuilder description = new($"## {Title}");
 
-        if (Version is not null)
+        if (AddonId.Version is not null)
         {
-            _ = description.Append($"{Environment.NewLine}{Environment.NewLine}#### v{Version}");
+            _ = description.Append($"{Environment.NewLine}{Environment.NewLine}#### v{AddonId.Version}");
         }
 
         if (Author is not null)

src/Addons/DI/ProvidersBindings.cs

@@ -9,5 +9,6 @@ public static void Load(ServiceCollection container)
     {
         _ = container.AddSingleton<InstalledAddonsProviderFactory>();
         _ = container.AddSingleton<DownloadableAddonsProviderFactory>();
+        _ = container.AddSingleton<OriginalCampaignsProvider>();
     }
 }

src/Addons/Helpers/AutoloadModsValidator.cs

@@ -15,7 +15,7 @@ public static class AutoloadModsValidator
     /// <param name="campaign">Campaign</param>
     /// <param name="mods">Autoload mods</param>
     /// <param name="features">Features supported by the port</param>
-    public static bool ValidateAutoloadMod(AutoloadModEntity autoloadMod, IAddon campaign, IEnumerable<KeyValuePair<AddonVersion, IAddon>> mods, List<FeatureEnum> features)
+    public static bool ValidateAutoloadMod(AutoloadModEntity autoloadMod, IAddon campaign, IEnumerable<KeyValuePair<AddonId, IAddon>> mods, List<FeatureEnum> features)
     {
         if (!autoloadMod.IsEnabled)
         {
@@ -61,16 +61,16 @@ public static bool ValidateAutoloadMod(AutoloadModEntity autoloadMod, IAddon cam
     private static bool CheckDependencies(
         AutoloadModEntity autoloadMod,
         IAddon campaign,
-        IEnumerable<KeyValuePair<AddonVersion, IAddon>> mods)
+        IEnumerable<KeyValuePair<AddonId, IAddon>> mods)
     {
         if (autoloadMod.DependentAddons is not null)
         {
             byte passedDependenciesCount = 0;
 
             foreach (var dependentAddon in autoloadMod.DependentAddons)
             {
-                if (dependentAddon.Key.Equals(campaign.Id, StringComparison.InvariantCultureIgnoreCase) &&
-                    (dependentAddon.Value is null || VersionComparer.Compare(campaign.Version, dependentAddon.Value)))
+                if (dependentAddon.Key.Equals(campaign.AddonId.Id, StringComparison.InvariantCultureIgnoreCase) &&
+                    (dependentAddon.Value is null || VersionComparer.Compare(campaign.AddonId.Version, dependentAddon.Value)))
                 {
                     passedDependenciesCount++;
                     continue;
@@ -108,7 +108,7 @@ private static bool CheckDependencies(
     private static bool CheckIncompatibles(
         AutoloadModEntity autoloadMod,
         IAddon campaign,
-        IEnumerable<KeyValuePair<AddonVersion,
+        IEnumerable<KeyValuePair<AddonId,
             IAddon>> mods
         )
     {
@@ -121,13 +121,13 @@ private static bool CheckIncompatibles(
         {
             //What a fucking mess...
             //if campaign id equals addon id
-            if (campaign.Id.Equals(incompatibleAddon.Key, StringComparison.InvariantCultureIgnoreCase) &&
+            if (campaign.AddonId.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 ||
+                campaign.AddonId.Version is null ||
                 //OR addon's and campaigns's versions match
-                VersionComparer.Compare(campaign.Version, incompatibleAddon.Value)
+                VersionComparer.Compare(campaign.AddonId.Version, incompatibleAddon.Value)
                 ))
             {
                 //the addon is incompatible

src/Addons/Providers/DownloadableAddonsProvider.cs

@@ -1,4 +1,5 @@
-using Common;
+using System.Collections.Immutable;
+using Common;
 using Common.Client.Helpers;
 using Common.Client.Interfaces;
 using Common.Client.Tools;
@@ -8,7 +9,6 @@
 using Common.Interfaces;
 using CommunityToolkit.Diagnostics;
 using Microsoft.Extensions.Logging;
-using System.Collections.Immutable;
 
 namespace Addons.Providers;
 
@@ -23,7 +23,7 @@ public sealed class DownloadableAddonsProvider : IDownloadableAddonsProvider
     private readonly InstalledAddonsProvider _installedAddonsProvider;
     private readonly ILogger _logger;
 
-    private Dictionary<AddonTypeEnum, Dictionary<AddonVersion, DownloadableAddonJsonModel>>? _cache;
+    private Dictionary<AddonTypeEnum, Dictionary<AddonId, DownloadableAddonJsonModel>>? _cache;
 
     private static readonly SemaphoreSlim _semaphore = new(1);
 

src/Addons/Providers/GrpInfoProvider.cs

@@ -1,4 +1,5 @@
 using Addons.Addons;
+using Common;
 using Common.Enums;
 using Common.Enums.Versions;
 using Common.Interfaces;
@@ -39,16 +40,17 @@ public static List<IAddon> GetAddonsFromGrpInfo(List<string> foldersGrpInfos)
                     continue;
                 }
 
+                AddonId version = new(addon.Name.ToLower().Replace(" ", "_"), null);
+
                 DukeCampaignEntity camp = new()
                 {
-                    Id = addon.Name.ToLower().Replace(" ", "_"),
+                    AddonId = version,
                     Type = AddonTypeEnum.TC,
                     SupportedGame = new(GameEnum.Duke3D, addon.DukeVersion),
                     Title = addon.Name,
                     GridImageHash = null,
                     PreviewImageHash = null,
                     Description = null,
-                    Version = null,
                     Author = null,
                     PathToFile = grp,
                     DependentAddons = null,
@@ -61,7 +63,8 @@ public static List<IAddon> GetAddonsFromGrpInfo(List<string> foldersGrpInfos)
                     RTS = null,
                     RequiredFeatures = [FeatureEnum.EDuke32_CON],
                     IsFolder = false,
-                    Executables = null
+                    Executables = null,
+                    IsFavorite = false
                 };
 
                 newAddons.Add(camp);