From 99023f94871e1f9bad5ee5f5db0ff041a02e9ed5 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Sun, 4 Mar 2018 18:46:05 -0500
Subject: add support for mapping non-semantic remote mod versions

---
 src/SMAPI/Framework/ModData/ModDataRecord.cs       | 11 ++++++++---
 src/SMAPI/Framework/ModData/ParsedModDataRecord.cs |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

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

diff --git a/src/SMAPI/Framework/ModData/ModDataRecord.cs b/src/SMAPI/Framework/ModData/ModDataRecord.cs
index 79a954f7..56275f53 100644
--- a/src/SMAPI/Framework/ModData/ModDataRecord.cs
+++ b/src/SMAPI/Framework/ModData/ModDataRecord.cs
@@ -106,10 +106,10 @@ namespace StardewModdingAPI.Framework.ModData
 
         /// <summary>Get a semantic local version for update checks.</summary>
         /// <param name="version">The remote version to normalise.</param>
-        public string GetLocalVersionForUpdateChecks(string version)
+        public ISemanticVersion GetLocalVersionForUpdateChecks(ISemanticVersion version)
         {
-            return this.MapLocalVersions != null && this.MapLocalVersions.TryGetValue(version, out string newVersion)
-                ? newVersion
+            return this.MapLocalVersions != null && this.MapLocalVersions.TryGetValue(version.ToString(), out string newVersion)
+                ? new SemanticVersion(newVersion)
                 : version;
         }
 
@@ -117,6 +117,11 @@ namespace StardewModdingAPI.Framework.ModData
         /// <param name="version">The remote version to normalise.</param>
         public string GetRemoteVersionForUpdateChecks(string version)
         {
+            // normalise version if possible
+            if (SemanticVersion.TryParse(version, out ISemanticVersion parsed))
+                version = parsed.ToString();
+
+            // fetch remote version
             return this.MapRemoteVersions != null && this.MapRemoteVersions.TryGetValue(version, out string newVersion)
                 ? newVersion
                 : version;
diff --git a/src/SMAPI/Framework/ModData/ParsedModDataRecord.cs b/src/SMAPI/Framework/ModData/ParsedModDataRecord.cs
index 7f49790d..deb12bdc 100644
--- a/src/SMAPI/Framework/ModData/ParsedModDataRecord.cs
+++ b/src/SMAPI/Framework/ModData/ParsedModDataRecord.cs
@@ -33,7 +33,7 @@ namespace StardewModdingAPI.Framework.ModData
         *********/
         /// <summary>Get a semantic local version for update checks.</summary>
         /// <param name="version">The remote version to normalise.</param>
-        public string GetLocalVersionForUpdateChecks(string version)
+        public ISemanticVersion GetLocalVersionForUpdateChecks(ISemanticVersion version)
         {
             return this.DataRecord.GetLocalVersionForUpdateChecks(version);
         }
-- 
cgit