-
-
Notifications
You must be signed in to change notification settings - Fork 19
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Added dateparse parsing, updated deps
- Loading branch information
Showing
3 changed files
with
82 additions
and
67 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,82 +1,83 @@ | ||
| package z | ||
|
|
||
| import ( | ||
| "os" | ||
| "fmt" | ||
| "time" | ||
| "strings" | ||
| "github.com/spf13/cobra" | ||
| "fmt" | ||
| "os" | ||
| "strings" | ||
|
|
||
| "github.com/araddon/dateparse" | ||
| "github.com/spf13/cobra" | ||
| ) | ||
|
|
||
| var entryCmd = &cobra.Command{ | ||
| Use: "entry ([flags]) [id]", | ||
| Short: "Display or update activity", | ||
| Long: "Display or update tracked activity.", | ||
| Args: cobra.ExactArgs(1), | ||
| Run: func(cmd *cobra.Command, args []string) { | ||
| user := GetCurrentUser() | ||
| id := args[0] | ||
| Use: "entry ([flags]) [id]", | ||
| Short: "Display or update activity", | ||
| Long: "Display or update tracked activity.", | ||
| Args: cobra.ExactArgs(1), | ||
| Run: func(cmd *cobra.Command, args []string) { | ||
| user := GetCurrentUser() | ||
| id := args[0] | ||
|
|
||
| entry, err := database.GetEntry(user, id) | ||
| if err != nil { | ||
| fmt.Printf("%s %+v\n", CharError, err) | ||
| os.Exit(1) | ||
| } | ||
| entry, err := database.GetEntry(user, id) | ||
| if err != nil { | ||
| fmt.Printf("%s %+v\n", CharError, err) | ||
| os.Exit(1) | ||
| } | ||
|
|
||
| if begin != "" || finish != "" || project != "" || notes != "" || task != "" { | ||
| if begin != "" { | ||
| entry.Begin, err = time.Parse(time.RFC3339, begin) | ||
| if err != nil { | ||
| fmt.Printf("%s %+v\n", CharError, err) | ||
| os.Exit(1) | ||
| } | ||
| } | ||
| if begin != "" || finish != "" || project != "" || notes != "" || task != "" { | ||
| if begin != "" { | ||
| entry.Begin, err = dateparse.ParseAny(begin) | ||
| if err != nil { | ||
| fmt.Printf("%s %+v\n", CharError, err) | ||
| os.Exit(1) | ||
| } | ||
| } | ||
|
|
||
| if finish != "" { | ||
| entry.Finish, err = time.Parse(time.RFC3339, finish) | ||
| if err != nil { | ||
| fmt.Printf("%s %+v\n", CharError, err) | ||
| os.Exit(1) | ||
| } | ||
| } | ||
| if finish != "" { | ||
| entry.Finish, err = dateparse.ParseAny(finish) | ||
| if err != nil { | ||
| fmt.Printf("%s %+v\n", CharError, err) | ||
| os.Exit(1) | ||
| } | ||
| } | ||
|
|
||
| if project != "" { | ||
| entry.Project = project | ||
| } | ||
| if project != "" { | ||
| entry.Project = project | ||
| } | ||
|
|
||
| if task != "" { | ||
| entry.Task = task | ||
| } | ||
| if task != "" { | ||
| entry.Task = task | ||
| } | ||
|
|
||
| if notes != "" { | ||
| entry.Notes = strings.Replace(notes, "\\n", "\n", -1) | ||
| } | ||
| if notes != "" { | ||
| entry.Notes = strings.Replace(notes, "\\n", "\n", -1) | ||
| } | ||
|
|
||
| _, err = database.UpdateEntry(user, entry) | ||
| if err != nil { | ||
| fmt.Printf("%s %+v\n", CharError, err) | ||
| os.Exit(1) | ||
| } | ||
| } | ||
| _, err = database.UpdateEntry(user, entry) | ||
| if err != nil { | ||
| fmt.Printf("%s %+v\n", CharError, err) | ||
| os.Exit(1) | ||
| } | ||
| } | ||
|
|
||
| fmt.Printf("%s %s\n", CharInfo, entry.GetOutput(true)) | ||
| return | ||
| }, | ||
| fmt.Printf("%s %s\n", CharInfo, entry.GetOutput(true)) | ||
| return | ||
| }, | ||
| } | ||
|
|
||
| func init() { | ||
| rootCmd.AddCommand(entryCmd) | ||
| entryCmd.Flags().StringVarP(&begin, "begin", "b", "", "Update date/time the activity began at\n\nUse RFC3339 format.") | ||
| entryCmd.Flags().StringVarP(&finish, "finish", "s", "", "Update date/time the activity finished at\n\nUse RFC3339 format.") | ||
| entryCmd.Flags().StringVarP(&project, "project", "p", "", "Update activity project") | ||
| entryCmd.Flags().StringVarP(¬es, "notes", "n", "", "Update activity notes") | ||
| entryCmd.Flags().StringVarP(&task, "task", "t", "", "Update activity task") | ||
| entryCmd.Flags().BoolVar(&fractional, "decimal", false, "Show fractional hours in decimal format instead of minutes") | ||
| rootCmd.AddCommand(entryCmd) | ||
| entryCmd.Flags().StringVarP(&begin, "begin", "b", "", "Update date/time the activity began at") | ||
| entryCmd.Flags().StringVarP(&finish, "finish", "s", "", "Update date/time the activity finished at") | ||
| entryCmd.Flags().StringVarP(&project, "project", "p", "", "Update activity project") | ||
| entryCmd.Flags().StringVarP(¬es, "notes", "n", "", "Update activity notes") | ||
| entryCmd.Flags().StringVarP(&task, "task", "t", "", "Update activity task") | ||
| entryCmd.Flags().BoolVar(&fractional, "decimal", false, "Show fractional hours in decimal format instead of minutes") | ||
|
|
||
| var err error | ||
| database, err = InitDatabase() | ||
| if err != nil { | ||
| fmt.Printf("%s %+v\n", CharError, err) | ||
| os.Exit(1) | ||
| } | ||
| var err error | ||
| database, err = InitDatabase() | ||
| if err != nil { | ||
| fmt.Printf("%s %+v\n", CharError, err) | ||
| os.Exit(1) | ||
| } | ||
| } |