From 740b7a941907807e4e24d2b130d1247b9646ae40 Mon Sep 17 00:00:00 2001
From: Souma <101255979+5ouma@users.noreply.github.com>
Date: Fri, 5 Apr 2024 18:43:06 +0900
Subject: [PATCH] feat(load): Change the result (#67)

If some apps aren't added, output a warning.
---
 cmd/load.go          | 7 +++++--
 lib/oascript.go      | 8 +++++---
 lib/oascript_test.go | 2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/cmd/load.go b/cmd/load.go
index 1bca44d..3e2bad4 100644
--- a/cmd/load.go
+++ b/cmd/load.go
@@ -34,11 +34,14 @@ func (cmd *cmd) execLoadCmd(command *cobra.Command, args []string) error {
 	if err := cmd.loginItems.Load(path); err != nil {
 		return err
 	}
-	if err := cmd.loginItems.Add(); err != nil {
+	if loadedCorrectly, err := cmd.loginItems.Add(); err != nil {
 		fmt.Println()
 		return err
+	} else if loadedCorrectly {
+		fmt.Println(lib.H1.Render("✅ Successfully loaded"))
+	} else {
+		fmt.Println(lib.H1.Render("⚠️ Some apps weren't loaded correctly"))
 	}
-	fmt.Println(lib.H1.Render("✅ Successfully loaded"))
 
 	return nil
 }
diff --git a/lib/oascript.go b/lib/oascript.go
index a095c2c..e528b75 100644
--- a/lib/oascript.go
+++ b/lib/oascript.go
@@ -43,17 +43,19 @@ func (loginItems *LoginItems) Get() error {
 	return nil
 }
 
-func (loginItems *LoginItems) Add() error {
+func (loginItems *LoginItems) Add() (bool, error) {
+	loadedCorrectly := true
 	for _, loginItem := range *loginItems {
 		if isExist, err := isExist(loginItem.Path); !isExist && err == nil {
 			fmt.Println(WarnedItem.Render(), loginItem.Path)
+			loadedCorrectly = false
 			continue
 		}
 		if _, err := mack.Tell("System Events", fmt.Sprintf(`make login item at end with properties { name: "%s", path: "%s", hidden: %v }`, loginItem.Name, loginItem.Path, loginItem.Hidden)); err != nil {
-			return err
+			return false, err
 		}
 		fmt.Println(CheckedItem.Render(), loginItem.Name)
 	}
 
-	return nil
+	return loadedCorrectly, nil
 }
diff --git a/lib/oascript_test.go b/lib/oascript_test.go
index de11384..976384d 100644
--- a/lib/oascript_test.go
+++ b/lib/oascript_test.go
@@ -23,7 +23,7 @@ func Test_OAScript(t *testing.T) {
 	}
 	data, _ := json.Marshal(previousLoginItems)
 	t.Logf("  previousLoginItems: %v", string(data))
-	if err := previousLoginItems.Add(); err != nil {
+	if _, err := previousLoginItems.Add(); err != nil {
 		t.Fatalf("🚨 %v", err)
 	}