Compare commits
2 Commits
56cec1580a
...
fce1ab6c02
Author | SHA1 | Date |
---|---|---|
decentral1se | fce1ab6c02 | |
decentral1se | 381de28e83 |
|
@ -94,6 +94,28 @@ func AppsFSIsLatest() (bool, error) {
|
|||
return true, nil
|
||||
}
|
||||
|
||||
func ReadApps() (Apps, error) {
|
||||
apps := make(Apps)
|
||||
|
||||
appsFSIsLatest, err := AppsFSIsLatest()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
if !appsFSIsLatest {
|
||||
if err := ReadAppsWeb(&apps); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return apps, nil
|
||||
}
|
||||
|
||||
if err := ReadAppsFS(&apps); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return apps, nil
|
||||
}
|
||||
|
||||
func ReadAppsFS(target interface{}) error {
|
||||
appsJsonFS, err := ioutil.ReadFile(config.APPS_JSON)
|
||||
if err != nil {
|
||||
|
@ -105,36 +127,21 @@ func ReadAppsFS(target interface{}) error {
|
|||
return nil
|
||||
}
|
||||
|
||||
func ReadAppsWeb() (Apps, error) {
|
||||
apps := make(Apps)
|
||||
|
||||
appsFSIsLatest, err := AppsFSIsLatest()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
func ReadAppsWeb(target interface{}) error {
|
||||
if err := readJson(AppsUrl, &target); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if !appsFSIsLatest {
|
||||
if err := readJson(AppsUrl, &apps); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
appsJson, err := json.MarshalIndent(apps, "", " ")
|
||||
appsJson, err := json.MarshalIndent(target, "", " ")
|
||||
if err != nil {
|
||||
return nil, err
|
||||
return err
|
||||
}
|
||||
|
||||
if err := ioutil.WriteFile(config.APPS_JSON, appsJson, 0644); err != nil {
|
||||
return nil, err
|
||||
return err
|
||||
}
|
||||
|
||||
return apps, nil
|
||||
}
|
||||
|
||||
if err := ReadAppsFS(&apps); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return apps, nil
|
||||
return nil
|
||||
}
|
||||
|
||||
func SortByAppName(apps Apps) []string {
|
||||
|
@ -150,16 +157,16 @@ var recipeListCommand = &cli.Command{
|
|||
Name: "list",
|
||||
Aliases: []string{"ls"},
|
||||
Action: func(c *cli.Context) error {
|
||||
appSpecs, err := ReadAppsWeb()
|
||||
apps, err := ReadApps()
|
||||
if err != nil {
|
||||
logrus.Fatal(err.Error())
|
||||
}
|
||||
tableCol := []string{"Name", "Category", "Status"}
|
||||
table := createTable(tableCol)
|
||||
for _, appName := range SortByAppName(appSpecs) {
|
||||
appSpec := appSpecs[appName]
|
||||
status := fmt.Sprintf("%v", appSpec.Features.Status)
|
||||
tableRow := []string{appSpec.Name, appSpec.Category, status}
|
||||
for _, name := range SortByAppName(apps) {
|
||||
app := apps[name]
|
||||
status := fmt.Sprintf("%v", app.Features.Status)
|
||||
tableRow := []string{app.Name, app.Category, status}
|
||||
table.Append(tableRow)
|
||||
}
|
||||
table.Render()
|
||||
|
|
Loading…
Reference in New Issue