gitea/tea
gitea/tea
56
129
Fork 64
Code Issues 97 Pull Requests 19 Actions Releases 16 Activity

Improve tea time #319

Merged
lunny merged 6 commits from noerw/tea:better-times-are-coming into master 2020-12-23 04:58:36 +00:00
Conversation 0 Commits 6 Files Changed 3 +30 -37
2 changed files with 30 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit dd01408afc - Show all commits

57
cmd/times/list.go
View File

@ -63,45 +63,46 @@ func RunTimesList(cmd *cli.Context) error {
var times []*gitea.TrackedTime
var err error
user := ctx.Args().First()
if ctx.Bool("mine") {
times, _, err = client.GetMyTrackedTimes()
} else if user == "" {
// get all tracked times on the repo
times, _, err = client.ListRepoTrackedTimes(ctx.Owner, ctx.Repo, gitea.ListTrackedTimesOptions{})
} else if strings.HasPrefix(user, "#") {
// get all tracked times on the specified issue
issue, err := utils.ArgToIndex(user)
if err != nil {
return err
}
times, _, err = client.ListIssueTrackedTimes(ctx.Owner, ctx.Repo, issue, gitea.ListTrackedTimesOptions{})
} else {
// get all tracked times by the specified user
times, _, err = client.ListRepoTrackedTimes(ctx.Owner, ctx.Repo, gitea.ListTrackedTimesOptions{
User: user,
})
}
if err != nil {
return err
}
var from, until time.Time
if ctx.String("from") != "" {
if ctx.IsSet("from") {
from, err = dateparse.ParseLocal(ctx.String("from"))
if err != nil {
return err
}
}
if ctx.String("until") != "" {
if ctx.IsSet("until") {
until, err = dateparse.ParseLocal(ctx.String("until"))
if err != nil {
return err
}
}
print.TrackedTimesList(times, ctx.Output, from, until, ctx.Bool("total"))
opts := gitea.ListTrackedTimesOptions{Since: from, Before: until}
user := ctx.Args().First()
if ctx.Bool("mine") {
times, _, err = client.GetMyTrackedTimes()
} else if user == "" {
// get all tracked times on the repo
times, _, err = client.ListRepoTrackedTimes(ctx.Owner, ctx.Repo, opts)
} else if strings.HasPrefix(user, "#") {
// get all tracked times on the specified issue
issue, err := utils.ArgToIndex(user)
if err != nil {
return err
}
times, _, err = client.ListIssueTrackedTimes(ctx.Owner, ctx.Repo, issue, opts)
} else {
// get all tracked times by the specified user
noerw marked this conversation as resolved
6543 commented 2020-12-21 22:04:02 +00:00
Review
Copy Link

add fields = []string{"created", "repo", "issue", "user", "duration"} ?

add `fields = []string{"created", "repo", "issue", "user", "duration"}` ?
opts.User = user
times, _, err = client.ListRepoTrackedTimes(ctx.Owner, ctx.Repo, opts)
}
if err != nil {
return err
}
print.TrackedTimesList(times, ctx.Output, ctx.Bool("total"))
return nil
}

10
modules/print/times.go
View File

@ -6,13 +6,12 @@ package print
import (
"strconv"
"time"
"code.gitea.io/sdk/gitea"
)
// TrackedTimesList print list of tracked times to stdout
func TrackedTimesList(times []*gitea.TrackedTime, outputType string, from, until time.Time, printTotal bool) {
func TrackedTimesList(times []*gitea.TrackedTime, outputType string, printTotal bool) {
tab := tableWithHeader(
"Created",
"Issue",
@ -22,13 +21,6 @@ func TrackedTimesList(times []*gitea.TrackedTime, outputType string, from, until
var totalDuration int64
for _, t := range times {
if !from.IsZero() && from.After(t.Created) {
continue
}
if !until.IsZero() && until.Before(t.Created) {
continue
}
totalDuration += t.Time
tab.addRow(
FormatTime(t.Created),