From e6cfd112ea9b57ea47a9a4e1cf292257899d708f Mon Sep 17 00:00:00 2001
From: EnumDev <enumdev@enumerated.dev>
Date: Mon, 7 Oct 2024 19:12:17 +0300
Subject: [PATCH] Improved version comparison

---
 go.mod                 |  1 +
 go.sum                 |  4 ++++
 main.go                | 24 ++++++++++++++++--------
 utils/package_utils.go |  8 ++++++++
 4 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/go.mod b/go.mod
index 017c769..eb5bc0a 100644
--- a/go.mod
+++ b/go.mod
@@ -4,5 +4,6 @@ go 1.22
 
 require (
 	github.com/elliotchance/orderedmap/v2 v2.4.0 // indirect
+	github.com/knqyf263/go-rpm-version v0.0.0-20240918084003-2afd7dc6a38f // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
diff --git a/go.sum b/go.sum
index e437a0b..138d9eb 100644
--- a/go.sum
+++ b/go.sum
@@ -1,5 +1,9 @@
 github.com/elliotchance/orderedmap/v2 v2.4.0 h1:6tUmMwD9F998FNpwFxA5E6NQvSpk2PVw7RKsVq3+2Cw=
 github.com/elliotchance/orderedmap/v2 v2.4.0/go.mod h1:85lZyVbpGaGvHvnKa7Qhx7zncAdBIBq6u56Hb1PRU5Q=
+github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY=
+github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
+github.com/knqyf263/go-rpm-version v0.0.0-20240918084003-2afd7dc6a38f h1:xt29M2T6STgldg+WEP51gGePQCsQvklmP2eIhPIBK3g=
+github.com/knqyf263/go-rpm-version v0.0.0-20240918084003-2afd7dc6a38f/go.mod h1:i4sF0l1fFnY1aiw08QQSwVAFxHEm311Me3WsU/X7nL0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/main.go b/main.go
index edff4ae..9619279 100644
--- a/main.go
+++ b/main.go
@@ -47,8 +47,8 @@ func main() {
 type commandType uint8
 
 const (
-	help commandType = iota
-	version
+	_default commandType = iota
+	help
 	info
 	list
 	search
@@ -62,7 +62,7 @@ const (
 func getCommandType() commandType {
 	switch subcommand {
 	case "version":
-		return version
+		return _default
 	case "info":
 		return info
 	case "list":
@@ -86,7 +86,7 @@ func getCommandType() commandType {
 
 func resolveCommand() {
 	switch getCommandType() {
-	case version:
+	case _default:
 		fmt.Println("Bubble Package Manager (BPM)")
 		fmt.Println("Version: " + bpmVer)
 	case info:
@@ -270,11 +270,15 @@ func resolveCommand() {
 				}
 				sourceInfo = "(From Source)"
 			}
+
 			if installedInfo == nil {
 				fmt.Printf("%s: %s (Install) %s\n", pkgInfo.Name, pkgInfo.GetFullVersion(), sourceInfo)
-			} else if strings.Compare(pkgInfo.GetFullVersion(), installedInfo.GetFullVersion()) < 0 {
+			}
+
+			comparison := utils.ComparePackageVersions(*pkgInfo, *installedInfo)
+			if comparison < 0 {
 				fmt.Printf("%s: %s -> %s (Downgrade) %s\n", pkgInfo.Name, installedInfo.GetFullVersion(), pkgInfo.GetFullVersion(), sourceInfo)
-			} else if strings.Compare(pkgInfo.GetFullVersion(), installedInfo.GetFullVersion()) > 0 {
+			} else if comparison > 0 {
 				fmt.Printf("%s: %s -> %s (Upgrade) %s\n", pkgInfo.Name, installedInfo.GetFullVersion(), pkgInfo.GetFullVersion(), sourceInfo)
 			} else {
 				fmt.Printf("%s: %s (Reinstall) %s\n", pkgInfo.Name, pkgInfo.GetFullVersion(), sourceInfo)
@@ -383,7 +387,9 @@ func resolveCommand() {
 			if installedInfo == nil {
 				log.Fatalf("Error: could not get package info for (%s)\n", pkg)
 			}
-			if strings.Compare(entry.Info.GetFullVersion(), installedInfo.GetFullVersion()) > 0 {
+
+			comparison := utils.ComparePackageVersions(*entry.Info, *installedInfo)
+			if comparison > 0 {
 				toUpdate.Set(entry.Info.Name, &struct {
 					isDependency bool
 					entry        *utils.RepositoryEntry
@@ -440,7 +446,9 @@ func resolveCommand() {
 				fmt.Printf("%s: %s (Install) %s\n", value.entry.Info.Name, value.entry.Info.GetFullVersion(), sourceInfo)
 				continue
 			}
-			if strings.Compare(value.entry.Info.GetFullVersion(), installedInfo.GetFullVersion()) > 0 {
+
+			comparison := utils.ComparePackageVersions(*value.entry.Info, *installedInfo)
+			if comparison > 0 {
 				fmt.Printf("%s: %s -> %s (Upgrade) %s\n", value.entry.Info.Name, installedInfo.GetFullVersion(), value.entry.Info.GetFullVersion(), sourceInfo)
 			} else if reinstall {
 				fmt.Printf("%s: %s -> %s (Reinstall) %s\n", value.entry.Info.Name, installedInfo.GetFullVersion(), value.entry.Info.GetFullVersion(), sourceInfo)
diff --git a/utils/package_utils.go b/utils/package_utils.go
index 03881bf..3b0ca9b 100644
--- a/utils/package_utils.go
+++ b/utils/package_utils.go
@@ -6,6 +6,7 @@ import (
 	"compress/gzip"
 	"errors"
 	"fmt"
+	version "github.com/knqyf263/go-rpm-version"
 	"gopkg.in/yaml.v3"
 	"io"
 	"io/fs"
@@ -48,6 +49,13 @@ const (
 	Unknown    InstallationReason = "unknown"
 )
 
+func ComparePackageVersions(info1, info2 PackageInfo) int {
+	v1 := version.NewVersion(info1.GetFullVersion())
+	v2 := version.NewVersion(info2.GetFullVersion())
+
+	return v1.Compare(v2)
+}
+
 func GetInstallationReason(pkg, rootDir string) InstallationReason {
 	installedDir := path.Join(rootDir, "var/lib/bpm/installed/")
 	pkgDir := path.Join(installedDir, pkg)