From d813c4e2c8522584beaf1432725b4cdd2cc251b5 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Mon, 8 Aug 2022 22:27:07 -0400
Subject: fix log parsing for invalid content packs (#860)

---
 .../Framework/LogParsing/Models/LogModInfo.cs      | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

(limited to 'src/SMAPI.Web/Framework/LogParsing/Models/LogModInfo.cs')

diff --git a/src/SMAPI.Web/Framework/LogParsing/Models/LogModInfo.cs b/src/SMAPI.Web/Framework/LogParsing/Models/LogModInfo.cs
index 557f08ff..c81942e4 100644
--- a/src/SMAPI.Web/Framework/LogParsing/Models/LogModInfo.cs
+++ b/src/SMAPI.Web/Framework/LogParsing/Models/LogModInfo.cs
@@ -48,21 +48,24 @@ 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>The mod type.</summary>
+        public ModType ModType { get; }
+
         /// <summary>Whether this is an actual mod (rather than a special entry for SMAPI or the game itself).</summary>
-        public bool IsMod { get; }
+        public bool IsMod => this.ModType != ModType.Special;
 
         /// <summary>Whether this is a C# code mod.</summary>
-        public bool IsCodeMod { get; }
+        public bool IsCodeMod => this.ModType == ModType.CodeMod;
 
         /// <summary>Whether this is a content pack for another mod.</summary>
-        [MemberNotNullWhen(true, nameof(LogModInfo.ContentPackFor))]
-        public bool IsContentPack { get; }
+        public bool IsContentPack => this.ModType == ModType.ContentPack;
 
 
         /*********
         ** Public methods
         *********/
         /// <summary>Construct an instance.</summary>
+        /// <param name="modType">The mod type.</param>
         /// <param name="name">The mod name.</param>
         /// <param name="author">The mod author.</param>
         /// <param name="version">The mod version.</param>
@@ -72,9 +75,9 @@ 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>
-        /// <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)
+        public LogModInfo(ModType modType, string name, string author, string version, string description, string? updateVersion = null, string? updateLink = null, string? contentPackFor = null, int errors = 0, bool loaded = true)
         {
+            this.ModType = modType;
             this.Name = name;
             this.Author = author;
             this.Description = description;
@@ -84,13 +87,6 @@ namespace StardewModdingAPI.Web.Framework.LogParsing.Models
             this.Errors = errors;
             this.Loaded = loaded;
 
-            if (isMod)
-            {
-                this.IsMod = true;
-                this.IsContentPack = !string.IsNullOrWhiteSpace(this.ContentPackFor);
-                this.IsCodeMod = !this.IsContentPack;
-            }
-
             this.OverrideVersion(version);
         }
 
-- 
cgit