WIP: app list command sorting

This commit is contained in:
2021-07-26 18:23:28 +02:00
parent 337d3e9ae1
commit 01cbee824a
3 changed files with 51 additions and 15 deletions

View File

@ -29,7 +29,33 @@ type App struct {
Type string
Domain string
Env AppEnv
File AppFile
}
type ByServer []App
func (a ByServer) Len() int { return len(a) }
func (a ByServer) Swap(i, j int) { a[i], a[j] = a[j], a[i] }
func (a ByServer) Less(i, j int) bool {
return strings.ToLower(a[i].File.Server) < strings.ToLower(a[j].File.Server)
}
type ByType []App
func (a ByType) Len() int { return len(a) }
func (a ByType) Swap(i, j int) { a[i], a[j] = a[j], a[i] }
func (a ByType) Less(i, j int) bool {
return strings.ToLower(a[i].Type) < strings.ToLower(a[j].Type)
}
type ByName []App
func (a ByName) Len() int { return len(a) }
func (a ByName) Swap(i, j int) { a[i], a[j] = a[j], a[i] }
func (a ByName) Less(i, j int) bool {
return strings.ToLower(a[i].Name) < strings.ToLower(a[j].Name)
}
type AppFile struct {
Path string
Server string
@ -81,6 +107,18 @@ func GetApp(apps AppFiles, name AppName) (App, error) {
return app, nil
}
func GetApps(appFiles AppFiles) ([]App, error) {
var apps []App
for name := range appFiles {
app, err := GetApp(appFiles, name)
if err != nil {
return nil, err
}
apps = append(apps, app)
}
return apps, nil
}
// TODO: maybe better names than read and get
func readAppFile(appFile AppFile, name AppName) (App, error) {
@ -88,7 +126,7 @@ func readAppFile(appFile AppFile, name AppName) (App, error) {
if err != nil {
return App{}, fmt.Errorf("env file for '%s' couldn't be read: %s", name, err.Error())
}
app, err := makeApp(env, name)
app, err := makeApp(env, name, appFile)
if err != nil {
return App{}, fmt.Errorf("env file for '%s' has issues: %s", name, err.Error())
}
@ -104,7 +142,7 @@ func readEnv(filePath string) (AppEnv, error) {
return envFile, nil
}
func makeApp(env AppEnv, name string) (App, error) {
func makeApp(env AppEnv, name string, appFile AppFile) (App, error) {
// Checking for type as it is required - apps wont work without it
domain := env["DOMAIN"]
apptype, ok := env["TYPE"]
@ -116,6 +154,7 @@ func makeApp(env AppEnv, name string) (App, error) {
Domain: domain,
Type: apptype,
Env: env,
File: appFile,
}, nil
}