From beb0b0aaf4e349cf911504a72b484d5642f6ac58 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Wed, 9 Nov 2022 20:03:41 -0500
Subject: fix & improve split-screen column in log parser

---
 src/SMAPI.Web/Framework/LogParsing/LogParser.cs        |  4 ++++
 src/SMAPI.Web/Framework/LogParsing/Models/ParsedLog.cs |  3 +++
 src/SMAPI.Web/Views/LogParser/Index.cshtml             |  6 +++---
 src/SMAPI.Web/wwwroot/Content/js/log-parser.js         | 11 ++---------
 4 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'src/SMAPI.Web')

diff --git a/src/SMAPI.Web/Framework/LogParsing/LogParser.cs b/src/SMAPI.Web/Framework/LogParsing/LogParser.cs
index 5e0dedf3..c39e612b 100644
--- a/src/SMAPI.Web/Framework/LogParsing/LogParser.cs
+++ b/src/SMAPI.Web/Framework/LogParsing/LogParser.cs
@@ -108,6 +108,10 @@ namespace StardewModdingAPI.Web.Framework.LogParsing
                         }
                     }
 
+                    // detect split-screen mode
+                    if (message.ScreenId != 0)
+                        log.IsSplitScreen = true;
+
                     // collect SMAPI metadata
                     if (message.Mod == "SMAPI")
                     {
diff --git a/src/SMAPI.Web/Framework/LogParsing/Models/ParsedLog.cs b/src/SMAPI.Web/Framework/LogParsing/Models/ParsedLog.cs
index cda0f653..2a2e5f5c 100644
--- a/src/SMAPI.Web/Framework/LogParsing/Models/ParsedLog.cs
+++ b/src/SMAPI.Web/Framework/LogParsing/Models/ParsedLog.cs
@@ -22,6 +22,9 @@ namespace StardewModdingAPI.Web.Framework.LogParsing.Models
         /// <summary>The raw log text.</summary>
         public string? RawText { get; set; }
 
+        /// <summary>Whether there are messages from multiple screens in the log.</summary>
+        public bool IsSplitScreen { get; set; }
+
         /****
         ** Log data
         ****/
diff --git a/src/SMAPI.Web/Views/LogParser/Index.cshtml b/src/SMAPI.Web/Views/LogParser/Index.cshtml
index 28127903..c1251c21 100644
--- a/src/SMAPI.Web/Views/LogParser/Index.cshtml
+++ b/src/SMAPI.Web/Views/LogParser/Index.cshtml
@@ -47,7 +47,7 @@
     <script src="https://cdn.jsdelivr.net/npm/vue@2.6.14" crossorigin="anonymous"></script>
     <script src="https://cdn.jsdelivr.net/npm/jquery@3.5.1" crossorigin="anonymous"></script>
     <script src="~/Content/js/file-upload.js"></script>
-    <script src="~/Content/js/log-parser.js?r=20220409"></script>
+    <script src="~/Content/js/log-parser.js"></script>
 
     <script id="serializedData" type="application/json">
         @if (!Model.ShowRaw)
@@ -86,7 +86,8 @@
                     showMods: @this.ForJson(log?.Mods.Where(p => p.Loaded && !p.IsContentPack).Select(p => Model.GetSlug(p.Name)).Distinct().ToDictionary(slug => slug, _ => true)),
                     showSections: @this.ForJson(Enum.GetNames(typeof(LogSection)).ToDictionary(section => section, _ => false)),
                     showLevels: @this.ForJson(defaultFilters),
-                    enableFilters: @this.ForJson(!Model.ShowRaw)
+                    enableFilters: @this.ForJson(!Model.ShowRaw),
+                    isSplitScreen: @this.ForJson(log?.IsSplitScreen ?? false)
                 }
             );
 
@@ -494,7 +495,6 @@ else if (log?.IsValid == true)
                 <log-line
                     v-for="msg in visibleMessages"
                     v-bind:key="msg.id"
-                    v-bind:showScreenId="showScreenId"
                     v-bind:message="msg"
                     v-bind:highlight="shouldHighlight"
                 />
diff --git a/src/SMAPI.Web/wwwroot/Content/js/log-parser.js b/src/SMAPI.Web/wwwroot/Content/js/log-parser.js
index fccd00be..324218bb 100644
--- a/src/SMAPI.Web/wwwroot/Content/js/log-parser.js
+++ b/src/SMAPI.Web/wwwroot/Content/js/log-parser.js
@@ -424,10 +424,6 @@ smapi.logParser = function (state) {
     Vue.component("log-line", {
         functional: true,
         props: {
-            showScreenId: {
-                type: Boolean,
-                required: true
-            },
             message: {
                 type: Object,
                 required: true
@@ -456,7 +452,7 @@ smapi.logParser = function (state) {
                             "td",
                             {
                                 attrs: {
-                                    colspan: context.props.showScreenId ? 4 : 3
+                                    colspan: state.isSplitScreen ? 4 : 3
                                 }
                             },
                             ""
@@ -541,7 +537,7 @@ smapi.logParser = function (state) {
                 },
                 [
                     createElement("td", message.Time),
-                    context.props.showScreenId ? createElement("td", message.ScreenId) : null,
+                    state.isSplitScreen ? createElement("td", { attrs: { title: (message.ScreenId == 0 ? "main screen" : "screen #" + (message.ScreenId + 1)) + " in split-screen mode" } }, `🖵${message.ScreenId + 1}`) : null,
                     createElement("td", level.toUpperCase()),
                     createElement(
                         "td",
@@ -588,9 +584,6 @@ smapi.logParser = function (state) {
             anyModsShown: function () {
                 return stats.modsShown > 0;
             },
-            showScreenId: function () {
-                return this.data.screenIds.length > 1;
-            },
 
             // Maybe not strictly necessary, but the Vue template is being
             // weird about accessing data entries on the app rather than
-- 
cgit