Improve public interface

Author: vHanda

common/service.go

@@ -1,6 +1,7 @@
 package common
 
 import (
+	"fmt"
 	"log"
 	"os"
 	"os/user"
@@ -69,18 +70,43 @@ func NewService() (Service, error) {
 }
 
 func (srv Service) Enable() error {
-	// TODO: Uninstall the old one, in case it was running
-	//       Also stop the old service?
+	s := srv.Service
 
-	err := srv.Service.Install()
+	status, err := s.Status()
+	if err != nil {
+		if !strings.Contains(err.Error(), "the service is not installed") {
+			return tracerr.Wrap(err)
+		}
+	}
+
+	stopped := false
+	if status == service.StatusRunning {
+		err := s.Stop()
+		if err != nil {
+			return tracerr.Wrap(err)
+		}
+		stopped = true
+	}
+
+	err = s.Install()
 	if err != nil {
 		if strings.Contains(err.Error(), "Init already exists") {
-			return nil
+			s.Uninstall()
+			s.Install()
+		} else {
+			return tracerr.Wrap(err)
 		}
-		return tracerr.Wrap(err)
+	} else {
+		fmt.Println("Installing git-auto-sync as a daemon")
+	}
+
+	if stopped {
+		fmt.Println("Restarting git-auto-sync-daemon")
+	} else {
+		fmt.Println("Starting git-auto-sync-daemon")
 	}
 
-	err = srv.Service.Restart()
+	err = s.Start()
 	if err != nil {
 		return tracerr.Wrap(err)
 	}
@@ -89,11 +115,13 @@ func (srv Service) Enable() error {
 }
 
 func (srv Service) Disable() error {
+	fmt.Println("Stopping git-auto-sync-daemon")
 	err := srv.Service.Stop()
 	if err != nil {
 		return tracerr.Wrap(err)
 	}
 
+	fmt.Println("Uninstalling git-auto-sync as a daemon")
 	err = srv.Service.Uninstall()
 	if err != nil {
 		return tracerr.Wrap(err)

daemon.go

@@ -10,6 +10,7 @@ import (
 	"github.com/GitJournal/git-auto-sync/common"
 	cli "github.com/urfave/cli/v2"
 	"github.com/ztrue/tracerr"
+	"golang.org/x/exp/slices"
 	git "gopkg.in/src-d/go-git.v4"
 )
 
@@ -46,7 +47,6 @@ func daemonAdd(ctx *cli.Context) error {
 		}
 
 		repoPath = filepath.Join(cwd, repoPath)
-		// TODO: Check if the parent/ancestor is the repoPath!
 	}
 
 	repoPath, err := isValidGitRepo(repoPath)
@@ -59,15 +59,9 @@ func daemonAdd(ctx *cli.Context) error {
 		return tracerr.Wrap(err)
 	}
 
-	contains := false
-	for _, rp := range config.Repos {
-		if rp == repoPath {
-			contains = true
-			break
-		}
-	}
-
-	if !contains {
+	if slices.Contains(config.Repos, repoPath) {
+		fmt.Println("The Daemon is already monitoring " + repoPath)
+	} else {
 		config.Repos = append(config.Repos, repoPath)
 	}
 
@@ -105,16 +99,20 @@ func isValidGitRepo(repoPath string) (string, error) {
 	}
 
 	for true {
-		_, err := os.Stat(repoPath)
+		info, err := os.Stat(filepath.Join(repoPath, ".git"))
 		if err != nil {
 			return "", tracerr.Errorf("%w - %s", errRepoPathInvalid, repoPath)
 		}
 
-		if repoPath == "." {
-			return "", tracerr.Errorf("%w - %s", errRepoPathInvalid, repoPath)
+		if os.IsNotExist(err) {
+			repoPath = filepath.Dir(repoPath)
+			continue
 		}
 
-		repoPath = filepath.Dir(repoPath)
+		if !info.IsDir() {
+			return "", tracerr.Errorf("%w - %s", errRepoPathInvalid, repoPath)
+		}
+		break
 	}
 
 	return repoPath, nil

go.mod

@@ -31,6 +31,7 @@ require (
 	github.com/tadvi/systray v0.0.0-20190226123456-11a2b8fa57af // indirect
 	github.com/xanzy/ssh-agent v0.2.1 // indirect
 	golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 // indirect
+	golang.org/x/exp v0.0.0-20220428152302-39d4317da171 // indirect
 	golang.org/x/net v0.0.0-20201021035429-f5854403a974 // indirect
 	golang.org/x/sys v0.0.0-20220429233432-b5fbb4746d32 // indirect
 	gopkg.in/src-d/go-billy.v4 v4.3.2 // indirect

go.sum

@@ -85,6 +85,8 @@ golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/exp v0.0.0-20220428152302-39d4317da171 h1:TfdoLivD44QwvssI9Sv1xwa5DcL5XQr4au4sZ2F2NV4=
+golang.org/x/exp v0.0.0-20220428152302-39d4317da171/go.mod h1:lgLbSvA5ygNOMpwM/9anMpWVlVJ7Z+cHWq/eFuinpGE=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=

main.go

@@ -55,6 +55,7 @@ func main() {
 				Aliases: []string{"d"},
 				Usage:   "Interact with the background daemon",
 				Subcommands: []*cli.Command{
+					// FIXME: Add a command to show the daemon's logs
 					{
 						Name:   "status",
 						Usage:  "Show the Daemon's status",