diff options
| author | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2019-12-26 23:47:17 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-26 23:47:17 -0500 |
| commit | 722ffba6eb467fb89b317e75e855d8c51d0c6932 (patch) | |
| tree | 1e4fa2b0395d0368ab3344fbdb23beb942d12d2a /src | |
| parent | 9ea25993569d7295c02db7b7c1cd2f9669b5fba0 (diff) | |
| parent | 360a982336e8b250d79597e323ba267c70c404c2 (diff) | |
| download | SMAPI-722ffba6eb467fb89b317e75e855d8c51d0c6932.tar.gz SMAPI-722ffba6eb467fb89b317e75e855d8c51d0c6932.tar.bz2 SMAPI-722ffba6eb467fb89b317e75e855d8c51d0c6932.zip | |
Merge pull request #684 from danvolchek/fixlogparser
[Log Parser] Fix parsing errors on content packs without authors
Diffstat (limited to 'src')
| -rw-r--r-- | src/SMAPI.Web/Framework/LogParsing/LogParser.cs | 2 | ||||
| -rw-r--r-- | src/SMAPI/Framework/SCore.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/SMAPI.Web/Framework/LogParsing/LogParser.cs b/src/SMAPI.Web/Framework/LogParsing/LogParser.cs index 66a3687f..1210f708 100644 --- a/src/SMAPI.Web/Framework/LogParsing/LogParser.cs +++ b/src/SMAPI.Web/Framework/LogParsing/LogParser.cs @@ -37,7 +37,7 @@ namespace StardewModdingAPI.Web.Framework.LogParsing private readonly Regex ContentPackListStartPattern = new Regex(@"^Loaded \d+ content packs:$", RegexOptions.Compiled | RegexOptions.IgnoreCase); /// <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); + private readonly Regex ContentPackListEntryPattern = new Regex(@"^ (?<name>.+?) (?<version>" + SemanticVersion.UnboundedVersionPattern + @")(?: 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); diff --git a/src/SMAPI/Framework/SCore.cs b/src/SMAPI/Framework/SCore.cs index a89c14d7..6e7c8fcb 100644 --- a/src/SMAPI/Framework/SCore.cs +++ b/src/SMAPI/Framework/SCore.cs @@ -783,7 +783,7 @@ namespace StardewModdingAPI.Framework this.Monitor.Log( $" {metadata.DisplayName} {manifest.Version}" + (!string.IsNullOrWhiteSpace(manifest.Author) ? $" by {manifest.Author}" : "") - + (metadata.IsContentPack ? $" | for {GetModDisplayName(metadata.Manifest.ContentPackFor.UniqueID)}" : "") + + $" | for {GetModDisplayName(metadata.Manifest.ContentPackFor.UniqueID)}" + (!string.IsNullOrWhiteSpace(manifest.Description) ? $" | {manifest.Description}" : ""), LogLevel.Info ); |