Merge branch 'develop' into stable

7 files changed, 140 insertions, 15 deletions

diff --git a/src/SMAPI.Web/Framework/Clients/Chucklefish/ChucklefishClient.cs b/src/SMAPI.Web/Framework/Clients/Chucklefish/ChucklefishClient.cs
index 6772672c..029553ce 100644
--- a/src/SMAPI.Web/Framework/Clients/Chucklefish/ChucklefishClient.cs
+++ b/src/SMAPI.Web/Framework/Clients/Chucklefish/ChucklefishClient.cs
@@ -12,9 +12,6 @@ namespace StardewModdingAPI.Web.Framework.Clients.Chucklefish
         /*********
         ** Properties
         *********/
-        /// <summary>The base URL for the Chucklefish mod site.</summary>
-        private readonly string BaseUrl;
-
         /// <summary>The URL for a mod page excluding the base URL, where {0} is the mod ID.</summary>
         private readonly string ModPageUrlFormat;
 
@@ -31,7 +28,6 @@ namespace StardewModdingAPI.Web.Framework.Clients.Chucklefish
         /// <param name="modPageUrlFormat">The URL for a mod page excluding the <paramref name="baseUrl"/>, where {0} is the mod ID.</param>
         public ChucklefishClient(string userAgent, string baseUrl, string modPageUrlFormat)
         {
-            this.BaseUrl = baseUrl;
             this.ModPageUrlFormat = modPageUrlFormat;
             this.Client = new FluentClient(baseUrl).SetUserAgent(userAgent);
         }
@@ -59,7 +55,7 @@ namespace StardewModdingAPI.Web.Framework.Clients.Chucklefish
             doc.LoadHtml(html);
 
             // extract mod info
-            string url = new UriBuilder(new Uri(this.BaseUrl)) { Path = string.Format(this.ModPageUrlFormat, id) }.Uri.ToString();
+            string url = this.GetModUrl(id);
             string name = doc.DocumentNode.SelectSingleNode("//meta[@name='twitter:title']").Attributes["content"].Value;
             if (name.StartsWith("[SMAPI] "))
                 name = name.Substring("[SMAPI] ".Length);
@@ -79,5 +75,18 @@ namespace StardewModdingAPI.Web.Framework.Clients.Chucklefish
         {
             this.Client?.Dispose();
         }
+
+
+        /*********
+        ** Private methods
+        *********/
+        /// <summary>Get the full mod page URL for a given ID.</summary>
+        /// <param name="id">The mod ID.</param>
+        private string GetModUrl(uint id)
+        {
+            UriBuilder builder = new UriBuilder(this.Client.BaseClient.BaseAddress);
+            builder.Path += string.Format(this.ModPageUrlFormat, id);
+            return builder.Uri.ToString();
+        }
     }
 }
