From 976a1d85db9d08b7f59dd7bdc5cda26be2901eb4 Mon Sep 17 00:00:00 2001
From: Alec Warner <antarus@gentoo.org>
Date: Sun, 17 May 2020 14:50:42 -0700
Subject: Packages should print out different USE_EXPAND sources.

Extend GetPackageUseflags to return a map instead of a list.
Keys are USE_EXPAND categories, and values are the flags.

Fix json and useflag templates to properly emit the flags.

Signed-off-by: Alec Warner <antarus@gentoo.org>
---
 pkg/app/handler/packages/json.go  | 12 +++++++-----
 pkg/app/handler/packages/utils.go | 21 +++++++++++++--------
 2 files changed, 20 insertions(+), 13 deletions(-)

(limited to 'pkg/app/handler')

diff --git a/pkg/app/handler/packages/json.go b/pkg/app/handler/packages/json.go
index 4af551c..24cb2e7 100644
--- a/pkg/app/handler/packages/json.go
+++ b/pkg/app/handler/packages/json.go
@@ -125,11 +125,13 @@ func getJSONUseflag(gpackage *models.Package) Use {
 			Description: useflag.Description,
 		})
 	}
-	for _, useflag := range useExpands {
-		useflags.UseExpand = append(useflags.UseExpand, Useflag{
-			Name:        useflag.Name,
-			Description: useflag.Description,
-		})
+	for _, flags := range useExpands {
+		for _, flag := range flags {
+			useflags.UseExpand = append(useflags.UseExpand, Useflag{
+				Name:        flag.Name,
+				Description: flag.Description,
+			})
+		}
 	}
 	return useflags
 }
diff --git a/pkg/app/handler/packages/utils.go b/pkg/app/handler/packages/utils.go
index a6add3c..3553725 100644
--- a/pkg/app/handler/packages/utils.go
+++ b/pkg/app/handler/packages/utils.go
@@ -168,7 +168,7 @@ func getSearchData(packages []models.Package, search string) interface{} {
 		Packages    []models.Package
 		Application models.Application
 	}{
-		Header:         models.Header{Title: search + " – ", Tab:   "packages", },
+		Header:      models.Header{Title: search + " – ", Tab: "packages"},
 		Search:      search,
 		Packages:    packages,
 		Application: utils.GetApplicationData(),
@@ -246,8 +246,9 @@ func getParameterValue(parameterName string, r *http.Request) string {
 
 // getPackageUseflags retrieves all local USE flags, global USE
 // flags and use expands for a given package
-func getPackageUseflags(gpackage *models.Package) ([]models.Useflag, []models.Useflag, []models.Useflag) {
-	var localUseflags, globalUseflags, useExpands []models.Useflag
+func getPackageUseflags(gpackage *models.Package) ([]models.Useflag, []models.Useflag, map[string][]models.Useflag) {
+	var localUseflags, globalUseflags []models.Useflag
+	useExpands := make(map[string][]models.Useflag)
 	for _, rawUseflag := range gpackage.Versions[0].Useflags {
 
 		var tmp_useflags []models.Useflag
@@ -269,7 +270,11 @@ func getPackageUseflags(gpackage *models.Package) ([]models.Useflag, []models.Us
 					localUseflags = append(localUseflags, useflag)
 				}
 			} else {
-				useExpands = append(useExpands, useflag)
+				if _, ok := useExpands[useflag.UseExpand]; !ok {
+					useExpands[useflag.UseExpand] = []models.Useflag{useflag}
+				} else {
+					useExpands[useflag.UseExpand] = append(useExpands[useflag.UseExpand], useflag)
+				}
 			}
 		}
 	}
@@ -277,7 +282,7 @@ func getPackageUseflags(gpackage *models.Package) ([]models.Useflag, []models.Us
 }
 
 // createPackageData creates the data used in the show package template
-func createPackageData(gpackage *models.Package, localUseflags []models.Useflag, globalUseflags []models.Useflag, useExpands []models.Useflag) interface{} {
+func createPackageData(gpackage *models.Package, localUseflags []models.Useflag, globalUseflags []models.Useflag, useExpands map[string][]models.Useflag) interface{} {
 	return struct {
 		Header         models.Header
 		Package        models.Package
@@ -285,10 +290,10 @@ func createPackageData(gpackage *models.Package, localUseflags []models.Useflag,
 		Masks          []models.Mask
 		LocalUseflags  []models.Useflag
 		GlobalUseflags []models.Useflag
-		UseExpands     []models.Useflag
+		UseExpands     map[string][]models.Useflag
 		Application    models.Application
 	}{
-		Header:         models.Header{Title: gpackage.Atom + " – ", Tab:   "packages", },
+		Header:         models.Header{Title: gpackage.Atom + " – ", Tab: "packages"},
 		Package:        *gpackage,
 		Versions:       gpackage.Versions,
 		LocalUseflags:  localUseflags,
@@ -307,7 +312,7 @@ func CreateFeedData(name string, versions []*models.Version) interface{} {
 		Versions    []*models.Version
 		Application models.Application
 	}{
-		Header:         models.Header{Title: "Packages – ", Tab:   "packages", },
+		Header:      models.Header{Title: "Packages – ", Tab: "packages"},
 		Name:        name,
 		Versions:    versions,
 		Application: utils.GetApplicationData(),
-- 
cgit v1.2.3-65-gdbad