From a463a05607c89922af7e908b39aa897b8d23bfbf Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Sun, 3 Jun 2018 13:54:26 -0400
Subject: redesign log parser upload page

This makes the instructions much more clear and prominent, so it should be more intuitive for players. The previous design often confused users because they saw the big textbox and ignored the little instructions above it.
---
 src/SMAPI.Web/ViewModels/LogParserModel.cs | 38 ++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

(limited to 'src/SMAPI.Web/ViewModels')

diff --git a/src/SMAPI.Web/ViewModels/LogParserModel.cs b/src/SMAPI.Web/ViewModels/LogParserModel.cs
index 8c026536..0fbd8ad5 100644
--- a/src/SMAPI.Web/ViewModels/LogParserModel.cs
+++ b/src/SMAPI.Web/ViewModels/LogParserModel.cs
@@ -1,3 +1,6 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.RegularExpressions;
 using StardewModdingAPI.Web.Framework.LogParsing.Models;
 
 namespace StardewModdingAPI.Web.ViewModels
@@ -5,6 +8,13 @@ namespace StardewModdingAPI.Web.ViewModels
     /// <summary>The view model for the log parser page.</summary>
     public class LogParserModel
     {
+        /*********
+        ** Properties
+        *********/
+        /// <summary>A regex pattern matching characters to remove from a mod name to create the slug ID.</summary>
+        private readonly Regex SlugInvalidCharPattern = new Regex("[^a-z0-9]", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+
+
         /*********
         ** Accessors
         *********/
@@ -17,6 +27,12 @@ namespace StardewModdingAPI.Web.ViewModels
         /// <summary>The parsed log info.</summary>
         public ParsedLog ParsedLog { get; set; }
 
+        /// <summary>An error which occurred while uploading the log to Pastebin.</summary>
+        public string UploadError { get; set; }
+
+        /// <summary>An error which occurred while parsing the log file.</summary>
+        public string ParseError => this.ParsedLog?.Error;
+
 
         /*********
         ** Public methods
@@ -34,5 +50,27 @@ namespace StardewModdingAPI.Web.ViewModels
             this.PasteID = pasteID;
             this.ParsedLog = parsedLog;
         }
+
+        /// <summary>Get all content packs in the log grouped by the mod they're for.</summary>
+        public IDictionary<string, LogModInfo[]> GetContentPacksByMod()
+        {
+            // get all mods & content packs
+            LogModInfo[] mods = this.ParsedLog?.Mods;
+            if (mods == null || !mods.Any())
+                return new Dictionary<string, LogModInfo[]>();
+
+            // group by mod
+            return mods
+                .Where(mod => mod.ContentPackFor != null)
+                .GroupBy(mod => mod.ContentPackFor)
+                .ToDictionary(group => group.Key, group => group.ToArray());
+        }
+
+        /// <summary>Get a sanitised mod name that's safe to use in anchors, attributes, and URLs.</summary>
+        /// <param name="modName">The mod name.</param>
+        public string GetSlug(string modName)
+        {
+            return this.SlugInvalidCharPattern.Replace(modName, "");
+        }
     }
 }
-- 
cgit 


From 3e5c109df1f90904c2dcb177e35b35f003e90fd9 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Wed, 27 Jun 2018 09:47:31 -0400
Subject: add log parser option to view raw log

---
 src/SMAPI.Web/ViewModels/LogParserModel.cs | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

(limited to 'src/SMAPI.Web/ViewModels')

diff --git a/src/SMAPI.Web/ViewModels/LogParserModel.cs b/src/SMAPI.Web/ViewModels/LogParserModel.cs
index 0fbd8ad5..df36ca73 100644
--- a/src/SMAPI.Web/ViewModels/LogParserModel.cs
+++ b/src/SMAPI.Web/ViewModels/LogParserModel.cs
@@ -27,6 +27,9 @@ namespace StardewModdingAPI.Web.ViewModels
         /// <summary>The parsed log info.</summary>
         public ParsedLog ParsedLog { get; set; }
 
+        /// <summary>Whether to show the raw unparsed log.</summary>
+        public bool ShowRaw { get; set; }
+
         /// <summary>An error which occurred while uploading the log to Pastebin.</summary>
         public string UploadError { get; set; }
 
@@ -43,12 +46,24 @@ namespace StardewModdingAPI.Web.ViewModels
         /// <summary>Construct an instance.</summary>
         /// <param name="sectionUrl">The root URL for the log parser controller.</param>
         /// <param name="pasteID">The paste ID.</param>
-        /// <param name="parsedLog">The parsed log info.</param>
-        public LogParserModel(string sectionUrl, string pasteID, ParsedLog parsedLog)
+        public LogParserModel(string sectionUrl, string pasteID)
         {
             this.SectionUrl = sectionUrl;
             this.PasteID = pasteID;
+            this.ParsedLog = null;
+            this.ShowRaw = false;
+        }
+
+        /// <summary>Construct an instance.</summary>
+        /// <param name="sectionUrl">The root URL for the log parser controller.</param>
+        /// <param name="pasteID">The paste ID.</param>
+        /// <param name="parsedLog">The parsed log info.</param>
+        /// <param name="showRaw">Whether to show the raw unparsed log.</param>
+        public LogParserModel(string sectionUrl, string pasteID, ParsedLog parsedLog, bool showRaw)
+            : this(sectionUrl, pasteID)
+        {
             this.ParsedLog = parsedLog;
+            this.ShowRaw = showRaw;
         }
 
         /// <summary>Get all content packs in the log grouped by the mod they're for.</summary>
-- 
cgit