finalize merge conflict

mirkoCrobu · mirkoCrobu · commit 6bbfccf045c8 · 2025-09-29T14:49:41.000+02:00
diff --git a/cmd/arduino-app-cli/system/system.go b/cmd/arduino-app-cli/system/system.go
@@ -134,36 +134,24 @@ func newCleanUpCmd(cfg config.Configuration, docker command.Cli) *cobra.Command
 		RunE: func(cmd *cobra.Command, _ []string) error{
 			staticStore := servicelocator.GetStaticStore()
 
-<<<<<<< HEAD
 			feedback.Info("Running cleanup...")
-			result, err := orchestrator.SystemCleanupSoft(cmd.Context(), cfg, staticStore, docker)
-=======
-			feedback.Printf("Running cleanup...")
 			result, err := orchestrator.SystemCleanup(cmd.Context(), cfg, staticStore, docker)
->>>>>>> origin/main
 			if err != nil{
 				return err
 			}
 
-<<<<<<< HEAD
-			if result > 0{
-				feedback.Info(fmt.Sprintf("Cleanup successful. Freed up %d bytes of disk space.", result))
-			} else{
-				feedback.Info("No removable images found.")
-=======
 			if result.IsEmpty(){
-				feedback.Print("Nothing to clean up.")
+				feedback.Info("Nothing to clean up.")
 				return nil
->>>>>>> origin/main
 			}
 
-			feedback.Print("Cleanup successful.")
-			feedback.Print("Freed up")
+			feedback.Info("Cleanup successful.")
+			feedback.Info("Freed up")
 			if result.RunningAppRemoved{
-				feedback.Print(" - 1 running app")
+				feedback.Info(" - 1 running app")
 			}
-			feedback.Printf(" - %d containers", result.ContainersRemoved)
-			feedback.Printf(" - %d images (%v)", result.ImagesRemoved, x.ToHumanMiB(result.SpaceFreed))
+			feedback.Info(fmt.Sprintf(" - %d containers", result.ContainersRemoved))
+			feedback.Info(fmt.Sprintf(" - %d images (%v)", result.ImagesRemoved, x.ToHumanMiB(result.SpaceFreed)))
 			return nil
 		},
 	}
@@ -182,20 +170,20 @@ func newNetworkMode() *cobra.Command{
 					return fmt.Errorf("failed to enable network mode: %w", err)
 				}
 
-				feedback.Printf("network mode enabled and started")
+				feedback.Info("network mode enabled and started")
 			case "disable":
 				if err := board.DisableNetworkMode(cmd.Context(), &local.LocalConnection{}); err != nil{
 					return fmt.Errorf("failed to disable network mode: %w", err)
 				}
-				feedback.Printf("network mode disabled and stopped")
+				feedback.Info("network mode disabled and stopped")
 			case "status":
 				if isEnabled, err := board.NetworkModeStatus(cmd.Context(), &local.LocalConnection{}); err != nil{
 					return fmt.Errorf("failed to check network mode status: %w", err)
 				} else{
 					if isEnabled{
-						feedback.Printf("enabled")
+						feedback.Info("enabled")
 					} else{
-						feedback.Printf("disabled")
+						feedback.Info("disabled")
 					}
 				}
 			}
