6 files changed, 38 insertions(+), 0 deletions(-)

M cmd/snippetpixie/config.go
M cmd/snippetpixie/config_test.go
M cmd/snippetpixie/main.go
M cmd/snippetpixied/dbus.go
M internal/service/service.go
M pkg/dbusservice/dbusservice.go

@@ 69,6 69,10 @@ func (c *config) initDefaultFlagset(appName string, args []string, out io.Writer
 	statusUsage := "get status of the daemon, exits with status 0 if running, 1 if not"
 	flags.BoolVar(&statusFlag, "status", false, statusUsage)
 
+	var stopFlag bool
+	stopUsage := "stop the daemon"
+	flags.BoolVar(&stopFlag, "stop", false, stopUsage)
+
 	var versionFlag bool
 	versionUsage := "display version number"
 	flags.BoolVar(&versionFlag, "version", false, versionUsage)


@@ 93,6 97,9 @@ func (c *config) initDefaultFlagset(appName string, args []string, out io.Writer
 	case statusFlag:
 		c.Cmd = "Status"
 
+	case stopFlag:
+		c.Cmd = "Stop"
+
 	case flags.Changed("export"):
 		exportFile = strings.TrimSpace(exportFile)
 

@@ 24,6 24,9 @@ func TestConfig_Init(t *testing.T) {
 	}{
 		{[]string{"snippetpixie", "--help"}, "", nil, "Usage: snippetpixie [COMMAND] [FLAGS]..."},
 		{[]string{"snippetpixie", "-h"}, "", nil, "Usage: snippetpixie [COMMAND] [FLAGS]..."},
+		{[]string{"snippetpixie", "--stop"}, "Stop", nil, ""},
+		{[]string{"snippetpixie", "--stop", "--version"}, "Version", nil, ""},
+		{[]string{"snippetpixie", "--stop", "--status"}, "Status", nil, ""},
 		{[]string{"snippetpixie", "--status"}, "Status", nil, ""},
 		{[]string{"snippetpixie", "--version"}, "Version", nil, ""},
 		{[]string{"snippetpixie", "--version", "--status"}, "Version", nil, ""},

@@ 93,6 93,12 @@ func run(ctx context.Context, c *config, out io.Writer) error {
 			os.Exit(1)
 		}
 
+	case "Stop":
+		err := serv.Stop()
+		if err != nil {
+			os.Exit(1)
+		}
+
 	case "Export":
 		snippets, err := serv.GetSnippets("", false)
 		if err != nil {

@@ 7,6 7,7 @@ import (
 	"github.com/godbus/dbus/v5"
 	"github.com/gofrs/uuid"
 	"log"
+	"os"
 	"time"
 
 	"git.sr.ht/~ianmjones/snippetpixie/internal/manager"


@@ 30,6 31,14 @@ func (s *service) Ping(response string) (string, *dbus.Error) {
 	return "pong", nil
 }
 
+// Stop daemon.
+func (s *service) Stop() *dbus.Error {
+	log.Printf("Got stop message, exiting.")
+	os.Exit(0)
+
+	return nil
+}
+
 // AddSnippet creates a new Snippet with given abbreviation and body.
 func (s *service) AddSnippet(abbreviation string, body string) (*dbusservice.Snippet, *dbus.Error) {
 	theSnippet, err := s.snippets.GetSnippetWithAbbreviation(abbreviation)

@@ 48,6 48,16 @@ func (service *Service) Ping(expected string) (string, error) {
 	return response, nil
 }
 
+// Stop daemon.
+func (service *Service) Stop() error {
+	call := service.Call(dbusservice.BaseDest+".Stop", 0)
+	if call.Err != nil {
+		return call.Err
+	}
+
+	return nil
+}
+
 // AddSnippet adds a Snippet via the dbus service.
 func (service *Service) AddSnippet(abbreviation string, body string) (*snippet.Snippet, error) {
 	dbusSnippet := &dbusservice.Snippet{}

@@ 32,6 32,9 @@ type DBusService interface {
 	// Ping daemon for expected response.
 	Ping(expected string) (string, error)
 
+	// Stop daemon.
+	Stop() error
+
 	// AddSnippet to database.
 	AddSnippet(abbreviation string, body string) (*snippet.Snippet, error)