Merge branch 'develop' into stable

4 files changed, 56 insertions, 7 deletions

diff --git a/src/SMAPI.Web/Framework/Clients/ModDrop/ModDropClient.cs b/src/SMAPI.Web/Framework/Clients/ModDrop/ModDropClient.cs
index c60b2c90..f5a5f930 100644
--- a/src/SMAPI.Web/Framework/Clients/ModDrop/ModDropClient.cs
+++ b/src/SMAPI.Web/Framework/Clients/ModDrop/ModDropClient.cs
@@ -42,7 +42,7 @@ namespace StardewModdingAPI.Web.Framework.Clients.ModDrop
 
         /// <summary>Get update check info about a mod.</summary>
         /// <param name="id">The mod ID.</param>
-        [SuppressMessage("ReSharper", "ConstantConditionalAccessQualifier", Justification = "The nullability is validated in this method.")]
+        [SuppressMessage("ReSharper", "ConditionalAccessQualifierIsNonNullableAccordingToAPIContract", Justification = "The nullability is validated in this method.")]
         public async Task<IModPage?> GetModData(string id)
         {
             IModPage page = new GenericModPage(this.SiteKey, id);
diff --git a/src/SMAPI.Web/Framework/LogParsing/LogParser.cs b/src/SMAPI.Web/Framework/LogParsing/LogParser.cs
index 55272b23..0efa62c5 100644
--- a/src/SMAPI.Web/Framework/LogParsing/LogParser.cs
+++ b/src/SMAPI.Web/Framework/LogParsing/LogParser.cs
@@ -77,8 +77,8 @@ namespace StardewModdingAPI.Web.Framework.LogParsing
                 };
 
                 // parse log messages
-                LogModInfo smapiMod = new(name: "SMAPI", author: "Pathoschild", version: "", description: "", loaded: true);
-                LogModInfo gameMod = new(name: "game", author: "", version: "", description: "", loaded: true);
+                LogModInfo smapiMod = new(name: "SMAPI", author: "Pathoschild", version: "", description: "", loaded: true, isMod: false);
+                LogModInfo gameMod = new(name: "game", author: "", version: "", description: "", loaded: true, isMod: false);
                 IDictionary<string, List<LogModInfo>> mods = new Dictionary<string, List<LogModInfo>>();
                 bool inModList = false;
                 bool inContentPackList = false;
@@ -200,6 +200,8 @@ namespace StardewModdingAPI.Web.Framework.LogParsing
                             log.GameVersion = match.Groups["gameVersion"].Value;
                             log.OperatingSystem = match.Groups["os"].Value;
                             smapiMod.OverrideVersion(log.ApiVersion);
+
+                            log.ApiVersionParsed = smapiMod.GetParsedVersion();
                         }
 
                         // mod path line
diff --git a/src/SMAPI.Web/Framework/LogParsing/Models/LogModInfo.cs b/src/SMAPI.Web/Framework/LogParsing/Models/LogModInfo.cs
index a6b9165c..557f08ff 100644
--- a/src/SMAPI.Web/Framework/LogParsing/Models/LogModInfo.cs
+++ b/src/SMAPI.Web/Framework/LogParsing/Models/LogModInfo.cs
@@ -1,4 +1,6 @@
+using System;
 using System.Diagnostics.CodeAnalysis;
