From 4da9e954df3846d01aa0536f4e8143466a1d62f3 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Fri, 11 Feb 2022 00:49:49 -0500
Subject: use Array.Empty to avoid unneeded array allocations

---
 src/SMAPI.Web/Framework/LogParsing/Models/ParsedLog.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/src/SMAPI.Web/Framework/LogParsing/Models/ParsedLog.cs b/src/SMAPI.Web/Framework/LogParsing/Models/ParsedLog.cs
index 87b20eb0..693a16ec 100644
--- a/src/SMAPI.Web/Framework/LogParsing/Models/ParsedLog.cs
+++ b/src/SMAPI.Web/Framework/LogParsing/Models/ParsedLog.cs
@@ -42,7 +42,7 @@ namespace StardewModdingAPI.Web.Framework.LogParsing.Models
         public DateTimeOffset Timestamp { get; set; }
 
         /// <summary>Metadata about installed mods and content packs.</summary>
-        public LogModInfo[] Mods { get; set; } = new LogModInfo[0];
+        public LogModInfo[] Mods { get; set; } = Array.Empty<LogModInfo>();
 
         /// <summary>The log messages.</summary>
         public LogMessage[] Messages { get; set; }
-- 
cgit 


From b0cc403098161ad82b858008e2523e1d2496fc41 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Sat, 12 Feb 2022 12:07:13 -0500
Subject: add data-* attributes to log parser for external tools

---
 src/SMAPI.Web/Framework/LogParsing/Models/LogModInfo.cs | 3 +++
 1 file changed, 3 insertions(+)

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

diff --git a/src/SMAPI.Web/Framework/LogParsing/Models/LogModInfo.cs b/src/SMAPI.Web/Framework/LogParsing/Models/LogModInfo.cs
index 067e4df4..92bfe5c7 100644
--- a/src/SMAPI.Web/Framework/LogParsing/Models/LogModInfo.cs
+++ b/src/SMAPI.Web/Framework/LogParsing/Models/LogModInfo.cs
@@ -35,5 +35,8 @@ namespace StardewModdingAPI.Web.Framework.LogParsing.Models
 
         /// <summary>Whether the mod has an update available.</summary>
         public bool HasUpdate => this.UpdateVersion != null && this.Version != this.UpdateVersion;
+
+        /// <summary>Whether the mod is a content pack for another mod.</summary>
+        public bool IsContentPack => !string.IsNullOrWhiteSpace(this.ContentPackFor);
     }
 }
-- 
cgit 


From a593eda30f82af474887d91458b0e9158f66fefc Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Wed, 6 Apr 2022 18:24:59 -0400
Subject: use target-typed new

---
 .../Framework/LogParsing/LogMessageBuilder.cs      |  2 +-
 src/SMAPI.Web/Framework/LogParsing/LogParser.cs    | 32 +++++++++++-----------
 2 files changed, 17 insertions(+), 17 deletions(-)

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

diff --git a/src/SMAPI.Web/Framework/LogParsing/LogMessageBuilder.cs b/src/SMAPI.Web/Framework/LogParsing/LogMessageBuilder.cs
index 992876ef..9da27d61 100644
--- a/src/SMAPI.Web/Framework/LogParsing/LogMessageBuilder.cs
+++ b/src/SMAPI.Web/Framework/LogParsing/LogMessageBuilder.cs
@@ -23,7 +23,7 @@ namespace StardewModdingAPI.Web.Framework.LogParsing
         public string Mod { get; set; }
 
         /// <summary>The text for the next log message.</summary>
-        private readonly StringBuilder Text = new StringBuilder();
+        private readonly StringBuilder Text = new();
 
 
         /*********
diff --git a/src/SMAPI.Web/Framework/LogParsing/LogParser.cs b/src/SMAPI.Web/Framework/LogParsing/LogParser.cs
index 887d0105..6a3ea222 100644
--- a/src/SMAPI.Web/Framework/LogParsing/LogParser.cs
+++ b/src/SMAPI.Web/Framework/LogParsing/LogParser.cs
@@ -14,38 +14,38 @@ namespace StardewModdingAPI.Web.Framework.LogParsing
         ** Fields
         *********/
         /// <summary>A regex pattern matching the start of a SMAPI message.</summary>
