From f0e02ba38ff7dc9d8148c833821b291248ce2122 Mon Sep 17 00:00:00 2001
From: Giovanni Harting <539@idlegandalf.com>
Date: Sun, 23 Mar 2025 15:58:29 +0100
Subject: [PATCH] use packages instead of pkgbases for output

---
 go.mod  |  1 -
 go.sum  |  2 --
 main.go | 21 ++++++++++-----------
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/go.mod b/go.mod
index ab9fcff..d3322b0 100644
--- a/go.mod
+++ b/go.mod
@@ -4,7 +4,6 @@ go 1.24
 
 require (
 	github.com/Jguer/go-alpm/v2 v2.2.2
-	github.com/deckarep/golang-set/v2 v2.8.0
 	github.com/sirupsen/logrus v1.9.3
 	somegit.dev/ALHP/ALHP.GO v0.0.0-20250322224907-01404adad53a
 )
diff --git a/go.sum b/go.sum
index 53628ab..8449e03 100644
--- a/go.sum
+++ b/go.sum
@@ -9,8 +9,6 @@ github.com/Morganamilo/go-pacmanconf v0.0.0-20210502114700-cff030e927a5/go.mod h
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/deckarep/golang-set/v2 v2.8.0 h1:swm0rlPCmdWn9mESxKOjWk8hXSqoxOp+ZlfuyaAdFlQ=
-github.com/deckarep/golang-set/v2 v2.8.0/go.mod h1:VAky9rY/yGXJOLEDv3OMci+7wtDpOF4IN+y82NBOac4=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
diff --git a/main.go b/main.go
index c5df90f..2a7af6f 100644
--- a/main.go
+++ b/main.go
@@ -5,7 +5,6 @@ import (
 	"flag"
 	"fmt"
 	"github.com/Jguer/go-alpm/v2"
-	"github.com/deckarep/golang-set/v2"
 	log "github.com/sirupsen/logrus"
 	"io"
 	"net/http"
@@ -25,8 +24,8 @@ var (
 )
 
 type JSONOut struct {
-	InQueue      int      `json:"in_queue"`
-	PackageBases []string `json:"package_base"`
+	Total    int      `json:"total"`
+	Packages []string `json:"packages"`
 }
 
 func main() {
@@ -61,27 +60,27 @@ func main() {
 	}
 	log.Debugf("alhp build queue length: %d", len(alhpQueue))
 
-	packagesInQueue := mapset.NewSet[string]()
+	var packagesInQueue []string
 	for _, pkg := range db.PkgCache().Slice() {
 		if Find(alhpQueue, pkg.Base()) != -1 {
-			log.Debugf("found package in queue: %s", pkg.Base())
-			packagesInQueue.Add(pkg.Base())
+			log.Debugf("found package in queue: %s", pkg.Name())
+			packagesInQueue = append(packagesInQueue, pkg.Name())
 		}
 	}
 
-	if !packagesInQueue.IsEmpty() {
-		log.Debugf("found %d of your local packages in queue", packagesInQueue.Cardinality())
+	if len(packagesInQueue) > 0 {
+		log.Debugf("found %d of your local packages in queue", len(packagesInQueue))
 		if *jsonFlag {
 			err = json.NewEncoder(os.Stdout).Encode(JSONOut{
-				InQueue:      packagesInQueue.Cardinality(),
-				PackageBases: packagesInQueue.ToSlice(),
+				Total:    len(packagesInQueue),
+				Packages: packagesInQueue,
 			})
 			if err != nil {
 				log.Errorf("error encoding JSON: %v", err)
 				os.Exit(1)
 			}
 		} else {
-			fmt.Println(strings.Join(packagesInQueue.ToSlice(), "\n"))
+			fmt.Println(strings.Join(packagesInQueue, "\n"))
 		}
 
 		if *exitCodeFlag {