Tidy up

Author: Andrei

cmd/root.go

@@ -15,7 +15,6 @@ var rootCmd = &cobra.Command{
 }
 
 func Execute() {
-    // Load and start any configured watchers (fast startup).
     supervisor.StartAll()
 
     if err := rootCmd.Execute(); err != nil {

go.mod

@@ -11,7 +11,7 @@ require (
 )
 
 require (
-	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/spf13/pflag v1.0.10 // indirect
-	golang.org/x/sys v0.38.0 // indirect
+	github.com/inconshreveable/mousetrap v1.1.0 
+	github.com/spf13/pflag v1.0.10 
+	golang.org/x/sys v0.38.0 
 )

guardian

@@ -8,7 +8,6 @@ import (
     "time"
 )
 
-// hasChanges returns true if there are staged or unstaged changes.
 func hasChanges(folder string) (bool, error) {
     cmd := exec.Command("git", "-C", folder, "status", "--porcelain")
     out, err := cmd.Output()
@@ -18,31 +17,24 @@ func hasChanges(folder string) (bool, error) {
     return len(bytes.TrimSpace(out)) > 0, nil
 }
 
-// CommitAndPush adds, commits (if changes), and pushes.
-// It will skip commits if there are no changes.
 func CommitAndPush(folder string) error {
     changed, err := hasChanges(folder)
     if err != nil {
         return fmt.Errorf("git status failed: %w", err)
     }
     if !changed {
-        // nothing to commit
         return nil
     }
 
-    // git add .
     if out, err := exec.Command("git", "-C", folder, "add", ".").CombinedOutput(); err != nil {
         return fmt.Errorf("git add failed: %v: %s", err, strings.TrimSpace(string(out)))
     }
 
-    // commit
     msg := "Auto backup " + time.Now().Format(time.RFC3339)
     if out, err := exec.Command("git", "-C", folder, "commit", "-m", msg).CombinedOutput(); err != nil {
-        // ignore "nothing to commit" or other benign messages
         return fmt.Errorf("git commit failed: %v: %s", err, strings.TrimSpace(string(out)))
     }
 
-    // push
     if out, err := exec.Command("git", "-C", folder, "push").CombinedOutput(); err != nil {
         return fmt.Errorf("git push failed: %v: %s", err, strings.TrimSpace(string(out)))
     }

internal/git/git.go

@@ -10,7 +10,7 @@ import (
 type WatcherState struct {
     ID       string `json:"id"`
     Folder   string `json:"folder"`
-    Mode     string `json:"mode"` // "watch" | "interval" | "none"
+    Mode     string `json:"mode"` 
     Interval string `json:"interval,omitempty"`
     Debounce string `json:"debounce,omitempty"`
     Paused   bool   `json:"paused"`

internal/state/state.go

@@ -27,7 +27,7 @@ func StartAll() {
     }
 }
 
-// StartAllBlocking is used by daemon (blocks forever).
+
 func StartAllBlocking() {
     StartAll()
     select {}
@@ -37,7 +37,7 @@ func startWatcher(st state.WatcherState) {
     mu.Lock()
     if _, ok := running[st.ID]; ok {
         mu.Unlock()
-        return // already running
+        return 
     }
     stop := make(chan struct{})
     running[st.ID] = stop
@@ -51,7 +51,6 @@ func startWatcher(st state.WatcherState) {
         }()
 
         for {
-            // auto-remove if folder disappears
             if _, err := os.Stat(s.Folder); os.IsNotExist(err) {
                 fmt.Println("[supervisor] folder removed, cancelling:", s.Folder)
                 Remove(s.ID)
@@ -71,13 +70,12 @@ func startWatcher(st state.WatcherState) {
                 }
                 select {
                 case <-time.After(d):
-                    // continue
+                    
                 case <-stopCh:
                     return
                 }
 
             case "watch":
-                // Run watcher in goroutine and make it cancelable via stopCh by exiting goroutine on stop.
                 done := make(chan struct{})
                 go func() {
                     _ = watcher.WatchAndDebounce(s.Folder, s.Debounce, func() {
@@ -94,10 +92,8 @@ func startWatcher(st state.WatcherState) {
                 case <-stopCh:
                     return
                 case <-done:
-                    // watcher finished (unexpectedly) — restart loop which will try again.
                 }
             default:
-                // nothing to do
                 return
             }
         }
@@ -172,11 +168,9 @@ func updateLastRun(id string) {
     state.Update(list)
 }
 
-// GenerateLaunchdPlist produces the plist contents to start `guardian daemon`.
 func GenerateLaunchdPlist() string {
     bin, _ := exec.LookPath("guardian")
     if bin == "" {
-        // common Homebrew bin
         bin = "/usr/local/bin/guardian"
     }
     home, _ := os.UserHomeDir()

internal/supervisor/supervisor.go

@@ -8,8 +8,6 @@ import (
     "github.com/fsnotify/fsnotify"
 )
 
-// WatchAndDebounce watches a folder (non-recursive) and debounces events.
-// If you need recursive watching, consider walking the tree and adding subdirs.
 func WatchAndDebounce(folder string, debounceStr string, fn func()) error {
     debounce, err := time.ParseDuration(debounceStr)
     if err != nil || debounce <= 0 {
@@ -22,18 +20,12 @@ func WatchAndDebounce(folder string, debounceStr string, fn func()) error {
     }
     defer w.Close()
 
-    // add the folder itself
     if err := w.Add(folder); err != nil {
         return err
     }
 
-    // optional: also watch immediate subdirectories (common case)
-    // NOTE: large projects with many subdirs may need a recursive strategy.
     entries, _ := filepath.Glob(filepath.Join(folder, "*"))
     for _, e := range entries {
-        // watch only directories
-        // ignore errors — best-effort
-        // if fi, err := os.Stat(e); err == nil && fi.IsDir() { w.Add(e) }
         _ = w.Add(e)
     }