Send a notification if a rebase fails

common/autosync.go

@@ -1,6 +1,9 @@
 package common
 
 import (
+	"errors"
+
+	"github.com/gen2brain/beeep"
 	"github.com/ztrue/tracerr"
 )
 
@@ -23,6 +26,15 @@ func AutoSync(repoPath string) error {
 
 	err = rebase(repoPath)
 	if err != nil {
+		if errors.Is(err, errRebaseFailed) {
+			err := beeep.Alert("Git Auto Sync - Conflict", "Could not rebase for - "+repoPath, "assets/warning.png")
+			if err != nil {
+				return tracerr.Wrap(err)
+			}
+		}
+		// How should we continue?
+		// - Keep sending the notification each time?
+		// - Or something a bit better?
 		return tracerr.Wrap(err)
 	}
 
@@ -31,8 +43,6 @@ func AutoSync(repoPath string) error {
 		return tracerr.Wrap(err)
 	}
 
-	// -> rebase if possible
-	// -> revert if rebase fails
 	// -> do a merge
 	// -> push the changes
 

main.go

@@ -4,7 +4,6 @@ import (
 	"log"
 	"os"
 
-	"github.com/gen2brain/beeep"
 	cli "github.com/urfave/cli/v2"
 	"github.com/ztrue/tracerr"
 
@@ -14,7 +13,7 @@ import (
 func main() {
 	app := &cli.App{
 		Name:  "git-auto-sync",
-		Usage: "fight the loneliness!",
+		Usage: "Automatically Sync any Git Repo",
 		Commands: []*cli.Command{
 			{
 				Name:  "watch",
@@ -45,18 +44,6 @@ func main() {
 					return nil
 				},
 			},
-			{
-				Name:  "notify",
-				Usage: "Sync a repo right now",
-				Action: func(ctx *cli.Context) error {
-					err := beeep.Alert("Title", "Message body", "assets/warning.png")
-					if err != nil {
-						panic(err)
-					}
-
-					return nil
-				},
-			},
 			{
 				Name:  "daemon",
 				Usage: "Interact with the background daemon",

todo.md

@@ -28,3 +28,4 @@ Commands -
 
 * Daemon + enable / disable
 * Handle rebase / merge / merge-conflict (commit everything, pick newest, notify)
+* Daemon - proper logs