add remain command (#40)

feat: add remain command

Author: Yusaku Hatanaka

cmd/remain.go

@@ -0,0 +1,41 @@
+// Package cmd has startCmd defined
+package cmd
+
+import (
+	"fmt"
+
+	"github.com/spf13/cobra"
+
+	"github.com/hatappi/gomodoro/config"
+	"github.com/hatappi/gomodoro/net/unix"
+)
+
+// remainCmd represents the remain command
+var remainCmd = &cobra.Command{
+	Use:   "remain",
+	Short: "get remain time",
+	RunE: func(cmd *cobra.Command, args []string) error {
+		config, err := config.GetConfig()
+		if err != nil {
+			return err
+		}
+
+		c, err := unix.NewClient(config.UnixDomainScoketPath)
+		if err != nil {
+			return err
+		}
+
+		r, err := c.Get()
+		if err != nil {
+			return err
+		}
+
+		fmt.Printf("%s", r.GetRemain())
+
+		return nil
+	},
+}
+
+func init() {
+	rootCmd.AddCommand(remainCmd)
+}

cmd/root.go

@@ -18,7 +18,9 @@ var cfgFile string
 
 // rootCmd represents the base command when called without any subcommands
 var rootCmd = &cobra.Command{
-	Use: "gomodoro",
+	Use:           "gomodoro",
+	SilenceUsage:  true,
+	SilenceErrors: true,
 }
 
 // Execute adds all child commands to the root command and sets flags appropriately.
@@ -41,6 +43,18 @@ func init() {
 		fmt.Println(err)
 		os.Exit(1)
 	}
+
+	p, err := homedir.Expand("~/.gomodoro/gomodoro.sock")
+	if err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
+	rootCmd.PersistentFlags().String("unix-domain-socket-path", p, "unix domain socket path")
+	err = viper.BindPFlag("unix_domain_socket_path", rootCmd.PersistentFlags().Lookup("unix-domain-socket-path"))
+	if err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
 }
 
 // initConfig reads in config file and ENV variables if set.