@@ -218,15 +206,16 @@ func newkeyboardSet() *cobra.Command{
 			}
 
 			if len(args) == 0{
-				feedback.Printf("available layouts:")
+				feedback.Info("available layouts:")
 				for _, l := range layouts{
-					feedback.Printf(" - %s: %s", l.LayoutId, l.Description)
+					feedback.Info(fmt.Sprintf(" - %s: %s", l.LayoutId, l.Description))
 				}
 				layout, err := board.GetKeyboardLayout(cmd.Context(), &local.LocalConnection{})
 				if err != nil{
 					return fmt.Errorf("failed to get keyboard layout: %w", err)
+
 				}
-				feedback.Printf("\ncurrent layout: %s", layout)
+				feedback.Info(fmt.Sprintf("\ncurrent layout: %s", layout))
 			} else{
 				layout := args[0]
 
@@ -239,7 +228,7 @@ func newkeyboardSet() *cobra.Command{
 				if err := board.SetKeyboardLayout(cmd.Context(), &local.LocalConnection{}, layout); err != nil{
 					return fmt.Errorf("failed to set keyboard layout: %w", err)
 				}
-				feedback.Printf("keyboard layout set to %s", layout)
+				feedback.Info(fmt.Sprintf("keyboard layout set to %s", layout))
 			}
 
 			return nil

-Original file line number
+Diff line change
 RunE: func(cmd*cobra.Command, _ []string) error{
 staticStore:=servicelocator.GetStaticStore()
 -<<<<<<<HEAD
 feedback.Info("Running cleanup...")
 -result, err:=orchestrator.SystemCleanupSoft(cmd.Context(), cfg, staticStore, docker)
 -=======
 -feedback.Printf("Running cleanup...")
 result, err:=orchestrator.SystemCleanup(cmd.Context(), cfg, staticStore, docker)
 ->>>>>>>origin/main
 iferr!=nil{
 returnerr
+ }
 -<<<<<<<HEAD
 -ifresult>0{
 -feedback.Info(fmt.Sprintf("Cleanup successful. Freed up %d bytes of disk space.", result))
 - } else{
 -feedback.Info("No removable images found.")
 -=======
 ifresult.IsEmpty(){
 -feedback.Print("Nothing to clean up.")
 +feedback.Info("Nothing to clean up.")
 returnnil
 ->>>>>>>origin/main
+ }
 -feedback.Print("Cleanup successful.")
 -feedback.Print("Freed up")
 +feedback.Info("Cleanup successful.")
 +feedback.Info("Freed up")
 ifresult.RunningAppRemoved{
 -feedback.Print(" - 1 running app")
 +feedback.Info(" - 1 running app")
+ }
 -feedback.Printf(" - %d containers", result.ContainersRemoved)
 -feedback.Printf(" - %d images (%v)", result.ImagesRemoved, x.ToHumanMiB(result.SpaceFreed))
 +feedback.Info(fmt.Sprintf(" - %d containers", result.ContainersRemoved))
 +feedback.Info(fmt.Sprintf(" - %d images (%v)", result.ImagesRemoved, x.ToHumanMiB(result.SpaceFreed)))
 returnnil
  },
+ }
 returnfmt.Errorf("failed to enable network mode: %w", err)
+ }
 -feedback.Printf("network mode enabled and started")
 +feedback.Info("network mode enabled and started")
 case"disable":
 iferr:=board.DisableNetworkMode(cmd.Context(), &local.LocalConnection{}); err!=nil{
 returnfmt.Errorf("failed to disable network mode: %w", err)
+ }
 -feedback.Printf("network mode disabled and stopped")
 +feedback.Info("network mode disabled and stopped")
 case"status":
 ifisEnabled, err:=board.NetworkModeStatus(cmd.Context(), &local.LocalConnection{}); err!=nil{
 returnfmt.Errorf("failed to check network mode status: %w", err)
  } else{
 ifisEnabled{
 -feedback.Printf("enabled")
 +feedback.Info("enabled")
  } else{
 -feedback.Printf("disabled")
 +feedback.Info("disabled")
+ }
+ }
+ }
+ }
 iflen(args) ==0{
 -feedback.Printf("available layouts:")
 +feedback.Info("available layouts:")
 for_, l:=rangelayouts{
 -feedback.Printf(" - %s: %s", l.LayoutId, l.Description)
 +feedback.Info(fmt.Sprintf(" - %s: %s", l.LayoutId, l.Description))
+ }
 layout, err:=board.GetKeyboardLayout(cmd.Context(), &local.LocalConnection{})
 iferr!=nil{
 returnfmt.Errorf("failed to get keyboard layout: %w", err)
++
+ }
 -feedback.Printf("\ncurrent layout: %s", layout)
 +feedback.Info(fmt.Sprintf("\ncurrent layout: %s", layout))
  } else{
 layout:=args[0]
 iferr:=board.SetKeyboardLayout(cmd.Context(), &local.LocalConnection{}, layout); err!=nil{
 returnfmt.Errorf("failed to set keyboard layout: %w", err)
+ }
 -feedback.Printf("keyboard layout set to %s", layout)
 +feedback.Info(fmt.Sprintf("keyboard layout set to %s", layout))
+ }
 returnnil