+using StardewModdingAPI.Toolkit;
 
 namespace StardewModdingAPI.Web.Framework.LogParsing.Models
 {
@@ -6,6 +8,13 @@ namespace StardewModdingAPI.Web.Framework.LogParsing.Models
     public class LogModInfo
     {
         /*********
+        ** Private fields
+        *********/
+        /// <summary>The parsed mod version, if valid.</summary>
+        private Lazy<ISemanticVersion?> ParsedVersionImpl;
+
+
+        /*********
         ** Accessors
         *********/
         /// <summary>The mod name.</summary>
@@ -39,9 +48,15 @@ namespace StardewModdingAPI.Web.Framework.LogParsing.Models
         [MemberNotNullWhen(true, nameof(LogModInfo.UpdateVersion), nameof(LogModInfo.UpdateLink))]
         public bool HasUpdate => this.UpdateVersion != null && this.Version != this.UpdateVersion;
 
-        /// <summary>Whether the mod is a content pack for another mod.</summary>
+        /// <summary>Whether this is an actual mod (rather than a special entry for SMAPI or the game itself).</summary>
+        public bool IsMod { get; }
+
+        /// <summary>Whether this is a C# code mod.</summary>
+        public bool IsCodeMod { get; }
+
+        /// <summary>Whether this is a content pack for another mod.</summary>
         [MemberNotNullWhen(true, nameof(LogModInfo.ContentPackFor))]
-        public bool IsContentPack => !string.IsNullOrWhiteSpace(this.ContentPackFor);
+        public bool IsContentPack { get; }
 
 
         /*********
@@ -57,17 +72,26 @@ namespace StardewModdingAPI.Web.Framework.LogParsing.Models
         /// <param name="contentPackFor">The name of the mod for which this is a content pack (if applicable).</param>
         /// <param name="errors">The number of errors logged by this mod.</param>
         /// <param name="loaded">Whether the mod was loaded into the game.</param>
-        public LogModInfo(string name, string author, string version, string description, string? updateVersion = null, string? updateLink = null, string? contentPackFor = null, int errors = 0, bool loaded = true)
+        /// <param name="isMod">Whether this is an actual mod (instead of a special entry for SMAPI or the game).</param>
+        public LogModInfo(string name, string author, string version, string description, string? updateVersion = null, string? updateLink = null, string? contentPackFor = null, int errors = 0, bool loaded = true, bool isMod = true)
         {
             this.Name = name;
             this.Author = author;
-            this.Version = version;
             this.Description = description;
             this.UpdateVersion = updateVersion;
             this.UpdateLink = updateLink;
             this.ContentPackFor = contentPackFor;
             this.Errors = errors;
             this.Loaded = loaded;
+
+            if (isMod)
+            {
+                this.IsMod = true;
+                this.IsContentPack = !string.IsNullOrWhiteSpace(this.ContentPackFor);
+                this.IsCodeMod = !this.IsContentPack;
+            }
+
+            this.OverrideVersion(version);
         }
 
         /// <summary>Add an update alert for this mod.</summary>
@@ -81,9 +105,29 @@ namespace StardewModdingAPI.Web.Framework.LogParsing.Models
 
         /// <summary>Override the version number, for cases like SMAPI itself where the version is only known later during parsing.</summary>
         /// <param name="version">The new mod version.</param>
+        [MemberNotNull(nameof(LogModInfo.Version), nameof(LogModInfo.ParsedVersionImpl))]
         public void OverrideVersion(string version)
         {
             this.Version = version;
+            this.ParsedVersionImpl = new Lazy<ISemanticVersion?>(this.ParseVersion);
+        }
+
+        /// <summary>Get the semantic version for this mod, if it's valid.</summary>
+        public ISemanticVersion? GetParsedVersion()
+        {
+            return this.ParsedVersionImpl.Value;
+        }
+
+
+        /*********
+        ** Private methods
+        *********/
+        /// <summary>Get the semantic version for this mod, if it's valid.</summary>
+        public ISemanticVersion? ParseVersion()
+        {
+            return !string.IsNullOrWhiteSpace(this.Version) && SemanticVersion.TryParse(this.Version, out ISemanticVersion? version)
+                ? version
+                : null;
         }
     }
 }
diff --git a/src/SMAPI.Web/Framework/LogParsing/Models/ParsedLog.cs b/src/SMAPI.Web/Framework/LogParsing/Models/ParsedLog.cs
index 6951e434..3f649199 100644
--- a/src/SMAPI.Web/Framework/LogParsing/Models/ParsedLog.cs
+++ b/src/SMAPI.Web/Framework/LogParsing/Models/ParsedLog.cs
@@ -28,6 +28,9 @@ namespace StardewModdingAPI.Web.Framework.LogParsing.Models
         /// <summary>The SMAPI version.</summary>
         public string? ApiVersion { get; set; }
 
+        /// <summary>The parsed SMAPI version, if it's valid.</summary>
+        public ISemanticVersion? ApiVersionParsed { get; set; }
+
         /// <summary>The game version.</summary>
         public string? GameVersion { get; set; }