vincent/aptly
1
0
Fork 0
mirror of https://github.com/aptly-dev/aptly.git synced 2026-04-20 19:38:39 +00:00
Code Issues Projects Releases Wiki Activity

Add -json output flag to repo list|show

Browse Source 
Signed-off-by: Joshua Colson <joshua.colson@gmail.com>
This commit is contained in:
Joshua Colson
2021-09-16 09:23:35 -07:00
committed by Lorenzo Bolla
parent f9d08e1377
commit 1f56fb86e3
12 changed files with 150 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
cmd/repo_list.go
View File

@@ -1,6 +1,7 @@
package cmd
import (
"encoding/json"
"fmt"
"sort"
@@ -16,8 +17,10 @@ func aptlyRepoList(cmd *commander.Command, args []string) error {
}
raw := cmd.Flag.Lookup("raw").Value.Get().(bool)
jsonFlag := cmd.Flag.Lookup("json").Value.Get().(bool)
repos := make([]string, context.CollectionFactory().LocalRepoCollection().Len())
jsonRepos := make([]*deb.LocalRepo, context.CollectionFactory().LocalRepoCollection().Len())
i := 0
context.CollectionFactory().LocalRepoCollection().ForEach(func(repo *deb.LocalRepo) error {
if raw {
@@ -28,7 +31,11 @@ func aptlyRepoList(cmd *commander.Command, args []string) error {
return e
}
repos[i] = fmt.Sprintf(" * %s (packages: %d)", repo.String(), repo.NumPackages())
if jsonFlag {
jsonRepos[i] = repo
} else {
repos[i] = fmt.Sprintf(" * %s (packages: %d)", repo.String(), repo.NumPackages())
}
}
i++
return nil
@@ -36,13 +43,22 @@ func aptlyRepoList(cmd *commander.Command, args []string) error {
context.CloseDatabase()
sort.Strings(repos)
if raw {
sort.Strings(repos)
for _, repo := range repos {
fmt.Printf("%s\n", repo)
}
} else if jsonFlag {
sort.Slice(jsonRepos, func(i, j int) bool {
return jsonRepos[i].Name < jsonRepos[j].Name
})
if output, e := json.MarshalIndent(jsonRepos, "", " "); e == nil {
fmt.Println(string(output))
} else {
err = e
}
} else {
sort.Strings(repos)
if len(repos) > 0 {
fmt.Printf("List of local repos:\n")
for _, repo := range repos {
@@ -72,6 +88,7 @@ Example:
`,
}
cmd.Flag.Bool("json", false, "display list in JSON format")
cmd.Flag.Bool("raw", false, "display list in machine-readable format")
return cmd