Skip to content

feat: -t flag for absolute time #171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ravener wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: -t flag for absolute time #171

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 56 additions & 3 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ var (
name string
altscreen bool
startTimeFormat string
targetTime string
winHeight int
version = "dev"
quitKeys = key.NewBinding(key.WithKeys("esc", "q"))
Expand All @@ -136,10 +137,26 @@ var rootCmd = &cobra.Command{
Short: "timer is like sleep, but with progress report",
Version: version,
SilenceUsage: true,
Args: cobra.ExactArgs(1),
// Allow 0 args when -t/--time is used, otherwise require exactly 1 arg.
Args: func(cmd *cobra.Command, args []string) error {
if targetTime != "" {
if len(args) != 0 {
return fmt.Errorf("no arguments expected when --time/-t is used")
}
return nil
}
// fallback to the original exact-one-argument behavior
return cobra.ExactArgs(1)(cmd, args)
},
RunE: func(cmd *cobra.Command, args []string) error {
addSuffixIfArgIsNumber(&(args[0]), "s")
duration, err := time.ParseDuration(args[0])
var duration time.Duration
var err error
if targetTime != "" {
duration, err = durationUntilNext(targetTime)
} else {
addSuffixIfArgIsNumber(&(args[0]), "s")
duration, err = time.ParseDuration(args[0])
}
if err != nil {
return err
}
Expand Down Expand Up @@ -196,6 +213,7 @@ func init() {
rootCmd.Flags().StringVarP(&name, "name", "n", "", "timer name")
rootCmd.Flags().BoolVarP(&altscreen, "fullscreen", "f", false, "fullscreen")
rootCmd.Flags().StringVarP(&startTimeFormat, "format", "", "", "Specify start time format, possible values: 24h, kitchen")
rootCmd.Flags().StringVarP(&targetTime, "time", "t", "", "Absolute clock time. (e.g. '8 PM', '8:30pm', '20:30')")

rootCmd.AddCommand(manCmd)
}
Expand All @@ -212,3 +230,38 @@ func addSuffixIfArgIsNumber(s *string, suffix string) {
*s = *s + suffix
}
}

func durationUntilNext(s string) (time.Duration, error) {
s = strings.ToLower(strings.TrimSpace(s))
now := time.Now().Truncate(time.Second)
loc := now.Location()
layouts := []string{
"15:04",
"15:04:05",
"3pm",
"3 pm",
"3:04pm",
"3:04 pm",
"3:04:05pm",
"3:04:05 pm",
}
var parsed time.Time
var ok bool
for _, layout := range layouts {
t, err := time.ParseInLocation(layout, s, loc)
if err == nil {
parsed = t
ok = true
break
}
}
if !ok {
return 0, fmt.Errorf("invalid time format: %q", s)
}
h, m, sec := parsed.Hour(), parsed.Minute(), parsed.Second()
candidate := time.Date(now.Year(), now.Month(), now.Day(), h, m, sec, 0, loc)
if !candidate.After(now) {
candidate = candidate.AddDate(0, 0, 1)
}
return candidate.Sub(now), nil
}