codegod100/abra
0
0
Fork 0
forked from toolshed/abra
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'filter-servers-by-recipe'

Browse Source
This commit is contained in:
decentral1se
2023-01-23 09:33:31 +01:00
parent c72462e0b6 a694c8c20e
commit 521570224b
2 changed files with 37 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cli/app/list.go
View File

@ -23,12 +23,12 @@ var statusFlag = &cli.BoolFlag{
Destination: &status,
}
var appRecipe string
var recipeFilter string
var recipeFlag = &cli.StringFlag{
Name: "recipe, r",
Value: "",
Usage: "Show apps of a specific recipe",
Destination: &appRecipe,
Destination: &recipeFilter,
}
var listAppServer string
@ -84,7 +84,7 @@ can take some time.
logrus.Fatal(err)
}
apps, err := config.GetApps(appFiles)
apps, err := config.GetApps(appFiles, recipeFilter)
if err != nil {
logrus.Fatal(err)
}
@ -104,7 +104,7 @@ can take some time.
}
}
statuses, err = config.GetAppStatuses(appFiles, internal.MachineReadable)
statuses, err = config.GetAppStatuses(apps, internal.MachineReadable)
if err != nil {
logrus.Fatal(err)
}
@ -124,14 +124,14 @@ can take some time.
var ok bool
if stats, ok = allStats[app.Server]; !ok {
stats = serverStatus{}
if appRecipe == "" {
if recipeFilter == "" {
// count server, no filtering
totalServersCount++
}
}
if app.Recipe == appRecipe || appRecipe == "" {
if appRecipe != "" {
if app.Recipe == recipeFilter || recipeFilter == "" {
if recipeFilter != "" {
// only count server if matches filter
totalServersCount++
}