Make 'Break' more annoying

Makefile

@@ -14,5 +14,8 @@ LDFLAGS=-ldflags "-w -s -X cmd.Version=${VERSION} -X cmd.Build=${BUILD}"
 breaktime:
 	go build ${LDFLAGS} -o build/${BINARY}
 
+install:
+	mv build/${BINARY} ${GOPATH}/bin
+
 clean:
 	rm build/*

cmd/break.go

@@ -16,12 +16,9 @@ var breakCmd = &cobra.Command{
 	Use:   "break",
 	Short: "Start a break",
 	Run: func(cmd *cobra.Command, args []string) {
-		length := viper.GetDuration("breaklength")
+		viper.Set("lastbreak", time.Now())
-		viper.Set("lastbreak", time.Now().Add(length))
 		viper.WriteConfig()
 	},
 }
 
-func init() {
+func init() { rootCmd.AddCommand(breakCmd) }
-	rootCmd.AddCommand(breakCmd)
-}

cmd/config.go

@@ -23,9 +23,7 @@ var configCmd = &cobra.Command{
 	RunE:  opConfig,
 }
 
-func init() {
+func init() { rootCmd.AddCommand(configCmd) }
-	rootCmd.AddCommand(configCmd)
-}
 
 func opConfig(cmd *cobra.Command, args []string) error {
 	updConfig := make(map[string]string)

cmd/i3.go

@@ -1,6 +1,5 @@
 /*
 Copyright © 2023 Brian Buller <brian@bullercodeworks.com>
-
 */
 package cmd
 
@@ -17,23 +16,38 @@ var i3Cmd = &cobra.Command{
 	Use:   "i3",
 	Short: "Print state to stdout in i3 bar format",
 	Run: func(cmd *cobra.Command, args []string) {
-		if len(args) == 1 && args[0] == "click" {
+		if len(args) == 1 {
-			if viper.GetBool("active") {
+			switch args[0] {
-				breakCmd.Run(cmd, []string{})
+			case "toggle":
-			} else {
+				toggleCmd.Run(cmd, []string{"-s"})
-				startCmd.Run(cmd, []string{})
+			case "click":
+				if viper.GetBool("active") {
+					breakCmd.Run(cmd, []string{"-s"})
+				} else {
+					startCmd.Run(cmd, []string{"-s"})
+				}
+			case "status":
+				if viper.GetBool("active") {
+					fmt.Print("{\"text\":\"\uf04c\",\"state\":\"Good\"}")
+				} else {
+					fmt.Print("{\"text\":\"\uf04b\"}")
+				}
+				return
 			}
-			return
 		}
 		if viper.GetBool("active") {
 			lastBreak := viper.GetTime("lastbreak")
 			pomo := viper.GetDuration("pomodoro")
 			warnPct := viper.GetFloat64("warnpct") //0.75
-			warn := float64(pomo.Seconds() * warnPct)
+			warn := int(pomo.Seconds() * warnPct)
-			elapsed := time.Since(lastBreak).Seconds()
+			elapsed := int(time.Since(lastBreak).Seconds())
 			rem := time.Until(lastBreak.Add(pomo)).Round(time.Duration(time.Second))
-			if elapsed > pomo.Seconds() {
+			if elapsed > int(pomo.Seconds()) {
-				fmt.Print("{\"icon\":\"time\",\"state\":\"Critical\", \"text\": \"BREAK!\"}")
+				state := "Critical"
+				if elapsed%2 == 1 {
+					state = "Warning"
+				}
+				fmt.Printf("{\"icon\":\"time\",\"state\":\"%s\", \"text\": \"BREAK!\"}", state)
 			} else if elapsed > warn {
 				fmt.Printf("{\"icon\":\"time\",\"state\":\"Warning\", \"text\": \"%s\"}", rem)
 			} else {

cmd/root.go

@@ -43,8 +43,6 @@ func init() {
 	cobra.OnInitialize(initConfig)
 
 	rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is $HOME/.breaktime.yaml)")
-
-	rootCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
 }
 
 // initConfig reads in config file and ENV variables if set.
@@ -104,6 +102,13 @@ func initConfig() {
 	}
 }
 
-func runRootCmd(cmd *cobra.Command, args []string) error {
+func runRootCmd(cmd *cobra.Command, args []string) error { return nil }
-	return nil
+
+func hasArg(arg string, args []string) bool {
+	for i := range args {
+		if args[i] == arg {
+			return true
+		}
+	}
+	return false
 }

cmd/start.go

@@ -18,10 +18,10 @@ var startCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		viper.Set("active", true)
 		viper.WriteConfig()
-		fmt.Println("Timer Started.")
+		if !hasArg("-s", args) {
+			fmt.Println("Timer Started.")
+		}
 	},
 }
 
-func init() {
+func init() { rootCmd.AddCommand(startCmd) }
-	rootCmd.AddCommand(startCmd)
-}

cmd/stop.go

@@ -18,10 +18,10 @@ var stopCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		viper.Set("active", false)
 		viper.WriteConfig()
-		fmt.Println("Timer Stopped.")
+		if !hasArg("-s", args) {
+			fmt.Println("Timer Stopped.")
+		}
 	},
 }
 
-func init() {
+func init() { rootCmd.AddCommand(stopCmd) }
-	rootCmd.AddCommand(stopCmd)
-}

cmd/toggle.go

@@ -0,0 +1,25 @@
+/*
+Copyright © 2023 Brian Buller <brian@bullercodeworks.com>
+
+*/
+package cmd
+
+import (
+	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
+)
+
+// toggleCmd represents the toggle command
+var toggleCmd = &cobra.Command{
+	Use:   "toggle",
+	Short: "Toggle timer off/on",
+	Run: func(cmd *cobra.Command, args []string) {
+		if viper.GetBool("active") {
+			stopCmd.Run(cmd, args)
+		} else {
+			startCmd.Run(cmd, args)
+		}
+	},
+}
+
+func init() { rootCmd.AddCommand(toggleCmd) }