diff --git a/src/SMAPI.Web/Framework/Clients/Nexus/NexusClient.cs b/src/SMAPI.Web/Framework/Clients/Nexus/NexusClient.cs
index 1a7011e2..adec41be 100644
--- a/src/SMAPI.Web/Framework/Clients/Nexus/NexusClient.cs
+++ b/src/SMAPI.Web/Framework/Clients/Nexus/NexusClient.cs
@@ -3,7 +3,7 @@ using Pathoschild.Http.Client;
 
 namespace StardewModdingAPI.Web.Framework.Clients.Nexus
 {
-    /// <summary>An HTTP client for fetching mod metadata from Nexus Mods.</summary>
+    /// <summary>An HTTP client for fetching mod metadata from the Nexus Mods API.</summary>
     internal class NexusClient : INexusClient
     {
         /*********
diff --git a/src/SMAPI.Web/Framework/Clients/Nexus/NexusMod.cs b/src/SMAPI.Web/Framework/Clients/Nexus/NexusMod.cs
index 2b04104f..cd52c72b 100644
--- a/src/SMAPI.Web/Framework/Clients/Nexus/NexusMod.cs
+++ b/src/SMAPI.Web/Framework/Clients/Nexus/NexusMod.cs
@@ -17,5 +17,9 @@ namespace StardewModdingAPI.Web.Framework.Clients.Nexus
         /// <summary>The mod's web URL.</summary>
         [JsonProperty("mod_page_uri")]
         public string Url { get; set; }
+
+        /// <summary>A user-friendly error which indicates why fetching the mod info failed (if applicable).</summary>
+        [JsonIgnore]
+        public string Error { get; set; }
     }
 }
diff --git a/src/SMAPI.Web/Framework/Clients/Nexus/NexusWebScrapeClient.cs b/src/SMAPI.Web/Framework/Clients/Nexus/NexusWebScrapeClient.cs
new file mode 100644
index 00000000..d0597965
--- /dev/null
+++ b/src/SMAPI.Web/Framework/Clients/Nexus/NexusWebScrapeClient.cs
@@ -0,0 +1,106 @@
+using System;
+using System.Net;
+using System.Threading.Tasks;
+using HtmlAgilityPack;
+using Pathoschild.Http.Client;
+
+namespace StardewModdingAPI.Web.Framework.Clients.Nexus
+{
+    /// <summary>An HTTP client for fetching mod metadata from the Nexus website.</summary>
+    internal class NexusWebScrapeClient : INexusClient
+    {
+        /*********
+        ** Properties
+        *********/
+        /// <summary>The URL for a Nexus web page excluding the base URL, where {0} is the mod ID.</summary>
+        private readonly string ModUrlFormat;
+
+        /// <summary>The underlying HTTP client.</summary>
+        private readonly IClient Client;
+
+
+        /*********
+        ** Public methods
+        *********/
+        /// <summary>Construct an instance.</summary>
+        /// <param name="userAgent">The user agent for the Nexus Mods API client.</param>
+        /// <param name="baseUrl">The base URL for the Nexus Mods site.</param>
+        /// <param name="modUrlFormat">The URL for a Nexus Mods web page excluding the <paramref name="baseUrl"/>, where {0} is the mod ID.</param>
+        public NexusWebScrapeClient(string userAgent, string baseUrl, string modUrlFormat)
+        {
+            this.ModUrlFormat = modUrlFormat;
+            this.Client = new FluentClient(baseUrl).SetUserAgent(userAgent);
+        }
+
+        /// <summary>Get metadata about a mod.</summary>
+        /// <param name="id">The Nexus mod ID.</param>
+        /// <returns>Returns the mod info if found, else <c>null</c>.</returns>
+        public async Task<NexusMod> GetModAsync(uint id)
+        {
+            // fetch HTML
+            string html;
+            try
+            {
+                html = await this.Client
+                    .GetAsync(string.Format(this.ModUrlFormat, id))
+                    .AsString();
+            }
+            catch (ApiException ex) when (ex.Status == HttpStatusCode.NotFound)
+            {
+                return null;
+            }
+
+            // parse HTML
+            var doc = new HtmlDocument();
+            doc.LoadHtml(html);
+
+            // handle Nexus error message
+            HtmlNode node = doc.DocumentNode.SelectSingleNode("//div[contains(@class, 'site-notice')][contains(@class, 'warning')]");
+            if (node != null)
+            {
+                string[] errorParts = node.InnerText.Trim().Split(new[] { '\n' }, 2, System.StringSplitOptions.RemoveEmptyEntries);
+                string errorCode = errorParts[0];
+                string errorText = errorParts.Length > 1 ? errorParts[1] : null;
+                switch (errorCode.Trim().ToLower())
+                {
+                    case "not found":
+                        return null;
+
+                    default:
+                        return new NexusMod { Error = $"Nexus error: {errorCode} ({errorText})." };
+                }
+            }
+
+            // extract mod info
+            string url = this.GetModUrl(id);
+            string name = doc.DocumentNode.SelectSingleNode("//h1")?.InnerText.Trim();
+            string version = doc.DocumentNode.SelectSingleNode("//ul[contains(@class, 'stats')]//li[@class='stat-version']//div[@class='stat']")?.InnerText.Trim();
+
+            return new NexusMod
+            {
+                Name = name,
+                Version = version,
+                Url = url
+            };
+        }
+
+        /// <summary>Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.</summary>
+        public void Dispose()
+        {
+            this.Client?.Dispose();
+        }
+
+
+        /*********
+        ** Private methods
+        *********/
+        /// <summary>Get the full mod page URL for a given ID.</summary>
+        /// <param name="id">The mod ID.</param>
+        private string GetModUrl(uint id)
+        {
+            UriBuilder builder = new UriBuilder(this.Client.BaseClient.BaseAddress);
+            builder.Path += string.Format(this.ModUrlFormat, id);
+            return builder.Uri.ToString();
+        }
+    }
+}
diff --git a/src/SMAPI.Web/Framework/LogParsing/LogParser.cs b/src/SMAPI.Web/Framework/LogParsing/LogParser.cs
index 23a1baa4..9e44f163 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);
@@ -53,6 +55,7 @@ namespace StardewModdingAPI.Web.Framework.LogParsing
                     return new ParsedLog
                     {
                         IsValid = false,
+                        RawText = logText,
                         Error = "The log is empty."
                     };
                 }
@@ -61,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
@@ -152,7 +156,7 @@ namespace StardewModdingAPI.Web.Framework.LogParsing
                 {
                     IsValid = false,
                     Error = ex.Message,
-                    RawTextIfError = logText
+                    RawText = logText
                 };
             }
             catch (Exception ex)
@@ -161,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/Framework/ModRepositories/NexusRepository.cs b/src/SMAPI.Web/Framework/ModRepositories/NexusRepository.cs
index cfa757ab..e1dc0fcc 100644
--- a/src/SMAPI.Web/Framework/ModRepositories/NexusRepository.cs
+++ b/src/SMAPI.Web/Framework/ModRepositories/NexusRepository.cs
@@ -39,9 +39,11 @@ namespace StardewModdingAPI.Web.Framework.ModRepositories
             try
             {
                 NexusMod mod = await this.Client.GetModAsync(nexusID);
-                return mod != null
-                    ? new ModInfoModel(mod.Name, this.NormaliseVersion(mod.Version), mod.Url)
-                    : new ModInfoModel("Found no mod with this ID.");
+                if (mod == null)
+                    return new ModInfoModel("Found no mod with this ID.");
+                if (mod.Error != null)
+                    return new ModInfoModel(mod.Error);
+                return new ModInfoModel(mod.Name, this.NormaliseVersion(mod.Version), mod.Url);
             }
             catch (Exception ex)
             {