From 9369232118d0ae08df49bbc30037387cf71dd861 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Mon, 19 Feb 2018 20:29:52 -0500
Subject: [PATCH] replace manual relative path logic with new path utilities

---
 src/SMAPI/Framework/ModLoading/ModResolver.cs | 3 ++-
 src/SMAPI/Program.cs                          | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/SMAPI/Framework/ModLoading/ModResolver.cs b/src/SMAPI/Framework/ModLoading/ModResolver.cs
index 8b4a3eb8..ba6dab1a 100644
--- a/src/SMAPI/Framework/ModLoading/ModResolver.cs
+++ b/src/SMAPI/Framework/ModLoading/ModResolver.cs
@@ -6,6 +6,7 @@ using StardewModdingAPI.Framework.Exceptions;
 using StardewModdingAPI.Framework.ModData;
 using StardewModdingAPI.Framework.Models;
 using StardewModdingAPI.Framework.Serialisation;
+using StardewModdingAPI.Framework.Utilities;
 
 namespace StardewModdingAPI.Framework.ModLoading
 {
@@ -55,7 +56,7 @@ namespace StardewModdingAPI.Framework.ModLoading
                 if (string.IsNullOrWhiteSpace(displayName))
                     displayName = dataRecord?.DisplayName;
                 if (string.IsNullOrWhiteSpace(displayName))
-                    displayName = modDir.FullName.Replace(rootPath, "").Trim('/', '\\');
+                    displayName = PathUtilities.GetRelativePath(rootPath, modDir.FullName);
 
                 // apply defaults
                 if (manifest != null && dataRecord != null)
diff --git a/src/SMAPI/Program.cs b/src/SMAPI/Program.cs
index 825a8401..2d0908a1 100644
--- a/src/SMAPI/Program.cs
+++ b/src/SMAPI/Program.cs
@@ -25,6 +25,7 @@ using StardewModdingAPI.Framework.ModHelpers;
 using StardewModdingAPI.Framework.ModLoading;
 using StardewModdingAPI.Framework.Reflection;
 using StardewModdingAPI.Framework.Serialisation;
+using StardewModdingAPI.Framework.Utilities;
 using StardewValley;
 using Monitor = StardewModdingAPI.Framework.Monitor;
 using SObject = StardewValley.Object;
@@ -660,7 +661,7 @@ namespace StardewModdingAPI
             {
                 // get basic info
                 IManifest manifest = metadata.Manifest;
-                this.Monitor.Log($"Loading {metadata.DisplayName} from {metadata.DirectoryPath.Replace(Constants.ModPath, "").TrimStart(Path.DirectorySeparatorChar)} (content pack)...", LogLevel.Trace);
+                this.Monitor.Log($"Loading {metadata.DisplayName} from {PathUtilities.GetRelativePath(Constants.ModPath, metadata.DirectoryPath)} (content pack)...", LogLevel.Trace);
 
                 // validate status
                 if (metadata.Status == ModMetadataStatus.Failed)
@@ -702,7 +703,7 @@ namespace StardewModdingAPI
                     // get basic info
                     IManifest manifest = metadata.Manifest;
                     this.Monitor.Log(metadata.Manifest?.EntryDll != null
-                        ? $"Loading {metadata.DisplayName} from {metadata.DirectoryPath.Replace(Constants.ModPath, "").TrimStart(Path.DirectorySeparatorChar)}{Path.DirectorySeparatorChar}{metadata.Manifest.EntryDll}..." // don't use Path.Combine here, since EntryDLL might not be valid
+                        ? $"Loading {metadata.DisplayName} from {PathUtilities.GetRelativePath(Constants.ModPath, metadata.DirectoryPath)}{Path.DirectorySeparatorChar}{metadata.Manifest.EntryDll}..." // don't use Path.Combine here, since EntryDLL might not be valid
                         : $"Loading {metadata.DisplayName}...", LogLevel.Trace);
 
                     // validate status