From 9b247b67f64af903fd610481e74dbe7175580b84 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Sun, 24 Sep 2017 13:19:02 -0400
Subject: improve version normalising (#336, #361)

---
 .../Framework/ModRepositories/NexusRepository.cs   | 23 ++++++++--------------
 1 file changed, 8 insertions(+), 15 deletions(-)

(limited to 'src/StardewModdingAPI.Web/Framework/ModRepositories/NexusRepository.cs')

diff --git a/src/StardewModdingAPI.Web/Framework/ModRepositories/NexusRepository.cs b/src/StardewModdingAPI.Web/Framework/ModRepositories/NexusRepository.cs
index 6cf5b04a..e679b977 100644
--- a/src/StardewModdingAPI.Web/Framework/ModRepositories/NexusRepository.cs
+++ b/src/StardewModdingAPI.Web/Framework/ModRepositories/NexusRepository.cs
@@ -7,25 +7,18 @@ using StardewModdingAPI.Models;
 namespace StardewModdingAPI.Web.Framework.ModRepositories
 {
     /// <summary>An HTTP client for fetching mod metadata from Nexus Mods.</summary>
-    internal class NexusRepository : IModRepository
+    internal class NexusRepository : RepositoryBase
     {
         /*********
         ** Properties
         *********/
+        /// <summary>The URL for a Nexus Mods API query 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;
 
 
-        /*********
-        ** Accessors
-        *********/
-        /// <summary>The unique key for this vendor.</summary>
-        public string VendorKey { get; }
-
-        /// <summary>The URL for a Nexus Mods API query excluding the base URL, where {0} is the mod ID.</summary>
-        public string ModUrlFormat { get; }
-
-
         /*********
         ** Public methods
         *********/
@@ -35,15 +28,15 @@ namespace StardewModdingAPI.Web.Framework.ModRepositories
         /// <param name="baseUrl">The base URL for the Nexus Mods API.</param>
         /// <param name="modUrlFormat">The URL for a Nexus Mods API query excluding the <paramref name="baseUrl"/>, where {0} is the mod ID.</param>
         public NexusRepository(string vendorKey, string userAgent, string baseUrl, string modUrlFormat)
+            : base(vendorKey)
         {
-            this.VendorKey = vendorKey;
             this.ModUrlFormat = modUrlFormat;
             this.Client = new FluentClient(baseUrl).SetUserAgent(userAgent);
         }
 
         /// <summary>Get metadata about a mod in the repository.</summary>
         /// <param name="id">The mod ID in this repository.</param>
-        public async Task<ModInfoModel> GetModInfoAsync(string id)
+        public override async Task<ModInfoModel> GetModInfoAsync(string id)
         {
             try
             {
@@ -52,7 +45,7 @@ namespace StardewModdingAPI.Web.Framework.ModRepositories
                     .As<NexusResponseModel>();
 
                 return response != null
-                    ? new ModInfoModel(response.Name, response.Version, response.Url)
+                    ? new ModInfoModel(response.Name, this.NormaliseVersion(response.Version), response.Url)
                     : new ModInfoModel("Found no mod with this ID.");
             }
             catch (Exception ex)
@@ -62,7 +55,7 @@ namespace StardewModdingAPI.Web.Framework.ModRepositories
         }
 
         /// <summary>Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.</summary>
-        public void Dispose()
+        public override void Dispose()
         {
             this.Client.Dispose();
         }
-- 
cgit