Merge pull request #326 from valadas/sort-versions

Properly sorts versions instead of just alphabetically.
nvisionative · Sep 4, 2021 · f0203d2 · f0203d2
2 parents da26e49 + 3f54279
commit f0203d2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 20 deletions.
diff --git a/nvQuickSite/Controllers/PackageController.cs b/nvQuickSite/Controllers/PackageController.cs
@@ -184,7 +184,7 @@ private static IEnumerable<Package> GetGitHubPackages()
 
                         var ghPackage = new Package();
 
-                        ghPackage.version = TrimTagName(release);
+                        ghPackage.version = new System.Version(release.TagName.TrimStart('v').Split('-')[0]);
 
                         if (index == 0 &&
                             release.Name.IndexOf("rc", StringComparison.OrdinalIgnoreCase) >= 0 &&
@@ -200,8 +200,8 @@ private static IEnumerable<Package> GetGitHubPackages()
                         else if (!release.Name.ToUpperInvariant().Contains("RC") &&
                             installPackage != null)
                         {
-                            ghPackage.did = "dnn-platform-" + ghPackage.version.Substring(0, 1);
-                            ghPackage.name = "DNN Platform " + ghPackage.version.Substring(0, 1);
+                            ghPackage.did = "dnn-platform-" + ghPackage.version.Major.ToString();
+                            ghPackage.name = "DNN Platform " + ghPackage.version.Major.ToString();
                             ghPackage.url = installPackage.BrowserDownloadUrl;
                             ghPackage.upgradeurl = upgradePackage.BrowserDownloadUrl;
                             packages.Add(ghPackage);
@@ -221,17 +221,5 @@ private static IEnumerable<Package> GetGitHubPackages()
                 return packages;
             }
         }
-
-        private static string TrimTagName(Release release)
-        {
-            if (release.TagName != null && release.TagName[0] == 'v')
-            {
-                return release.TagName.Remove(0, 1);
-            }
-            else
-            {
-                return release.TagName;
-            }
-        }
     }
 }
diff --git a/nvQuickSite/Models/Package.cs b/nvQuickSite/Models/Package.cs
@@ -15,6 +15,9 @@
 // You should have received a copy of the GNU General Public License
 // along with nvQuickSite.  If not, see <http://www.gnu.org/licenses/>.
 
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+
 namespace nvQuickSite.Models
 {
     /// <summary>
@@ -35,7 +38,8 @@ public class Package
         /// <summary>
         /// Gets or sets the package version.
         /// </summary>
-        public string version { get; set; }
+        [JsonConverter(typeof(VersionConverter))]
+        public System.Version version { get; set; }
 
         /// <summary>
         /// Gets or sets the url to download the install package.

diff --git a/nvQuickSite/Start.cs b/nvQuickSite/Start.cs
@@ -176,7 +176,7 @@ private void LoadPackageVersions(string packageId)
             this.cboProductVersion.Items.Clear();
             foreach (var package in this.Packages.Where(p => p.did == packageId).OrderByDescending(p => p.version))
             {
-                this.cboProductVersion.Items.Add(new ComboItem(package.version, package.version));
+                this.cboProductVersion.Items.Add(new ComboItem(package.version.ToString(), package.version.ToString()));
             }
 
             if (this.cboProductVersion.Items.Count > 0)
@@ -208,7 +208,7 @@ private void DisplayPackagePath()
             Package package;
             var fileName = string.Empty;
 
-            package = this.Packages.FirstOrDefault(p => p.did == ((ComboItem)this.cboProductName.SelectedItem).Value && p.version == ((ComboItem)this.cboProductVersion.SelectedItem).Value);
+            package = this.Packages.FirstOrDefault(p => p.did == ((ComboItem)this.cboProductName.SelectedItem).Value && p.version == new System.Version(((ComboItem)this.cboProductVersion.SelectedItem).Value));
             fileName = package.url.Split('/').Last();
 
             var downloadDirectory = FileSystemController.GetDownloadDirectory();
@@ -237,7 +237,7 @@ private void GetOnlineVersion()
             }
 
             Package package;
-            package = this.Packages.FirstOrDefault(p => p.did == ((ComboItem)this.cboProductName.SelectedItem).Value && p.version == ((ComboItem)this.cboProductVersion.SelectedItem).Value);
+            package = this.Packages.FirstOrDefault(p => p.did == ((ComboItem)this.cboProductName.SelectedItem).Value && p.version == new System.Version(((ComboItem)this.cboProductVersion.SelectedItem).Value));
             var url = package.url;
             var fileName = package.url.Split('/').Last();
 
@@ -298,7 +298,7 @@ private void client_DownloadFileCompleted(object sender, AsyncCompletedEventArgs
             Package package;
             var fileName = string.Empty;
 
-            package = this.Packages.FirstOrDefault(p => p.did == ((ComboItem)this.cboProductName.SelectedItem).Value && p.version == ((ComboItem)this.cboProductVersion.SelectedItem).Value);
+            package = this.Packages.FirstOrDefault(p => p.did == ((ComboItem)this.cboProductName.SelectedItem).Value && p.version == new System.Version(((ComboItem)this.cboProductVersion.SelectedItem).Value));
             fileName = package.url.Split('/').Last();
             this.downloadProgressLogTimer.Stop();
             Log.Logger.Information("Completed download of {fileName}", fileName);