Skip to content

Commit dd33469

Browse files
committed
return after error
1 parent 86d17be commit dd33469

File tree

3 files changed

+27
-3
lines changed

3 files changed

+27
-3
lines changed

cmd-config.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,10 @@ var configCommand = &cobra.Command{
2727
err := viper.ReadInConfig()
2828
if err != nil {
2929
_, _ = fmt.Fprintln(os.Stderr, err)
30+
return
3031
}
3132
if containsEquals {
32-
// write to config
33+
// write listTo config
3334
configKeyValue := strings.Split(firstArgument, "=")
3435
configKey := configKeyValue[0]
3536
configValue := configKeyValue[1]

cmd-entries.go

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,18 @@ import (
1010
"time"
1111
)
1212

13+
var (
14+
listTo string
15+
listFrom string
16+
listOrder string
17+
)
18+
1319
func init() {
20+
defaultTo := time.Now()
21+
defaultFrom := defaultTo.AddDate(0, 0, -7)
22+
entriesListCommand.Flags().StringVarP(&listTo, "to", "t", defaultTo.Format("2006-01-02"), "list only entries until date (in YYYY-MM-DD format)")
23+
entriesListCommand.Flags().StringVarP(&listFrom, "from", "f", defaultFrom.Format("2006-01-02"), "list only entries starting at date (in YYYY-MM-DD format)")
24+
entriesListCommand.Flags().StringVarP(&listOrder, "order", "o", "asc", "list only entries starting at date (in YYYY-MM-DD format)")
1425
entriesCommand.AddCommand(entriesListCommand)
1526
rootCmd.AddCommand(entriesCommand)
1627
}
@@ -26,17 +37,28 @@ var entriesListCommand = &cobra.Command{
2637
Short: "list time entries",
2738
Run: func(cmd *cobra.Command, args []string) {
2839
api := mite.NewMiteApi(configGetApiUrl(), configGetApiKey())
29-
to := time.Now()
30-
from := to.AddDate(0, 0, -7)
40+
3141
direction := mite.DirectionAsc
3242

43+
to, err := time.Parse("2006-01-02", listTo)
44+
if err != nil {
45+
_, _ = fmt.Fprintln(os.Stderr, err)
46+
return
47+
}
48+
from, err := time.Parse("2006-01-02", listFrom)
49+
if err != nil {
50+
_, _ = fmt.Fprintln(os.Stderr, err)
51+
return
52+
}
53+
3354
entries, err := api.TimeEntries(&mite.TimeEntryParameters{
3455
To: &to,
3556
From: &from,
3657
Direction: &direction,
3758
})
3859
if err != nil {
3960
_, _ = fmt.Fprintln(os.Stderr, err)
61+
return
4062
}
4163

4264
t := tabby.New()

cmd-projects.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ var listProjectsCommand = &cobra.Command{
2727
projects, err := api.Projects()
2828
if err != nil {
2929
_, _ = fmt.Fprintln(os.Stderr, err)
30+
return
3031
}
3132

3233
t := tabby.New()

0 commit comments

Comments
 (0)