@@ -63,9 +77,7 @@ func initConfig() {
 	viper.AutomaticEnv()
 
 	// If a config file is found, read it in.
-	if err := viper.ReadInConfig(); err == nil {
-		fmt.Println("Using config file:", viper.ConfigFileUsed())
-	}
+	_ = viper.ReadInConfig()
 }
 
 func initLog() {

cmd/start.go

@@ -9,6 +9,7 @@ import (
 
 	"github.com/hatappi/gomodoro/config"
 	"github.com/hatappi/gomodoro/errors"
+	"github.com/hatappi/gomodoro/net/unix"
 	"github.com/hatappi/gomodoro/pomodoro"
 	"github.com/hatappi/gomodoro/screen"
 	"github.com/hatappi/gomodoro/toggl"
@@ -27,7 +28,7 @@ please specify argument or config yaml.
 		if err != nil {
 			return err
 		}
-
+		// pomodoro
 		s, err := screen.NewScreen()
 		if err != nil {
 			return err
@@ -47,13 +48,17 @@ please specify argument or config yaml.
 			opts = append(opts, pomodoro.WithRecordToggl(togglClient))
 		}
 
-		p := pomodoro.NewPomodoro(
-			s,
-			config.TaskFile,
-			opts...,
-		)
+		p := pomodoro.NewPomodoro(s, config.TaskFile, opts...)
 		defer p.Finish()
 
+		// unix domain socket server
+		server, err := unix.NewServer(config.UnixDomainScoketPath, p.GetTimer())
+		if err != nil {
+			return err
+		}
+		defer server.Close()
+		go server.Serve()
+
 		err = p.Start()
 		if err != nil {
 			if xerrors.Is(err, errors.ErrCancel) {

config/config.go

@@ -8,10 +8,11 @@ import (
 
 // Config config for gomodoro
 type Config struct {
-	Pomodoro PomodoroConfig `mapstructure:"pomodoro"`
-	Toggl    TogglConfig    `mapstructure:"toggl"`
-	LogFile  string         `mapstructure:"log_file"`
-	TaskFile string         `mapstructure:"task_file"`
+	Pomodoro             PomodoroConfig `mapstructure:"pomodoro"`
+	Toggl                TogglConfig    `mapstructure:"toggl"`
+	LogFile              string         `mapstructure:"log_file"`
+	TaskFile             string         `mapstructure:"task_file"`
+	UnixDomainScoketPath string         `mapstructure:"unix_domain_socket_path"`
 }
 
 // PomodoroConfig config for pomodoro

net/unix/client.go

@@ -0,0 +1,52 @@
+package unix
+
+import (
+	"bufio"
+	"encoding/json"
+	"io/ioutil"
+	"net"
+
+	"github.com/hatappi/gomodoro/logger"
+)
+
+// Client represents unix server client
+type Client interface {
+	Get() (*Response, error)
+
+	Close()
+}
+
+type clientImpl struct {
+	conn net.Conn
+}
+
+// NewClient initialize Client
+func NewClient(socketPath string) (Client, error) {
+	conn, err := net.Dial("unix", socketPath)
+	if err != nil {
+		return nil, err
+	}
+
+	return &clientImpl{
+		conn: conn,
+	}, nil
+}
+
+func (c *clientImpl) Get() (*Response, error) {
+	b, err := ioutil.ReadAll(bufio.NewReader(c.conn))
+	if err != nil {
+		logger.Errorf("error is %+v", err)
+	}
+
+	r := &Response{}
+	err = json.Unmarshal(b, r)
+	if err != nil {
+		return nil, err
+	}
+
+	return r, nil
+}
+
+func (c *clientImpl) Close() {
+	_ = c.conn.Close()
+}

net/unix/server.go

@@ -0,0 +1,89 @@
+// Package unix communicate internal access
+package unix
+
+import (
+	"encoding/json"
+	"fmt"
+	"net"
+
+	"github.com/hatappi/gomodoro/logger"
+	"github.com/hatappi/gomodoro/timer"
+)
+
+// Response represents unix server response
+type Response struct {
+	RemainSec int
+}
+
+// GetRemain get remain string
+func (r *Response) GetRemain() string {
+	if r.RemainSec == 0 {
+		return "00:00"
+	}
+	min := r.RemainSec / 60
+	sec := r.RemainSec % 60
+	return fmt.Sprintf("%02d:%02d", min, sec)
+}
+
+// Server represents server
+type Server interface {
+	Serve()
+	Close()
+}
+
+type serverImpl struct {
+	listener net.Listener
+	timer    timer.Timer
+}
+
+// NewServer initialize Server
+func NewServer(socketPath string, timer timer.Timer) (Server, error) {
+	listener, err := net.Listen("unix", socketPath)
+	if err != nil {
+		return nil, err
+	}
+
+	return &serverImpl{
+		listener: listener,
+		timer:    timer,
+	}, nil
+}
+
+// Serve start unix domain socket server
+func (c *serverImpl) Serve() {
+	for {
+		conn, err := c.listener.Accept()
+		logger.Infof("accept")
+		if err != nil {
+			logger.Warnf("listener failed to accept. err: %+s", err)
+			return
+		}
+
+		go func() {
+			defer func() {
+				_ = conn.Close()
+			}()
+
+			rs := c.timer.GetRemainSec()
+
+			r := &Response{
+				RemainSec: rs,
+			}
+
+			b, err := json.Marshal(r)
+			if err != nil {
+				logger.Errorf("faield to marshal Response: %+v", err)
+				return
+			}
+
+			_, err = conn.Write(b)
+			if err != nil {
+				logger.Errorf("faield to write Response: %+v", err)
+			}
+		}()
+	}
+}
+
+func (c *serverImpl) Close() {
+	_ = c.listener.Close()
+}

pomodoro/pomodoro.go

@@ -23,6 +23,9 @@ const (
 type Pomodoro interface {
 	Start() error
 	Stop()
+
+	GetTimer() timer.Timer
+
 	Finish()
 }
 
@@ -121,6 +124,10 @@ func (p *pomodoroImpl) Start() error {
 	}
 }
 
+func (p *pomodoroImpl) GetTimer() timer.Timer {
+	return p.timer
+}
+
 func (p *pomodoroImpl) Stop() {
 }