From 212e85489a456acca6889faff5da835cbb707080 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Sun, 25 Feb 2018 23:27:44 -0500
Subject: fix log parser not correctly parsing mod list if a mod has no author
 name

---
 src/SMAPI.Web/Framework/LogParsing/LogParser.cs | 4 +++-
 1 file changed, 3 insertions(+), 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 23a1baa4..385accf0 100644
--- a/src/SMAPI.Web/Framework/LogParsing/LogParser.cs
+++ b/src/SMAPI.Web/Framework/LogParsing/LogParser.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
+using StardewModdingAPI.Common;
 using StardewModdingAPI.Web.Framework.LogParsing.Models;
 
 namespace StardewModdingAPI.Web.Framework.LogParsing
@@ -29,7 +30,8 @@ namespace StardewModdingAPI.Web.Framework.LogParsing
         private readonly Regex ModListStartPattern = new Regex(@"^Loaded \d+ mods:$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
         /// <summary>A regex pattern matching an entry in SMAPI's mod list.</summary>
-        private readonly Regex ModListEntryPattern = new Regex(@"^   (?<name>.+) (?<version>.+) by (?<author>.+) \| (?<description>.+)$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+        /// <remarks>The author name and description are optional.</remarks>
+        private readonly Regex ModListEntryPattern = new Regex(@"^   (?<name>.+?) (?<version>" + SemanticVersionImpl.UnboundedVersionPattern + @")(?: 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);
-- 
cgit 


From 5c1318431b716e13feb214abe8116cb1498047a5 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Sun, 25 Feb 2018 23:35:14 -0500
Subject: always include raw taxt in model

---
 src/SMAPI.Web/Framework/LogParsing/LogParser.cs        | 8 +++++---
 src/SMAPI.Web/Framework/LogParsing/Models/ParsedLog.cs | 4 ++--
 src/SMAPI.Web/Views/LogParser/Index.cshtml             | 2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

(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 385accf0..9e44f163 100644
--- a/src/SMAPI.Web/Framework/LogParsing/LogParser.cs
+++ b/src/SMAPI.Web/Framework/LogParsing/LogParser.cs
@@ -55,6 +55,7 @@ namespace StardewModdingAPI.Web.Framework.LogParsing
                     return new ParsedLog
                     {
                         IsValid = false,
+                        RawText = logText,
                         Error = "The log is empty."
                     };
                 }
@@ -63,7 +64,8 @@ namespace StardewModdingAPI.Web.Framework.LogParsing
                 ParsedLog log = new ParsedLog
                 {
                     IsValid = true,
-                    Messages = this.CollapseRepeats(this.GetMessages(logText)).ToArray(),
+                    RawText = logText,
+                    Messages = this.CollapseRepeats(this.GetMessages(logText)).ToArray()
                 };
 
                 // parse log messages
@@ -154,7 +156,7 @@ namespace StardewModdingAPI.Web.Framework.LogParsing
                 {
                     IsValid = false,
                     Error = ex.Message,
-                    RawTextIfError = logText
+                    RawText = logText
                 };
             }
             catch (Exception ex)
@@ -163,7 +165,7 @@ namespace StardewModdingAPI.Web.Framework.LogParsing
                 {
                     IsValid = false,
                     Error = $"Parsing the log file failed. Technical details:\n{ex}",
-                    RawTextIfError = logText
+                    RawText = logText
                 };
             }
         }
diff --git a/src/SMAPI.Web/Framework/LogParsing/Models/ParsedLog.cs b/src/SMAPI.Web/Framework/LogParsing/Models/ParsedLog.cs
index 31ef2fe1..a82b6a1b 100644
--- a/src/SMAPI.Web/Framework/LogParsing/Models/ParsedLog.cs
+++ b/src/SMAPI.Web/Framework/LogParsing/Models/ParsedLog.cs
@@ -17,8 +17,8 @@ namespace StardewModdingAPI.Web.Framework.LogParsing.Models
         /// <summary>An error message indicating why the log file is invalid.</summary>
         public string Error { get; set; }
 
-        /// <summary>The raw text if <see cref="IsValid"/> is false.</summary>
-        public string RawTextIfError { get; set; }
+        /// <summary>The raw log text.</summary>
+        public string RawText { get; set; }
 
         /****
         ** Log data
diff --git a/src/SMAPI.Web/Views/LogParser/Index.cshtml b/src/SMAPI.Web/Views/LogParser/Index.cshtml
index 39557d50..310277eb 100644
--- a/src/SMAPI.Web/Views/LogParser/Index.cshtml
+++ b/src/SMAPI.Web/Views/LogParser/Index.cshtml
@@ -155,7 +155,7 @@ else if (Model.ParsedLog?.IsValid == false)
     </div>
 
     <h3>Raw log</h3>
-    <pre>@Model.ParsedLog.RawTextIfError</pre>
+    <pre>@Model.ParsedLog.RawText</pre>
 }
 
 <div id="upload-area">
-- 
cgit