Skip to content

Commit

Permalink
feat(load): Change the result (#67)
Browse files Browse the repository at this point in the history
If some apps aren't added, output a warning.
  • Loading branch information
5ouma committed Apr 5, 2024
1 parent c1e425d commit 740b7a9
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 6 deletions.
7 changes: 5 additions & 2 deletions cmd/load.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
8 changes: 5 additions & 3 deletions lib/oascript.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
2 changes: 1 addition & 1 deletion lib/oascript_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down

0 comments on commit 740b7a9

Please sign in to comment.