Nulo/zeit
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed indentation

Browse source
This commit is contained in:
マリウス 2022-02-28 11:14:27 -05:00
parent e4ffc80b04
commit 6783e5d082
No known key found for this signature in database
GPG key ID: 272ED814BF63261F
3 changed files with 102 additions and 102 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
z/entry.go
View file

@ -169,7 +169,7 @@ func (entry *Entry) GetOutput(full bool) (string) {
} }
trackDiff := entryFinish.Sub(entry.Begin) trackDiff := entryFinish.Sub(entry.Begin)
taskDuration := fmtDuration(trackDiff) taskDuration := fmtDuration(trackDiff)
if full == false { if full == false {
output = fmt.Sprintf("%s %s on %s from %s to %s (%sh) %s", output = fmt.Sprintf("%s %s on %s from %s to %s (%sh) %s",

170
z/listCmd.go
View file

@ -1,12 +1,12 @@
package z package z
import ( import (
"fmt" "fmt"
"os" "os"
"time" "time"
"github.com/shopspring/decimal" "github.com/shopspring/decimal"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )
var listTotalTime bool var listTotalTime bool
@ -15,102 +15,102 @@ var appendProjectIDToTask bool
var listCmd = &cobra.Command{ var listCmd = &cobra.Command{
Use: "list", Use: "list",
Short: "List activities", Short: "List activities",
Long: "List all tracked activities.", Long: "List all tracked activities.",
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
user := GetCurrentUser() user := GetCurrentUser()
entries, err := database.ListEntries(user) entries, err := database.ListEntries(user)
if err != nil { if err != nil {
fmt.Printf("%s %+v\n", CharError, err) fmt.Printf("%s %+v\n", CharError, err)
os.Exit(1) os.Exit(1)
} }
var sinceTime time.Time var sinceTime time.Time
var untilTime time.Time var untilTime time.Time
if since != "" { if since != "" {
sinceTime, err = time.Parse(time.RFC3339, since) sinceTime, err = time.Parse(time.RFC3339, since)
if err != nil { if err != nil {
fmt.Printf("%s %+v\n", CharError, err) fmt.Printf("%s %+v\n", CharError, err)
os.Exit(1) os.Exit(1)
} }
} }
if until != "" { if until != "" {
untilTime, err = time.Parse(time.RFC3339, until) untilTime, err = time.Parse(time.RFC3339, until)
if err != nil { if err != nil {
fmt.Printf("%s %+v\n", CharError, err) fmt.Printf("%s %+v\n", CharError, err)
os.Exit(1) os.Exit(1)
} }
} }
var filteredEntries []Entry var filteredEntries []Entry
filteredEntries, err = GetFilteredEntries(entries, project, task, sinceTime, untilTime) filteredEntries, err = GetFilteredEntries(entries, project, task, sinceTime, untilTime)
if err != nil { if err != nil {
fmt.Printf("%s %+v\n", CharError, err) fmt.Printf("%s %+v\n", CharError, err)
os.Exit(1) os.Exit(1)
} }
if listOnlyProjectsAndTasks == true { if listOnlyProjectsAndTasks == true {
var projectsAndTasks = make(map[string]map[string]bool) var projectsAndTasks = make(map[string]map[string]bool)
for _, filteredEntry := range filteredEntries { for _, filteredEntry := range filteredEntries {
taskMap, ok := projectsAndTasks[filteredEntry.Project] taskMap, ok := projectsAndTasks[filteredEntry.Project]
if !ok { if !ok {
taskMap = make(map[string]bool) taskMap = make(map[string]bool)
projectsAndTasks[filteredEntry.Project] = taskMap projectsAndTasks[filteredEntry.Project] = taskMap
} }
taskMap[filteredEntry.Task] = true taskMap[filteredEntry.Task] = true
projectsAndTasks[filteredEntry.Project] = taskMap projectsAndTasks[filteredEntry.Project] = taskMap
} }
for project, _ := range projectsAndTasks { for project, _ := range projectsAndTasks {
fmt.Printf("%s %s\n", CharMore, project) fmt.Printf("%s %s\n", CharMore, project)
for task, _ := range projectsAndTasks[project] { for task, _ := range projectsAndTasks[project] {
if appendProjectIDToTask == true { if appendProjectIDToTask == true {
fmt.Printf("%*s└── %s [%s]\n", 1, " ", task, project) fmt.Printf("%*s└── %s [%s]\n", 1, " ", task, project)
} else { } else {
fmt.Printf("%*s└── %s\n", 1, " ", task) fmt.Printf("%*s└── %s\n", 1, " ", task)
} }
} }
} }
return return
} }
totalHours := decimal.NewFromInt(0) totalHours := decimal.NewFromInt(0)
for _, entry := range filteredEntries { for _, entry := range filteredEntries {
totalHours = totalHours.Add(entry.GetDuration()) totalHours = totalHours.Add(entry.GetDuration())
fmt.Printf("%s\n", entry.GetOutput(false)) fmt.Printf("%s\n", entry.GetOutput(false))
} }
if listTotalTime == true { if listTotalTime == true {
fmt.Printf("\nTOTAL: %s H\n\n", fmtHours(totalHours)); fmt.Printf("\nTOTAL: %s H\n\n", fmtHours(totalHours));
} }
return return
}, },
} }
func init() { func init() {
rootCmd.AddCommand(listCmd) rootCmd.AddCommand(listCmd)
listCmd.Flags().StringVar(&since, "since", "", "Date/time to start the list from") listCmd.Flags().StringVar(&since, "since", "", "Date/time to start the list from")
listCmd.Flags().StringVar(&until, "until", "", "Date/time to list until") listCmd.Flags().StringVar(&until, "until", "", "Date/time to list until")
listCmd.Flags().StringVarP(&project, "project", "p", "", "Project to be listed") listCmd.Flags().StringVarP(&project, "project", "p", "", "Project to be listed")
listCmd.Flags().StringVarP(&task, "task", "t", "", "Task to be listed") listCmd.Flags().StringVarP(&task, "task", "t", "", "Task to be listed")
listCmd.Flags().BoolVar(&fractional, "decimal", false, "Show fractional hours in decimal format instead of minutes") listCmd.Flags().BoolVar(&fractional, "decimal", false, "Show fractional hours in decimal format instead of minutes")
listCmd.Flags().BoolVar(&listTotalTime, "total", false, "Show total time of hours for listed activities") listCmd.Flags().BoolVar(&listTotalTime, "total", false, "Show total time of hours for listed activities")
listCmd.Flags().BoolVar(&listOnlyProjectsAndTasks, "only-projects-and-tasks", false, "Only list projects and their tasks, no entries") listCmd.Flags().BoolVar(&listOnlyProjectsAndTasks, "only-projects-and-tasks", false, "Only list projects and their tasks, no entries")
listCmd.Flags().BoolVar(&appendProjectIDToTask, "append-project-id-to-task", false, "Append project ID to tasks in the list") listCmd.Flags().BoolVar(&appendProjectIDToTask, "append-project-id-to-task", false, "Append project ID to tasks in the list")
var err error var err error
database, err = InitDatabase() database, err = InitDatabase()
if err != nil { if err != nil {
fmt.Printf("%s %+v\n", CharError, err) fmt.Printf("%s %+v\n", CharError, err)
os.Exit(1) os.Exit(1)
} }
} }

28
z/util.go
View file

@ -1,28 +1,28 @@
package z package z
import ( import (
"fmt" "fmt"
"time" "time"
"github.com/shopspring/decimal" "github.com/shopspring/decimal"
) )
var fractional bool var fractional bool
func fmtDuration(dur time.Duration) (string) { func fmtDuration(dur time.Duration) (string) {
return fmtHours(decimal.NewFromFloat(dur.Hours())) return fmtHours(decimal.NewFromFloat(dur.Hours()))
} }
func fmtHours(hours decimal.Decimal) (string) { func fmtHours(hours decimal.Decimal) (string) {
if fractional { if fractional {
return hours.StringFixed(2) return hours.StringFixed(2)
} else { } else {
return fmt.Sprintf( return fmt.Sprintf(
"%s:%02s", "%s:%02s",
hours.Floor(), // hours hours.Floor(), // hours
hours.Sub(hours.Floor()). hours.Sub(hours.Floor()).
Mul(decimal.NewFromFloat(.6)). Mul(decimal.NewFromFloat(.6)).
Mul(decimal.NewFromInt(100)). Mul(decimal.NewFromInt(100)).
Floor()) Floor())
} }
} }