♻️ Synced dbin 📦 <-- 1.5: update AM metadata generator ⌚

Author: Azathothas

misc/cmd/dbinRepoIndexGenerators/1.5/generator.go

@@ -8,6 +8,7 @@ import (
 	"sort"
 	"strconv"
 	"strings"
+	"path/filepath"
 
 	"github.com/fxamacker/cbor/v2"
 	"github.com/goccy/go-json"
@@ -374,7 +375,7 @@ func saveAll(filename string, metadata DbinMetadata) error {
 	if err := saveMsgp(filename, metadata); err != nil {
 		return err
 	}
-	//genAMMeta(filename, dbinMetadata)
+	genAMMeta(filename, metadata)
 	return saveYAML(filename, metadata)
 }
 
@@ -601,9 +602,10 @@ func t[T any](cond bool, vtrue, vfalse T) T {
 	return vfalse
 }
 
-/* The following is a _favor_ I'm doing to ivan-hc and everyone that contributes
- *  And actively endorses or uses AM
- *  They are a tremendous help to the Portable Linux Apps community!
+/* AM is one of the most relevant projects of the portable Linux apps community
+ * And the AM repo is a thirdparty optional repo in `dbin`, so its only fair that
+ * we help them distribute more programs too!                                   -
+ */
 const pipeRepl = "ǀ" // Replacement for `|` to avoid breaking the MD table
 func replacePipeFields(pkg *DbinItem) {
 	pkg.Name = strings.ReplaceAll(pkg.Name, "|", pipeRepl)
@@ -613,49 +615,57 @@ func replacePipeFields(pkg *DbinItem) {
 		pkg.WebURLs[i] = strings.ReplaceAll(pkg.WebURLs[i], "|", pipeRepl)
 	}
 }
-
 func genAMMeta(filename string, metadata DbinMetadata) {
-	replaceEmptyWithNil := func(value string) string {
-		if value == "" {
-			return "nil"
-		}
-		return value
-	}
-
 	file, err := os.Create(filename + ".txt")
 	if err != nil {
 		fmt.Println("Error creating output file:", err)
 		return
 	}
 	defer file.Close()
 
-	for _, items := range metadata {
-		for _, pkg := range items {
-			pkg.Name = replaceEmptyWithNil(pkg.Name)
-			pkg.Description = replaceEmptyWithNil(pkg.Description)
-			pkg.DownloadURL = replaceEmptyWithNil(pkg.DownloadURL)
-
-			webURL := pkg.DownloadURL
-			if webURL == "nil" && len(pkg.WebURLs) > 0 {
-				webURL = pkg.WebURLs[0]
-			}
+	file.WriteString("| appname | description | site | download | version |\n")
+	file.WriteString("|---------|-------------|------|----------|---------|\n")
 
-			replacePipeFields(&pkg)
+	var allEntries []DbinItem
+	for _, entries := range metadata {
+		allEntries = append(allEntries, entries...)
+	}
 
-			pkgName := pkg.Name
-			strings.ToLower(pkgName)
-			strings.ReplaceAll(pkgName, " ", "-")
+	sort.Slice(allEntries, func(i, j int) bool {
+		return strings.ToLower(allEntries[i].Name) < strings.ToLower(allEntries[j].Pkg)
+	})
 
-			bsum := pkg.Bsum
-			if len(bsum) > 12 {
-				bsum = bsum[:12]
-			} else {
-				bsum = "nil"
-			}
+	for _, entry := range allEntries {
+		pkg := strings.TrimSuffix(entry.Pkg, filepath.Ext(entry.Pkg))
 
-			file.WriteString(fmt.Sprintf("| %s | %s | %s | %s | %s |\n",
-				pkgName, pkg.Description, webURL, pkg.DownloadURL, bsum))
+		if pkg != "" {
+			entry.Pkg = pkg
 		}
+
+		siteURL := ""
+		if len(entry.SrcURLs) > 0 {
+			siteURL = entry.SrcURLs[0]
+		} else if len(entry.WebURLs) > 0 {
+			siteURL = entry.WebURLs[0]
+		} else {
+			siteURL = "https://github.com/xplshn/dbin"
+		}
+
+		version := entry.Version
+		if version == "" && entry.BuildDate != "" {
+			version = entry.BuildDate
+		}
+		if version == "" {
+			version = "not_available"
+		}
+
+		file.WriteString(fmt.Sprintf("| %s | %s | %s | %s | %s |\n",
+			pkg,
+			t(entry.Description != "", entry.Description, "not_available"),
+			t(siteURL != "", siteURL, "not_available"),
+			entry.DownloadURL,
+			t(version != "", version, "not_available"),
+		))
 	}
 }
-*/
+