From 9b3dd42cbf62a8524ac390d9418cf961c502868a Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Fri, 16 Feb 2018 23:02:04 -0500
Subject: encapsulate update key to URL logic for reuse (#437)

---
 src/SMAPI/Framework/ModLoading/ModResolver.cs | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

(limited to 'src/SMAPI/Framework/ModLoading')

diff --git a/src/SMAPI/Framework/ModLoading/ModResolver.cs b/src/SMAPI/Framework/ModLoading/ModResolver.cs
index 09a9299e..99d86bf8 100644
--- a/src/SMAPI/Framework/ModLoading/ModResolver.cs
+++ b/src/SMAPI/Framework/ModLoading/ModResolver.cs
@@ -73,8 +73,8 @@ namespace StardewModdingAPI.Framework.ModLoading
         /// <summary>Validate manifest metadata.</summary>
         /// <param name="mods">The mod manifests to validate.</param>
         /// <param name="apiVersion">The current SMAPI version.</param>
-        /// <param name="vendorModUrls">Maps vendor keys (like <c>Nexus</c>) to their mod URL template (where <c>{0}</c> is the mod ID).</param>
-        public void ValidateManifests(IEnumerable<IModMetadata> mods, ISemanticVersion apiVersion, IDictionary<string, string> vendorModUrls)
+        /// <param name="getUpdateUrl">Get an update URL for an update key (if valid).</param>
+        public void ValidateManifests(IEnumerable<IModMetadata> mods, ISemanticVersion apiVersion, Func<string, string> getUpdateUrl)
         {
             mods = mods.ToArray();
 
@@ -101,15 +101,9 @@ namespace StardewModdingAPI.Framework.ModLoading
                             List<string> updateUrls = new List<string>();
                             foreach (string key in mod.Manifest.UpdateKeys ?? new string[0])
                             {
-                                string[] parts = key.Split(new[] { ':' }, 2);
-                                if (parts.Length != 2)
-                                    continue;
-
-                                string vendorKey = parts[0].Trim();
-                                string modID = parts[1].Trim();
-
-                                if (vendorModUrls.TryGetValue(vendorKey, out string urlTemplate))
-                                    updateUrls.Add(string.Format(urlTemplate, modID));
+                                string url = getUpdateUrl(key);
+                                if (url != null)
+                                    updateUrls.Add(url);
                             }
                             if (mod.DataRecord.AlternativeUrl != null)
                                 updateUrls.Add(mod.DataRecord.AlternativeUrl);
-- 
cgit