From a23261106ea454ab2e264007f27ca11ddbb7e44b Mon Sep 17 00:00:00 2001
From: danvolchek <volchek2@illinois.edu>
Date: Sun, 17 Feb 2019 20:39:36 -0600
Subject: add update info in suggested fixes section

---
 src/SMAPI.Web/Framework/LogParsing/LogParser.cs | 49 +++++++++++++++++++++++--
 1 file changed, 45 insertions(+), 4 deletions(-)

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

diff --git a/src/SMAPI.Web/Framework/LogParsing/LogParser.cs b/src/SMAPI.Web/Framework/LogParsing/LogParser.cs
index 6f848469..5cdc501f 100644
--- a/src/SMAPI.Web/Framework/LogParsing/LogParser.cs
+++ b/src/SMAPI.Web/Framework/LogParsing/LogParser.cs
@@ -39,6 +39,15 @@ namespace StardewModdingAPI.Web.Framework.LogParsing
         /// <summary>A regex pattern matching an entry in SMAPI's content pack list.</summary>
         private readonly Regex ContentPackListEntryPattern = new Regex(@"^   (?<name>.+) (?<version>.+) 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);
+
+        /// <summary>A regex pattern matching an entry in SMAPI's mod update list.</summary>
+        private readonly Regex ModUpdateListEntryPattern = new Regex(@"^   (?<name>.+?) (?<version>" + SemanticVersion.UnboundedVersionPattern + @"): (?<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>" + SemanticVersion.UnboundedVersionPattern + @"): (?<link>.+)$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+
 
         /*********
         ** Public methods
@@ -69,11 +78,12 @@ namespace StardewModdingAPI.Web.Framework.LogParsing
                 };
 
                 // parse log messages
-                LogModInfo smapiMod = new LogModInfo { Name = "SMAPI", Author = "Pathoschild", Description = "" };
-                LogModInfo gameMod = new LogModInfo { Name = "game", Author = "", Description = "" };
+                LogModInfo smapiMod = new LogModInfo { Name = "SMAPI", Author = "Pathoschild", Description = "", Loaded = true};
+                LogModInfo gameMod = new LogModInfo { Name = "game", Author = "", Description = "", Loaded = true };
                 IDictionary<string, LogModInfo> mods = new Dictionary<string, LogModInfo>();
                 bool inModList = false;
                 bool inContentPackList = false;
+                bool inModUpdateList = false;
                 foreach (LogMessage message in log.Messages)
                 {
                     // collect stats
@@ -106,6 +116,8 @@ namespace StardewModdingAPI.Web.Framework.LogParsing
                             inModList = false;
                         if (inContentPackList && !this.ContentPackListEntryPattern.IsMatch(message.Text))
                             inContentPackList = false;
+                        if (inModUpdateList && !this.ModUpdateListEntryPattern.IsMatch(message.Text))
+                            inModUpdateList = false;
 
                         // mod list
                         if (!inModList && message.Level == LogLevel.Info && this.ModListStartPattern.IsMatch(message.Text))
@@ -117,7 +129,7 @@ namespace StardewModdingAPI.Web.Framework.LogParsing
                             string version = match.Groups["version"].Value;
                             string author = match.Groups["author"].Value;
                             string description = match.Groups["description"].Value;
-                            mods[name] = new LogModInfo { Name = name, Author = author, Version = version, Description = description };
+                            mods[name] = new LogModInfo { Name = name, Author = author, Version = version, Description = description, Loaded = true };
                         }
 
                         // content pack list
@@ -131,7 +143,36 @@ namespace StardewModdingAPI.Web.Framework.LogParsing
                             string author = match.Groups["author"].Value;
                             string description = match.Groups["description"].Value;
                             string forMod = match.Groups["for"].Value;
-                            mods[name] = new LogModInfo { Name = name, Author = author, Version = version, Description = description, ContentPackFor = forMod };
+                            mods[name] = new LogModInfo { Name = name, Author = author, Version = version, Description = description, ContentPackFor = forMod, Loaded = true };
+                        }
+
+                        // mod update list
+                        else if (!inModUpdateList && message.Level == LogLevel.Alert && this.ModUpdateListStartPattern.IsMatch(message.Text))
+                            inModUpdateList = true;
+                        else if (inModUpdateList)
+                        {
+                            Match match = this.ModUpdateListEntryPattern.Match(message.Text);
+                            string name = match.Groups["name"].Value;
+                            string version = match.Groups["version"].Value;
+                            string link = match.Groups["link"].Value;
+                            if (mods.ContainsKey(name))
+                            {
+                                mods[name].UpdateLink = link;
+                                mods[name].UpdateVersion = version;
+                            }
+                            else
+                            {
+                                mods[name] = new LogModInfo {Name = name, UpdateVersion = version, UpdateLink = link, Loaded = false};
+                            }
+                        }
+
+                        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;
                         }
 
                         // platform info line
-- 
cgit 


From fa3fa400fff0b97cbdca267295f8fbebbab17b61 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Thu, 21 Feb 2019 20:13:05 -0500
Subject: minor tweaks to new log parser UI (#619)

---
 src/SMAPI.Web/Framework/LogParsing/LogParser.cs  |  8 +--
 src/SMAPI.Web/Views/LogParser/Index.cshtml       | 89 ++++++++++++------------
 src/SMAPI.Web/wwwroot/Content/css/log-parser.css |  8 +--
 3 files changed, 52 insertions(+), 53 deletions(-)

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

diff --git a/src/SMAPI.Web/Framework/LogParsing/LogParser.cs b/src/SMAPI.Web/Framework/LogParsing/LogParser.cs
index 5cdc501f..fdc19404 100644
--- a/src/SMAPI.Web/Framework/LogParsing/LogParser.cs
+++ b/src/SMAPI.Web/Framework/LogParsing/LogParser.cs
@@ -78,7 +78,7 @@ namespace StardewModdingAPI.Web.Framework.LogParsing
                 };
 
                 // parse log messages
-                LogModInfo smapiMod = new LogModInfo { Name = "SMAPI", Author = "Pathoschild", Description = "", Loaded = true};
+                LogModInfo smapiMod = new LogModInfo { Name = "SMAPI", Author = "Pathoschild", Description = "", Loaded = true };
                 LogModInfo gameMod = new LogModInfo { Name = "game", Author = "", Description = "", Loaded = true };
                 IDictionary<string, LogModInfo> mods = new Dictionary<string, LogModInfo>();
                 bool inModList = false;
@@ -100,11 +100,9 @@ namespace StardewModdingAPI.Web.Framework.LogParsing
                                 break;
 
                             default:
-                            {
                                 if (mods.ContainsKey(message.Mod))
                                     mods[message.Mod].Errors++;
                                 break;
-                            }
                         }
                     }
 
@@ -162,11 +160,11 @@ namespace StardewModdingAPI.Web.Framework.LogParsing
                             }
                             else
                             {
-                                mods[name] = new LogModInfo {Name = name, UpdateVersion = version, UpdateLink = link, Loaded = false};
+                                mods[name] = new LogModInfo { Name = name, UpdateVersion = version, UpdateLink = link, Loaded = false };
                             }
                         }
 
-                        else if(message.Level == LogLevel.Alert && this.SMAPIUpdatePattern.IsMatch(message.Text))
+                        else if (message.Level == LogLevel.Alert && this.SMAPIUpdatePattern.IsMatch(message.Text))
                         {
                             Match match = this.SMAPIUpdatePattern.Match(message.Text);
                             string version = match.Groups["version"].Value;
diff --git a/src/SMAPI.Web/Views/LogParser/Index.cshtml b/src/SMAPI.Web/Views/LogParser/Index.cshtml
index bf70f2d7..21adf35b 100644
--- a/src/SMAPI.Web/Views/LogParser/Index.cshtml
+++ b/src/SMAPI.Web/Views/LogParser/Index.cshtml
@@ -17,10 +17,10 @@
     {
         <meta name="robots" content="noindex" />
     }
-    <link rel="stylesheet" href="~/Content/css/log-parser.css?r=20180627" />
+    <link rel="stylesheet" href="~/Content/css/log-parser.css?r=20190221" />
     <script src="https://cdn.jsdelivr.net/npm/vue@2.5.17/dist/vue.min.js" crossorigin="anonymous"></script>
     <script src="https://cdn.jsdelivr.net/npm/jquery@3.3.1/dist/jquery.min.js" crossorigin="anonymous"></script>
-    <script src="~/Content/js/log-parser.js?r=20180627"></script>
+    <script src="~/Content/js/log-parser.js?r=20190221"></script>
     <script>
         $(function() {
             smapi.logParser({
@@ -121,52 +121,53 @@ else if (Model.ParsedLog?.IsValid == true)
         @if (Model.ParsedLog.Mods.Any(mod => mod.HasUpdate))
         {
             <h2>Suggested fixes</h2>
+            <ul id="fix-list">
+                <li>
+                    Consider updating these mods to fix problems:
 
-            <p>You have some mods that aren't fully up to date. Updating them can fix problems.</p>
-            <table id="updates" class="table">
-                <caption>
-                    Updates available:
-                </caption>
-                @foreach (LogModInfo mod in Model.ParsedLog.Mods.Where(mod => (mod.HasUpdate && mod.ContentPackFor == null) || (contentPacks != null && contentPacks.TryGetValue(mod.Name, out LogModInfo[] contentPackList) && contentPackList.Any(pack => pack.HasUpdate))))
-                {
-                <tr class="mod-entry">
-                    <td>
-                        <strong class=@(!mod.HasUpdate ? "hidden": "")>@mod.Name</strong>
-                        @if (contentPacks != null && contentPacks.TryGetValue(mod.Name, out LogModInfo[] contentPackList))
-                        {
-                            <div class="content-packs">
-                                @foreach (LogModInfo contentPack in contentPackList.Where(pack => pack.HasUpdate))
-                                {
-                                    <text>+ @contentPack.Name</text><br />
-                                }
-                            </div>
-                        }
-                    </td>
-                    <td>
-                        @if (mod.HasUpdate)
-                        {
-                        <a href="@mod.UpdateLink" target="_blank">
-                            @(mod.Version == null ? @mod.UpdateVersion : $"{mod.Version} → {mod.UpdateVersion}")
-                            </a>
-                        }
-                        else
+                    <table id="updates" class="table">
+                        @foreach (LogModInfo mod in Model.ParsedLog.Mods.Where(mod => (mod.HasUpdate && mod.ContentPackFor == null) || (contentPacks != null && contentPacks.TryGetValue(mod.Name, out LogModInfo[] contentPackList) && contentPackList.Any(pack => pack.HasUpdate))))
                         {
-                            <span class="invisible">Okay</span>
-                        }
+                            <tr class="mod-entry">
+                                <td>
+                                    <strong class=@(!mod.HasUpdate ? "hidden" : "")>@mod.Name</strong>
+                                    @if (contentPacks != null && contentPacks.TryGetValue(mod.Name, out LogModInfo[] contentPackList))
+                                    {
+                                        <div class="content-packs">
+                                            @foreach (LogModInfo contentPack in contentPackList.Where(pack => pack.HasUpdate))
+                                            {
+                                                <text>+ @contentPack.Name</text><br/>
+                                            }
+                                        </div>
+                                    }
+                                </td>
+                                <td>
+                                    @if (mod.HasUpdate)
+                                    {
+                                        <a href="@mod.UpdateLink" target="_blank">
+                                            @(mod.Version == null ? @mod.UpdateVersion : $"{mod.Version} → {mod.UpdateVersion}")
+                                        </a>
+                                    }
+                                    else
+                                    {
+                                        <text>&nbsp;</text>
+                                    }
 
-                        @if (contentPacks != null && contentPacks.TryGetValue(mod.Name, out contentPackList))
-                        {
-                            <div>
-                                @foreach (LogModInfo contentPack in contentPackList.Where(pack => pack.HasUpdate))
-                                {
-                                    <a href="@contentPack.UpdateLink" target="_blank">@contentPack.Version → @contentPack.UpdateVersion</a><br />
-                                }
-                            </div>
+                                    @if (contentPacks != null && contentPacks.TryGetValue(mod.Name, out contentPackList))
+                                    {
+                                        <div>
+                                            @foreach (LogModInfo contentPack in contentPackList.Where(pack => pack.HasUpdate))
+                                            {
+                                                <a href="@contentPack.UpdateLink" target="_blank">@contentPack.Version → @contentPack.UpdateVersion</a><br/>
+                                            }
+                                        </div>
+                                    }
+                                </td>
+                            </tr>
                         }
-                    </td>
-                </tr>
-                }
-            </table>
+                    </table>
+                </li>
+            </ul>
         }
 
         <h2>Log info</h2>
diff --git a/src/SMAPI.Web/wwwroot/Content/css/log-parser.css b/src/SMAPI.Web/wwwroot/Content/css/log-parser.css
index 5e7ccb79..ea28cd7d 100644
--- a/src/SMAPI.Web/wwwroot/Content/css/log-parser.css
+++ b/src/SMAPI.Web/wwwroot/Content/css/log-parser.css
@@ -78,12 +78,12 @@ table caption {
     min-height: 1.3em;
 }
 
-#updates {
-    min-width: 10em;
+#fix-list {
+    margin-bottom: 2em;
 }
 
-.invisible {
-    visibility: hidden;
+#updates {
+    min-width: 10em;
 }
 
 #mods {
-- 
cgit