recatoring after solving conflicts

Author: mirkoCrobu

cmd/arduino-app-cli/main.go

@@ -94,7 +94,7 @@ func run(configuration cfg.Configuration) error {
 func main() {
 	configuration, err := cfg.NewFromEnv()
 	if err != nil {
-		feedback.Fatal(fmt.Sprintf("invalid config: %s", err), feedback.ErrGeneric)
+		feedback.Fatal(i18n.Tr("invalid config: %s", err), feedback.ErrGeneric)
 	}
 	if err := run(configuration); err != nil {
 		feedback.FatalError(err, 1)

cmd/arduino-app-cli/results/app_results.go

@@ -1,78 +1,11 @@
 package results
 
 import (
-	"encoding/base64"
 	"fmt"
-	"strings"
-	"text/tabwriter"
-
-	"github.com/arduino/go-paths-helper"
 
 	"github.com/bcmi-labs/orchestrator/cmd/feedback"
-	"github.com/bcmi-labs/orchestrator/internal/orchestrator"
 )
 
-type AppListResult struct {
-	Apps       []orchestrator.AppInfo       `json:"apps"`
-	BrokenApps []orchestrator.BrokenAppInfo `json:"brokenApps"`
-}
-
-func (r AppListResult) String() string {
-	var b strings.Builder
-	w := tabwriter.NewWriter(&b, 0, 0, 3, ' ', 0)
-	fmt.Fprintln(w, "ID\tNAME\tICON\tSTATUS\tEXAMPLE")
-
-	for _, app := range r.Apps {
-		fmt.Fprintf(w, "%s\t%s\t%s\t%s\t%t\n",
-			IdToAlias(app.ID),
-			app.Name,
-			app.Icon,
-			app.Status,
-			app.Example,
-		)
-	}
-	if len(r.BrokenApps) > 0 {
-		fmt.Fprintln(w, "\nAPP\tERROR")
-		for _, app := range r.BrokenApps {
-			fmt.Fprintf(w, "%s\t%s\n",
-				app.Name,
-				app.Error,
-			)
-		}
-	}
-	w.Flush()
-	return b.String()
-}
-
-func (r AppListResult) Data() interface{} {
-	return r
-}
-func IdToAlias(id orchestrator.ID) string {
-	v := id.String()
-	res, err := base64.RawURLEncoding.DecodeString(v)
-	if err != nil {
-		return v
-	}
-
-	v = string(res)
-	if strings.Contains(v, ":") {
-		return v
-	}
-
-	wd, err := paths.Getwd()
-	if err != nil {
-		return v
-	}
-	rel, err := paths.New(v).RelFrom(wd)
-	if err != nil {
-		return v
-	}
-	if !strings.HasPrefix(rel.String(), "./") && !strings.HasPrefix(rel.String(), "../") {
-		return "./" + rel.String()
-	}
-	return rel.String()
-}
-
 type CreateAppResult struct {
 	Path    string `json:"path"`
 	Message string `json:"message"`

cmd/arduino-app-cli/system/system.go

@@ -55,16 +55,16 @@ func newUpdateCmd() *cobra.Command {
 				return err
 			}
 			if len(pkgs) == 0 {
-				feedback.Printf("No upgradable packages found.")
+				feedback.Promptf("No upgradable packages found.")
 				return nil
 			}
 
-			feedback.Printf("Found %d upgradable packages:", len(pkgs))
+			feedback.Promptf("Found %d upgradable packages:", len(pkgs))
 			for _, pkg := range pkgs {
-				feedback.Printf("Package: %s, From: %s, To: %s", pkg.Name, pkg.FromVersion, pkg.ToVersion)
+				feedback.Promptf("Package: %s, From: %s, To: %s", pkg.Name, pkg.FromVersion, pkg.ToVersion)
 			}
 
-			feedback.Printf("Do you want to upgrade these packages? (yes/no)")
+			feedback.Promptf("Do you want to upgrade these packages? (yes/no)")
 			var yes bool
 			if forceYes {
 				yes = true
@@ -87,7 +87,7 @@ func newUpdateCmd() *cobra.Command {
 
 			events := updater.Subscribe()
 			for event := range events {
-				feedback.Printf("[%s] %s", event.Type.String(), event.Data)
+				feedback.Promptf("[%s] %s", event.Type.String(), event.Data)
 
 				if event.Type == update.DoneEvent {
 					break

cmd/feedback/feedback.go

@@ -312,3 +312,11 @@ func Progress(percent float32) {
 		}
 	}
 }
+
+func Promptf(format string, v ...interface{}) {
+	fmt.Fprintf(stdErr, format, v...)
+}
+
+func Prompt(message string) {
+	fmt.Fprintln(stdErr, message)
+}