Improve plaintext and json outputs

Author: huangsam

cmd/namigo/sub/search.go

@@ -65,9 +65,9 @@ func SearchPackageAction(c *cli.Context) error {
 	}
 
 	if ptf.isEmpty() {
-		fmt.Printf("🌧️ No results\n")
+		fmt.Println("🌧️ No results")
 	} else {
-		fmt.Printf("🍺 Prepare results\n\n")
+		fmt.Printf("🍺 Prepare %s results\n\n", outputMode)
 	}
 
 	time.Sleep(500 * time.Millisecond)
@@ -111,9 +111,9 @@ func SearchDNSAction(c *cli.Context) error {
 	}
 
 	if ptf.isEmpty() {
-		fmt.Printf("🌧️ No results\n")
+		fmt.Println("🌧️ No results")
 	} else {
-		fmt.Printf("🍺 Prepare results\n\n")
+		fmt.Printf("🍺 Prepare %s results\n\n", outputMode)
 	}
 
 	time.Sleep(500 * time.Millisecond)

cmd/namigo/sub/search_priv.go

@@ -15,27 +15,27 @@ type searchFormatter struct{}
 func (f *searchFormatter) formatGo(result any) string {
 	res := result.(model.GoPackageResult)
 	if len(res.Description) > 80 || len(res.Description) == 0 {
-		return fmt.Sprintf("\t[golang] %s %s ->\n\t\t%.80s...", res.Name, res.Path, res.Description)
+		return fmt.Sprintf("📦 [golang] %s (%s) ->\n\t%.80s...", res.Name, res.Path, res.Description)
 	}
-	return fmt.Sprintf("\t[golang] %s %s ->\n\t\t%s", res.Name, res.Path, res.Description)
+	return fmt.Sprintf("📦 [golang] %s (%s) ->\n\t%s", res.Name, res.Path, res.Description)
 }
 
 // formatNPM formats NPM package results.
 func (f *searchFormatter) formatNPM(result any) string {
 	res := result.(model.NPMPackageResult)
 	if len(res.Description) > 80 || len(res.Description) == 0 {
-		return fmt.Sprintf("\t[npm] %s [exact=%v] ->\n\t\t%.80s...", res.Name, res.IsExactMatch, res.Description)
+		return fmt.Sprintf("📦 [npm] %s [exact=%v] ->\n\t%.80s...", res.Name, res.IsExactMatch, res.Description)
 	}
-	return fmt.Sprintf("\t[npm] %s [exact=%v] ->\n\t\t%s", res.Name, res.IsExactMatch, res.Description)
+	return fmt.Sprintf("📦 [npm] %s [exact=%v] ->\n\t%s", res.Name, res.IsExactMatch, res.Description)
 }
 
 // formatPyPI formats PyPI package results.
 func (f *searchFormatter) formatPyPI(result any) string {
 	res := result.(model.PyPIPackageResult)
 	if len(res.Description) > 80 || len(res.Description) == 0 {
-		return fmt.Sprintf("\t[pypi] %s by %s ->\n\t\t%.80s...", res.Name, res.Author, res.Description)
+		return fmt.Sprintf("📦 [pypi] %s by %s ->\n\t%.80s...", res.Name, res.Author, res.Description)
 	}
-	return fmt.Sprintf("\t[pypi] %s by %s ->\n\t\t%s", res.Name, res.Author, res.Description)
+	return fmt.Sprintf("📦 [pypi] %s by %s ->\n\t%s", res.Name, res.Author, res.Description)
 }
 
 // formatDNS formats DNS results.
@@ -47,7 +47,7 @@ func (f *searchFormatter) formatDNS(result any) string {
 	} else {
 		content = fmt.Sprintf("The IPs are %v", res.IPList)
 	}
-	return fmt.Sprintf("\t[dns] %s w/ %d IPs ->\n\t\t%v", res.FQDN, len(res.IPList), content)
+	return fmt.Sprintf("🌎 [dns] %s w/ %d IPs ->\n\t%v", res.FQDN, len(res.IPList), content)
 }
 
 // searchPortfolio has result slices and task helpers.

internal/util/output.go

@@ -55,14 +55,18 @@ func PrintResults(results any, label string, format func(any) string, mode Outpu
 func printResults[T any](results []T, label string, format func(any) string, mode OutputMode) {
 	switch mode {
 	case JSONMode:
-		jsonData, err := json.MarshalIndent(results, "", "  ")
+		type wrapper struct {
+			Label   string `json:"label"`
+			Results []T    `json:"results"`
+		}
+		wrapped := &wrapper{Label: label, Results: results}
+		jsonData, err := json.MarshalIndent(wrapped, "", "  ")
 		if err != nil {
 			fmt.Printf("Cannot print %s for %s: %v\n", mode, label, err)
 			return
 		}
-		fmt.Printf("%s: %s\n", label, jsonData)
+		fmt.Printf("%s\n", jsonData)
 	case TextMode:
-		fmt.Printf("%d %s results found:\n", len(results), label)
 		for _, r := range results {
 			fmt.Println(format(r))
 		}