-        private readonly Regex MessageHeaderPattern = new Regex(@"^\[(?<time>\d\d[:\.]\d\d[:\.]\d\d) (?<level>[a-z]+)(?: +screen_(?<screen>\d+))? +(?<modName>[^\]]+)\] ", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+        private readonly Regex MessageHeaderPattern = new(@"^\[(?<time>\d\d[:\.]\d\d[:\.]\d\d) (?<level>[a-z]+)(?: +screen_(?<screen>\d+))? +(?<modName>[^\]]+)\] ", RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
         /// <summary>A regex pattern matching SMAPI's initial platform info message.</summary>
-        private readonly Regex InfoLinePattern = new Regex(@"^SMAPI (?<apiVersion>.+) with Stardew Valley (?<gameVersion>.+) on (?<os>.+)", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+        private readonly Regex InfoLinePattern = new(@"^SMAPI (?<apiVersion>.+) with Stardew Valley (?<gameVersion>.+) on (?<os>.+)", RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
         /// <summary>A regex pattern matching SMAPI's mod folder path line.</summary>
-        private readonly Regex ModPathPattern = new Regex(@"^Mods go here: (?<path>.+)", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+        private readonly Regex ModPathPattern = new(@"^Mods go here: (?<path>.+)", RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
         /// <summary>A regex pattern matching SMAPI's log timestamp line.</summary>
-        private readonly Regex LogStartedAtPattern = new Regex(@"^Log started at (?<timestamp>.+) UTC", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+        private readonly Regex LogStartedAtPattern = new(@"^Log started at (?<timestamp>.+) UTC", RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
         /// <summary>A regex pattern matching the start of SMAPI's mod list.</summary>
-        private readonly Regex ModListStartPattern = new Regex(@"^Loaded \d+ mods:$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+        private readonly Regex ModListStartPattern = new(@"^Loaded \d+ mods:$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
         /// <summary>A regex pattern matching an entry in SMAPI's mod list.</summary>
         /// <remarks>The author name and description are optional.</remarks>
-        private readonly Regex ModListEntryPattern = new Regex(@"^   (?<name>.+?) (?<version>[^\s]+)(?: by (?<author>[^\|]+))?(?: \| (?<description>.+))?$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+        private readonly Regex ModListEntryPattern = new(@"^   (?<name>.+?) (?<version>[^\s]+)(?: by (?<author>[^\|]+))?(?: \| (?<description>.+))?$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
         /// <summary>A regex pattern matching the start of SMAPI's content pack list.</summary>
-        private readonly Regex ContentPackListStartPattern = new Regex(@"^Loaded \d+ content packs:$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+        private readonly Regex ContentPackListStartPattern = new(@"^Loaded \d+ content packs:$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
         /// <summary>A regex pattern matching an entry in SMAPI's content pack list.</summary>
-        private readonly Regex ContentPackListEntryPattern = new Regex(@"^   (?<name>.+?) (?<version>[^\s]+)(?: by (?<author>[^\|]+))? \| for (?<for>[^\|]+)(?: \| (?<description>.+))?$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+        private readonly Regex ContentPackListEntryPattern = new(@"^   (?<name>.+?) (?<version>[^\s]+)(?: by (?<author>[^\|]+))? \| for (?<for>[^\|]+)(?: \| (?<description>.+))?$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
         /// <summary>A regex pattern matching the start of SMAPI's mod update list.</summary>
-        private readonly Regex ModUpdateListStartPattern = new Regex(@"^You can update \d+ mods?:$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+        private readonly Regex ModUpdateListStartPattern = new(@"^You can update \d+ mods?:$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
         /// <summary>A regex pattern matching an entry in SMAPI's mod update list.</summary>
-        private readonly Regex ModUpdateListEntryPattern = new Regex(@"^   (?<name>.+) (?<version>[^\s]+): (?<link>.+)$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+        private readonly Regex ModUpdateListEntryPattern = new(@"^   (?<name>.+) (?<version>[^\s]+): (?<link>.+)$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
         /// <summary>A regex pattern matching SMAPI's update line.</summary>
-        private readonly Regex SmapiUpdatePattern = new Regex(@"^You can update SMAPI to (?<version>[^\s]+): (?<link>.+)$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+        private readonly Regex SmapiUpdatePattern = new(@"^You can update SMAPI to (?<version>[^\s]+): (?<link>.+)$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
 
         /*********
@@ -69,7 +69,7 @@ namespace StardewModdingAPI.Web.Framework.LogParsing
                 }
 
                 // init log
-                ParsedLog log = new ParsedLog
+                ParsedLog log = new()
                 {
                     IsValid = true,
                     RawText = logText,
@@ -77,8 +77,8 @@ namespace StardewModdingAPI.Web.Framework.LogParsing
                 };
 
                 // parse log messages
-                LogModInfo smapiMod = new LogModInfo { Name = "SMAPI", Author = "Pathoschild", Description = "", Loaded = true };
-                LogModInfo gameMod = new LogModInfo { Name = "game", Author = "", Description = "", Loaded = true };
+                LogModInfo smapiMod = new() { Name = "SMAPI", Author = "Pathoschild", Description = "", Loaded = true };
+                LogModInfo gameMod = new() { Name = "game", Author = "", Description = "", Loaded = true };
                 IDictionary<string, List<LogModInfo>> mods = new Dictionary<string, List<LogModInfo>>();
                 bool inModList = false;
                 bool inContentPackList = false;
@@ -288,8 +288,8 @@ namespace StardewModdingAPI.Web.Framework.LogParsing
         /// <exception cref="LogParseException">The log text can't be parsed successfully.</exception>
         private IEnumerable<LogMessage> GetMessages(string logText)
         {
-            LogMessageBuilder builder = new LogMessageBuilder();
-            using StringReader reader = new StringReader(logText);
+            LogMessageBuilder builder = new();
+            using StringReader reader = new(logText);
             while (true)
             {
                 // read line
-- 
cgit 


From 077d8e4f401ad1806c6af0540f432366314a2300 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Wed, 6 Apr 2022 18:25:00 -0400
Subject: remove some unused/redundant code

---
 src/SMAPI.Web/Framework/LogParsing/LogParser.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/src/SMAPI.Web/Framework/LogParsing/LogParser.cs b/src/SMAPI.Web/Framework/LogParsing/LogParser.cs
index 6a3ea222..864caef1 100644
--- a/src/SMAPI.Web/Framework/LogParsing/LogParser.cs
+++ b/src/SMAPI.Web/Framework/LogParsing/LogParser.cs
@@ -211,7 +211,7 @@ namespace StardewModdingAPI.Web.Framework.LogParsing
                         {
                             Match match = this.ModPathPattern.Match(message.Text);
                             log.ModPath = match.Groups["path"].Value;
-                            int lastDelimiterPos = log.ModPath.LastIndexOfAny(new char[] { '/', '\\' });
+                            int lastDelimiterPos = log.ModPath.LastIndexOfAny(new[] { '/', '\\' });
                             log.GamePath = lastDelimiterPos >= 0
                                 ? log.ModPath.Substring(0, lastDelimiterPos)
                                 : log.ModPath;
-- 
cgit 


From 2e7c233f6c9bf6430672b39f970a3324deba79dd Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Wed, 6 Apr 2022 21:48:55 -0400
Subject: enable nullable annotations by default (#837)

This adds `#nullable disable` to all existing code (except where null is impossible like enum files), so it can be migrated incrementally.
---
 src/SMAPI.Web/Framework/LogParsing/LogMessageBuilder.cs | 2 ++
 src/SMAPI.Web/Framework/LogParsing/LogParseException.cs | 5 ++++-
 src/SMAPI.Web/Framework/LogParsing/LogParser.cs         | 2 ++
 src/SMAPI.Web/Framework/LogParsing/Models/LogMessage.cs | 2 ++
 src/SMAPI.Web/Framework/LogParsing/Models/LogModInfo.cs | 2 ++
 src/SMAPI.Web/Framework/LogParsing/Models/ParsedLog.cs  | 2 ++
 6 files changed, 14 insertions(+), 1 deletion(-)

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

diff --git a/src/SMAPI.Web/Framework/LogParsing/LogMessageBuilder.cs b/src/SMAPI.Web/Framework/LogParsing/LogMessageBuilder.cs
index 9da27d61..1b692e63 100644
--- a/src/SMAPI.Web/Framework/LogParsing/LogMessageBuilder.cs
+++ b/src/SMAPI.Web/Framework/LogParsing/LogMessageBuilder.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Text;
 using StardewModdingAPI.Web.Framework.LogParsing.Models;
diff --git a/src/SMAPI.Web/Framework/LogParsing/LogParseException.cs b/src/SMAPI.Web/Framework/LogParsing/LogParseException.cs
index 5d4c8c08..4ee58433 100644
--- a/src/SMAPI.Web/Framework/LogParsing/LogParseException.cs
+++ b/src/SMAPI.Web/Framework/LogParsing/LogParseException.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 
 namespace StardewModdingAPI.Web.Framework.LogParsing
@@ -10,6 +12,7 @@ namespace StardewModdingAPI.Web.Framework.LogParsing
         *********/
         /// <summary>Construct an instance.</summary>
         /// <param name="message">The user-friendly error message.</param>
-        public LogParseException(string message) : base(message) { }
+        public LogParseException(string message)
+            : base(message) { }
     }
 }
diff --git a/src/SMAPI.Web/Framework/LogParsing/LogParser.cs b/src/SMAPI.Web/Framework/LogParsing/LogParser.cs
index 864caef1..4e61ac95 100644
--- a/src/SMAPI.Web/Framework/LogParsing/LogParser.cs
+++ b/src/SMAPI.Web/Framework/LogParsing/LogParser.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/src/SMAPI.Web/Framework/LogParsing/Models/LogMessage.cs b/src/SMAPI.Web/Framework/LogParsing/Models/LogMessage.cs
index 1e08be78..57d28755 100644
--- a/src/SMAPI.Web/Framework/LogParsing/Models/LogMessage.cs
+++ b/src/SMAPI.Web/Framework/LogParsing/Models/LogMessage.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace StardewModdingAPI.Web.Framework.LogParsing.Models
 {
     /// <summary>A parsed log message.</summary>
diff --git a/src/SMAPI.Web/Framework/LogParsing/Models/LogModInfo.cs b/src/SMAPI.Web/Framework/LogParsing/Models/LogModInfo.cs
index 92bfe5c7..349312df 100644
--- a/src/SMAPI.Web/Framework/LogParsing/Models/LogModInfo.cs
+++ b/src/SMAPI.Web/Framework/LogParsing/Models/LogModInfo.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace StardewModdingAPI.Web.Framework.LogParsing.Models
 {
     /// <summary>Metadata about a mod or content pack in the log.</summary>
diff --git a/src/SMAPI.Web/Framework/LogParsing/Models/ParsedLog.cs b/src/SMAPI.Web/Framework/LogParsing/Models/ParsedLog.cs
index 693a16ec..dae91d84 100644
--- a/src/SMAPI.Web/Framework/LogParsing/Models/ParsedLog.cs
+++ b/src/SMAPI.Web/Framework/LogParsing/Models/ParsedLog.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 
 namespace StardewModdingAPI.Web.Framework.LogParsing.Models
-- 
cgit 


From 650af7ef1ac1957919ab19ec3d06af97792c54f8 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Sat, 9 Apr 2022 13:59:56 -0400
Subject: enable nullable annotations in log parser (#837)

---
 .../Framework/LogParsing/LogMessageBuilder.cs      | 25 ++++----
 .../Framework/LogParsing/LogParseException.cs      |  2 -
 src/SMAPI.Web/Framework/LogParsing/LogParser.cs    | 54 ++++++++--------
 .../Framework/LogParsing/Models/LogMessage.cs      | 38 ++++++++++--
 .../Framework/LogParsing/Models/LogModInfo.cs      | 71 ++++++++++++++++++----
 .../Framework/LogParsing/Models/ParsedLog.cs       | 20 +++---
 6 files changed, 138 insertions(+), 72 deletions(-)

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

diff --git a/src/SMAPI.Web/Framework/LogParsing/LogMessageBuilder.cs b/src/SMAPI.Web/Framework/LogParsing/LogMessageBuilder.cs
index 1b692e63..a1384b8f 100644
--- a/src/SMAPI.Web/Framework/LogParsing/LogMessageBuilder.cs
+++ b/src/SMAPI.Web/Framework/LogParsing/LogMessageBuilder.cs
@@ -1,6 +1,5 @@
-#nullable disable
-
 using System;
+using System.Diagnostics.CodeAnalysis;
 using System.Text;
 using StardewModdingAPI.Web.Framework.LogParsing.Models;
 
@@ -13,7 +12,7 @@ namespace StardewModdingAPI.Web.Framework.LogParsing
         ** Fields
         *********/
         /// <summary>The local time when the next log was posted.</summary>
-        public string Time { get; set; }
+        public string? Time { get; set; }
 
         /// <summary>The log level for the next log message.</summary>
         public LogLevel Level { get; set; }
@@ -22,7 +21,7 @@ namespace StardewModdingAPI.Web.Framework.LogParsing
         public int ScreenId { get; set; }
 
         /// <summary>The mod name for the next log message.</summary>
-        public string Mod { get; set; }
+        public string? Mod { get; set; }
 
         /// <summary>The text for the next log message.</summary>
         private readonly StringBuilder Text = new();
@@ -32,6 +31,7 @@ namespace StardewModdingAPI.Web.Framework.LogParsing
         ** Accessors
         *********/
         /// <summary>Whether the next log message has been started.</summary>
+        [MemberNotNullWhen(true, nameof(LogMessageBuilder.Time), nameof(LogMessageBuilder.Mod))]
         public bool Started { get; private set; }
 
 
@@ -72,19 +72,18 @@ namespace StardewModdingAPI.Web.Framework.LogParsing
         }
 
         /// <summary>Get a log message for the accumulated values.</summary>
-        public LogMessage Build()
+        public LogMessage? Build()
         {
             if (!this.Started)
                 return null;
 
-            return new LogMessage
-            {
-                Time = this.Time,
-                Level = this.Level,
-                ScreenId = this.ScreenId,
-                Mod = this.Mod,
-                Text = this.Text.ToString()
-            };
+            return new LogMessage(
+                time: this.Time,
+                level: this.Level,
+                screenId: this.ScreenId,
+                mod: this.Mod,
+                text: this.Text.ToString()
+            );
         }
 
         /// <summary>Reset to start a new log message.</summary>
diff --git a/src/SMAPI.Web/Framework/LogParsing/LogParseException.cs b/src/SMAPI.Web/Framework/LogParsing/LogParseException.cs
index 4ee58433..3f815e3e 100644
--- a/src/SMAPI.Web/Framework/LogParsing/LogParseException.cs
+++ b/src/SMAPI.Web/Framework/LogParsing/LogParseException.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 
 namespace StardewModdingAPI.Web.Framework.LogParsing
diff --git a/src/SMAPI.Web/Framework/LogParsing/LogParser.cs b/src/SMAPI.Web/Framework/LogParsing/LogParser.cs
index 4e61ac95..55272b23 100644
--- a/src/SMAPI.Web/Framework/LogParsing/LogParser.cs
+++ b/src/SMAPI.Web/Framework/LogParsing/LogParser.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -55,7 +53,7 @@ namespace StardewModdingAPI.Web.Framework.LogParsing
         *********/
         /// <summary>Parse SMAPI log text.</summary>
         /// <param name="logText">The SMAPI log text.</param>
-        public ParsedLog Parse(string logText)
+        public ParsedLog Parse(string? logText)
         {
             try
             {
@@ -79,8 +77,8 @@ namespace StardewModdingAPI.Web.Framework.LogParsing
                 };
 
                 // parse log messages
-                LogModInfo smapiMod = new() { Name = "SMAPI", Author = "Pathoschild", Description = "", Loaded = true };
-                LogModInfo gameMod = new() { Name = "game", Author = "", Description = "", Loaded = true };
+                LogModInfo smapiMod = new(name: "SMAPI", author: "Pathoschild", version: "", description: "", loaded: true);
+                LogModInfo gameMod = new(name: "game", author: "", version: "", description: "", loaded: true);
                 IDictionary<string, List<LogModInfo>> mods = new Dictionary<string, List<LogModInfo>>();
                 bool inModList = false;
                 bool inContentPackList = false;
@@ -103,7 +101,7 @@ namespace StardewModdingAPI.Web.Framework.LogParsing
                             default:
                                 if (mods.TryGetValue(message.Mod, out var entries))
                                 {
-                                    foreach (var entry in entries)
+                                    foreach (LogModInfo entry in entries)
                                         entry.Errors++;
                                 }
                                 break;
@@ -133,9 +131,9 @@ namespace StardewModdingAPI.Web.Framework.LogParsing
                             string author = match.Groups["author"].Value;
                             string description = match.Groups["description"].Value;
 
-                            if (!mods.TryGetValue(name, out List<LogModInfo> entries))
+                            if (!mods.TryGetValue(name, out List<LogModInfo>? entries))
                                 mods[name] = entries = new List<LogModInfo>();
-                            entries.Add(new LogModInfo { Name = name, Author = author, Version = version, Description = description, Loaded = true });
+                            entries.Add(new LogModInfo(name: name, author: author, version: version, description: description, loaded: true));
 
                             message.Section = LogSection.ModsList;
                         }
@@ -156,9 +154,9 @@ namespace StardewModdingAPI.Web.Framework.LogParsing
                             string description = match.Groups["description"].Value;
                             string forMod = match.Groups["for"].Value;
 
-                            if (!mods.TryGetValue(name, out List<LogModInfo> entries))
+                            if (!mods.TryGetValue(name, out List<LogModInfo>? entries))
                                 mods[name] = entries = new List<LogModInfo>();
-                            entries.Add(new LogModInfo { Name = name, Author = author, Version = version, Description = description, ContentPackFor = forMod, Loaded = true });
+                            entries.Add(new LogModInfo(name: name, author: author, version: version, description: description, contentPackFor: forMod, loaded: true));
 
                             message.Section = LogSection.ContentPackList;
                         }
@@ -179,23 +177,19 @@ namespace StardewModdingAPI.Web.Framework.LogParsing
 
                             if (mods.TryGetValue(name, out var entries))
                             {
-                                foreach (var entry in entries)
-                                {
-                                    entry.UpdateLink = link;
-                                    entry.UpdateVersion = version;
-                                }
+                                foreach (LogModInfo entry in entries)
+                                    entry.SetUpdate(version, link);
                             }
 
                             message.Section = LogSection.ModUpdateList;
                         }
-
                         else if (message.Level == LogLevel.Alert && this.SmapiUpdatePattern.IsMatch(message.Text))
                         {
                             Match match = this.SmapiUpdatePattern.Match(message.Text);
                             string version = match.Groups["version"].Value;
                             string link = match.Groups["link"].Value;
-                            smapiMod.UpdateVersion = version;
-                            smapiMod.UpdateLink = link;
+
+                            smapiMod.SetUpdate(version, link);
                         }
 
                         // platform info line
@@ -205,7 +199,7 @@ namespace StardewModdingAPI.Web.Framework.LogParsing
                             log.ApiVersion = match.Groups["apiVersion"].Value;
                             log.GameVersion = match.Groups["gameVersion"].Value;
                             log.OperatingSystem = match.Groups["os"].Value;
-                            smapiMod.Version = log.ApiVersion;
+                            smapiMod.OverrideVersion(log.ApiVersion);
                         }
 
                         // mod path line
@@ -215,7 +209,7 @@ namespace StardewModdingAPI.Web.Framework.LogParsing
                             log.ModPath = match.Groups["path"].Value;
                             int lastDelimiterPos = log.ModPath.LastIndexOfAny(new[] { '/', '\\' });
                             log.GamePath = lastDelimiterPos >= 0
-                                ? log.ModPath.Substring(0, lastDelimiterPos)
+                                ? log.ModPath[..lastDelimiterPos]
                                 : log.ModPath;
                         }
 
@@ -229,7 +223,8 @@ namespace StardewModdingAPI.Web.Framework.LogParsing
                 }
 
                 // finalize log
-                gameMod.Version = log.GameVersion;
+                if (log.GameVersion != null)
+                    gameMod.OverrideVersion(log.GameVersion);
                 log.Mods = new[] { gameMod, smapiMod }.Concat(mods.Values.SelectMany(p => p).OrderBy(p => p.Name)).ToArray();
                 return log;
             }
@@ -261,7 +256,8 @@ namespace StardewModdingAPI.Web.Framework.LogParsing
         /// <param name="messages">The messages to filter.</param>
         private IEnumerable<LogMessage> CollapseRepeats(IEnumerable<LogMessage> messages)
         {
-            LogMessage next = null;
+            LogMessage? next = null;
+
             foreach (LogMessage message in messages)
             {
                 // new message
@@ -282,7 +278,9 @@ namespace StardewModdingAPI.Web.Framework.LogParsing
                 yield return next;
                 next = message;
             }
-            yield return next;
+
+            if (next != null)
+                yield return next;
         }
 
         /// <summary>Split a SMAPI log into individual log messages.</summary>
@@ -295,7 +293,7 @@ namespace StardewModdingAPI.Web.Framework.LogParsing
             while (true)
             {
                 // read line
-                string line = reader.ReadLine();
+                string? line = reader.ReadLine();
                 if (line == null)
                     break;
 
@@ -308,17 +306,17 @@ namespace StardewModdingAPI.Web.Framework.LogParsing
                 {
                     if (builder.Started)
                     {
-                        yield return builder.Build();
+                        yield return builder.Build()!;
                         builder.Clear();
                     }
 
-                    var screenGroup = header.Groups["screen"];
+                    Group screenGroup = header.Groups["screen"];
                     builder.Start(
                         time: header.Groups["time"].Value,
                         level: Enum.Parse<LogLevel>(header.Groups["level"].Value, ignoreCase: true),
                         screenId: screenGroup.Success ? int.Parse(screenGroup.Value) : 0, // main player is always screen ID 0
                         mod: header.Groups["modName"].Value,
-                        text: line.Substring(header.Length)
+                        text: line[header.Length..]
                     );
                 }
                 else
@@ -332,7 +330,7 @@ namespace StardewModdingAPI.Web.Framework.LogParsing
 
             // end last message
             if (builder.Started)
-                yield return builder.Build();
+                yield return builder.Build()!;
         }
     }
 }
diff --git a/src/SMAPI.Web/Framework/LogParsing/Models/LogMessage.cs b/src/SMAPI.Web/Framework/LogParsing/Models/LogMessage.cs
index 57d28755..7a5f32e0 100644
--- a/src/SMAPI.Web/Framework/LogParsing/Models/LogMessage.cs
+++ b/src/SMAPI.Web/Framework/LogParsing/Models/LogMessage.cs
@@ -1,4 +1,4 @@
-#nullable disable
+using System.Diagnostics.CodeAnalysis;
 
 namespace StardewModdingAPI.Web.Framework.LogParsing.Models
 {
@@ -9,19 +9,19 @@ namespace StardewModdingAPI.Web.Framework.LogParsing.Models
         ** Accessors
         *********/
         /// <summary>The local time when the log was posted.</summary>
-        public string Time { get; set; }
+        public string Time { get; }
 
         /// <summary>The log level.</summary>
-        public LogLevel Level { get; set; }
+        public LogLevel Level { get; }
 
         /// <summary>The screen ID in split-screen mode.</summary>
-        public int ScreenId { get; set; }
+        public int ScreenId { get; }
 
         /// <summary>The mod name.</summary>
-        public string Mod { get; set; }
+        public string Mod { get; }
 
         /// <summary>The log text.</summary>
-        public string Text { get; set; }
+        public string Text { get; }
 
         /// <summary>The number of times this message was repeated consecutively.</summary>
         public int Repeated { get; set; }
@@ -30,6 +30,32 @@ namespace StardewModdingAPI.Web.Framework.LogParsing.Models
         public LogSection? Section { get; set; }
 
         /// <summary>Whether this message is the first one of its section.</summary>
+        [MemberNotNullWhen(true, nameof(LogMessage.Section))]
         public bool IsStartOfSection { get; set; }
+
+
+        /*********
+        ** Public methods
+        *********/
+        /// <summary>Construct an instance/</summary>
+        /// <param name="time">The local time when the log was posted.</param>
+        /// <param name="level">The log level.</param>
+        /// <param name="screenId">The screen ID in split-screen mode.</param>
+        /// <param name="mod">The mod name.</param>
+        /// <param name="text">The log text.</param>
+        /// <param name="repeated">The number of times this message was repeated consecutively.</param>
+        /// <param name="section">The section that this log message belongs to.</param>
+        /// <param name="isStartOfSection">Whether this message is the first one of its section.</param>
+        public LogMessage(string time, LogLevel level, int screenId, string mod, string text, int repeated = 0, LogSection? section = null, bool isStartOfSection = false)
+        {
+            this.Time = time;
+            this.Level = level;
+            this.ScreenId = screenId;
+            this.Mod = mod;
+            this.Text = text;
+            this.Repeated = repeated;
+            this.Section = section;
+            this.IsStartOfSection = isStartOfSection;
+        }
     }
 }
diff --git a/src/SMAPI.Web/Framework/LogParsing/Models/LogModInfo.cs b/src/SMAPI.Web/Framework/LogParsing/Models/LogModInfo.cs
index 349312df..a6b9165c 100644
--- a/src/SMAPI.Web/Framework/LogParsing/Models/LogModInfo.cs
+++ b/src/SMAPI.Web/Framework/LogParsing/Models/LogModInfo.cs
@@ -1,4 +1,4 @@
-#nullable disable
+using System.Diagnostics.CodeAnalysis;
 
 namespace StardewModdingAPI.Web.Framework.LogParsing.Models
 {
@@ -9,36 +9,81 @@ namespace StardewModdingAPI.Web.Framework.LogParsing.Models
         ** Accessors
         *********/
         /// <summary>The mod name.</summary>
-        public string Name { get; set; }
+        public string Name { get; }
 
         /// <summary>The mod author.</summary>
-        public string Author { get; set; }
-
-        /// <summary>The update version.</summary>
-        public string UpdateVersion { get; set; }
-
-        /// <summary>The update link.</summary>
-        public string UpdateLink { get; set; }
+        public string Author { get; }
 
         /// <summary>The mod version.</summary>
-        public string Version { get; set; }
+        public string Version { get; private set; }
 
         /// <summary>The mod description.</summary>
-        public string Description { get; set; }
+        public string Description { get; }
+
+        /// <summary>The update version.</summary>
+        public string? UpdateVersion { get; private set; }
+
+        /// <summary>The update link.</summary>
+        public string? UpdateLink { get; private set; }
 
         /// <summary>The name of the mod for which this is a content pack (if applicable).</summary>
-        public string ContentPackFor { get; set; }
+        public string? ContentPackFor { get; }
 
         /// <summary>The number of errors logged by this mod.</summary>
         public int Errors { get; set; }
 
         /// <summary>Whether the mod was loaded into the game.</summary>
-        public bool Loaded { get; set; }
+        public bool Loaded { get; }
 
         /// <summary>Whether the mod has an update available.</summary>
+        [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>
+        [MemberNotNullWhen(true, nameof(LogModInfo.ContentPackFor))]
         public bool IsContentPack => !string.IsNullOrWhiteSpace(this.ContentPackFor);
+
+
+        /*********
+        ** Public methods
+        *********/
+        /// <summary>Construct an instance.</summary>
+        /// <param name="name">The mod name.</param>
+        /// <param name="author">The mod author.</param>
+        /// <param name="version">The mod version.</param>
+        /// <param name="description">The mod description.</param>
+        /// <param name="updateVersion">The update version.</param>
+        /// <param name="updateLink">The update link.</param>
+        /// <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)
+        {
+            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;
+        }
+
+        /// <summary>Add an update alert for this mod.</summary>
+        /// <param name="updateVersion">The update version.</param>
+        /// <param name="updateLink">The update link.</param>
+        public void SetUpdate(string updateVersion, string updateLink)
+        {
+            this.UpdateVersion = updateVersion;
+            this.UpdateLink = updateLink;
+        }
+
+        /// <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>
+        public void OverrideVersion(string version)
+        {
+            this.Version = version;
+        }
     }
 }
diff --git a/src/SMAPI.Web/Framework/LogParsing/Models/ParsedLog.cs b/src/SMAPI.Web/Framework/LogParsing/Models/ParsedLog.cs
index dae91d84..6951e434 100644
--- a/src/SMAPI.Web/Framework/LogParsing/Models/ParsedLog.cs
+++ b/src/SMAPI.Web/Framework/LogParsing/Models/ParsedLog.cs
@@ -1,6 +1,5 @@
-#nullable disable
-
 using System;
+using System.Diagnostics.CodeAnalysis;
 
 namespace StardewModdingAPI.Web.Framework.LogParsing.Models
 {
@@ -14,31 +13,32 @@ namespace StardewModdingAPI.Web.Framework.LogParsing.Models
         ** Metadata
         ****/
         /// <summary>Whether the log file was successfully parsed.</summary>
+        [MemberNotNullWhen(true, nameof(ParsedLog.RawText))]
         public bool IsValid { get; set; }
 
         /// <summary>An error message indicating why the log file is invalid.</summary>
-        public string Error { get; set; }
+        public string? Error { get; set; }
 
         /// <summary>The raw log text.</summary>
-        public string RawText { get; set; }
+        public string? RawText { get; set; }
 
         /****
         ** Log data
         ****/
         /// <summary>The SMAPI version.</summary>
-        public string ApiVersion { get; set; }
+        public string? ApiVersion { get; set; }
 
         /// <summary>The game version.</summary>
-        public string GameVersion { get; set; }
+        public string? GameVersion { get; set; }
 
         /// <summary>The player's operating system.</summary>
-        public string OperatingSystem { get; set; }
+        public string? OperatingSystem { get; set; }
 
         /// <summary>The game install path.</summary>
-        public string GamePath { get; set; }
+        public string? GamePath { get; set; }
 
         /// <summary>The mod folder path.</summary>
-        public string ModPath { get; set; }
+        public string? ModPath { get; set; }
 
         /// <summary>The ISO 8601 timestamp when the log was started.</summary>
         public DateTimeOffset Timestamp { get; set; }
@@ -47,6 +47,6 @@ namespace StardewModdingAPI.Web.Framework.LogParsing.Models
         public LogModInfo[] Mods { get; set; } = Array.Empty<LogModInfo>();
 
         /// <summary>The log messages.</summary>
-        public LogMessage[] Messages { get; set; }
+        public LogMessage[] Messages { get; set; } = Array.Empty<LogMessage>();
     }
 }
-- 
cgit