Merge branch 'development'

Artemis-RGB · Jul 22, 2024 · a793a08 · a793a08
2 parents 0e911d6 + a45d98c
commit a793a08
Show file tree

Hide file tree

Showing 58 changed files with 1,467 additions and 327 deletions.
diff --git a/src/Artemis.Core/Plugins/PluginInfo.cs b/src/Artemis.Core/Plugins/PluginInfo.cs
@@ -116,6 +116,11 @@ internal PluginInfo()
     [JsonInclude]
     public Version? Api { get; internal init; } = new(1, 0, 0);
 
+    /// <summary>
+    /// Gets the minimum version of Artemis required by this plugin
+    /// </summary>
+    public Version? MinimumVersion { get; internal init; } = new(1, 0, 0);
+
     /// <summary>
     /// Gets the plugin this info is associated with
     /// </summary>
@@ -132,7 +137,7 @@ internal PluginInfo()
     /// Gets a boolean indicating whether this plugin is compatible with the current operating system and API version
     /// </summary>
     [JsonIgnore]
-    public bool IsCompatible => Platforms.MatchesCurrentOperatingSystem() && Api != null && Api.Major >= Constants.PluginApiVersion;
+    public bool IsCompatible => Platforms.MatchesCurrentOperatingSystem() && Api != null && Api.Major >= Constants.PluginApiVersion && MatchesMinimumVersion();
 
     /// <inheritdoc />
     [JsonIgnore]
@@ -156,4 +161,13 @@ public override string ToString()
     {
         return $"{Name} v{Version} - {Guid}";
     }
+
+    private bool MatchesMinimumVersion()
+    {
+        if (Constants.CurrentVersion == "local")
+            return true;
+
+        Version currentVersion = new(Constants.CurrentVersion);
+        return currentVersion >= MinimumVersion;
+    }
 }
diff --git a/src/Artemis.Storage/ArtemisDbContext.cs b/src/Artemis.Storage/ArtemisDbContext.cs
@@ -43,6 +43,12 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
             .HasConversion(
                 v => JsonSerializer.Serialize(v, JsonSerializerOptions),
                 v => JsonSerializer.Deserialize<Dictionary<string, JsonNode>>(v, JsonSerializerOptions) ?? new Dictionary<string, JsonNode>());
+
+        modelBuilder.Entity<EntryEntity>()
+            .Property(e => e.Categories)
+            .HasConversion(
+                v => JsonSerializer.Serialize(v, JsonSerializerOptions),
+                v => JsonSerializer.Deserialize<List<EntryCategoryEntity>>(v, JsonSerializerOptions) ?? new List<EntryCategoryEntity>());
 
         modelBuilder.Entity<ProfileContainerEntity>()
             .Property(e => e.ProfileConfiguration)

diff --git a/src/Artemis.Storage/Entities/Workshop/EntryEntity.cs b/src/Artemis.Storage/Entities/Workshop/EntryEntity.cs
@@ -14,11 +14,20 @@ public class EntryEntity
     public int EntryType { get; set; }
 
     public string Author { get; set; } = string.Empty;
+    public bool IsOfficial { get; set; }
     public string Name { get; set; } = string.Empty;
-
+    public string Summary { get; set; } = string.Empty;
+    public long Downloads { get; set; }
+    public DateTimeOffset CreatedAt { get; set; }
+    public long? LatestReleaseId { get; set; }
+
     public long ReleaseId { get; set; }
     public string ReleaseVersion { get; set; } = string.Empty;
     public DateTimeOffset InstalledAt { get; set; }
-
+    public bool AutoUpdate { get; set; }
+
     public Dictionary<string, JsonNode>? Metadata { get; set; }
-}
+    public List<EntryCategoryEntity>? Categories { get; set; }
+}
+
+public record EntryCategoryEntity(string Name, string Icon);