diff --git a/cmd/cli/cli.go b/cmd/cli/cli.go index d21d5e8..497d4a3 100644 --- a/cmd/cli/cli.go +++ b/cmd/cli/cli.go @@ -14,11 +14,11 @@ func main() { if err != nil { panic(err) } - freq, err := repoPaths.Frequency(n.Year(), []string{""}) + freq, err := repoPaths.Frequency(n.Year(), []string{"Groot"}) if err != nil { panic(err) } - wfreq, err := repoPaths.GetWeekFreq([]string{""}) + wfreq, err := repoPaths.GetWeekFreq([]string{"Groot"}) if err != nil { panic(err) } @@ -29,4 +29,5 @@ func main() { fmt.Println() fmt.Println("year:") fmt.Println(term.GetYearUnicode(freq)) + fmt.Println((freq)) } diff --git a/cmd/server/svg-server.go b/cmd/server/svg-server.go index d246f75..0f51ed9 100644 --- a/cmd/server/svg-server.go +++ b/cmd/server/svg-server.go @@ -1,6 +1,7 @@ package main import ( + "fmt" "net/http" "strconv" "time" @@ -17,6 +18,7 @@ func main() { r := mux.NewRouter() r.HandleFunc("/weekly.svg", func(w http.ResponseWriter, r *http.Request) { author := r.URL.Query().Get("author") + fmt.Println(author) w.Header().Add("Content-Type", "text/html") repoPaths, err := commits.GetMRRepos() if err != nil { @@ -26,6 +28,7 @@ func main() { if err != nil { panic(err) } + fmt.Println(week) svg := svg.GetWeekSVG(week) svg.WriteTo(w) }) @@ -33,6 +36,7 @@ func main() { year := time.Now().Year() yst := r.URL.Query().Get("year") author := r.URL.Query().Get("author") + fmt.Println(author) y, err := strconv.Atoi(yst) if err == nil { year = y @@ -45,6 +49,7 @@ func main() { if err != nil { panic(err) } + fmt.Println(freq) svg := svg.GetYearSVG(freq) w.Header().Add("Content-Type", "text/html") svg.WriteTo(w) diff --git a/commits/chancommits.go b/commits/chancommits.go index f1271e0..e829d59 100644 --- a/commits/chancommits.go +++ b/commits/chancommits.go @@ -59,9 +59,6 @@ func YearFreqFromChan(cc chan types.Commit, year int) types.Freq { } freq := make([]int, yearLength) for commit := range cc { - if commit.TimeStamp.Year() != year { - continue - } freq[commit.TimeStamp.YearDay()-1]++ } return freq @@ -131,10 +128,11 @@ func FilterCChanByAuthor(in chan types.Commit, authors []string) (chan types.Com } go func() { for commit := range in { + regset: for _, r := range regSet { if r.MatchString(commit.Author) { out <- commit - break + break regset } } } diff --git a/commits/commits.go b/commits/commits.go index dd2a8d2..4e42ea4 100644 --- a/commits/commits.go +++ b/commits/commits.go @@ -90,29 +90,8 @@ func (cs CommitSet) ToYearFreq() types.Freq { yearLength++ } freq := make([]int, yearLength) - data := types.NewDataSet() - for _, commit := range cs.Commits { - ts := commit.TimeStamp - roundedTS := ts.Round(time.Hour * 24) - wd, ok := data[roundedTS] - if !ok { - wd = types.WorkDay{} - wd.Commits = []types.Commit{} - } - wd.Commits = append(wd.Commits, commit) - wd.Count++ - wd.Day = roundedTS - data[roundedTS] = wd - } - for k, v := range data { - if k.Year() != year { - continue - } - // this is equivalent to adding len(commits) to the freq total, but - // it's a stub for later when we do more here - for range v.Commits { - freq[k.YearDay()]++ - } + for _, v := range cs.Commits { + freq[v.TimeStamp.YearDay()-1]++ } return freq } @@ -128,10 +107,11 @@ func (cs CommitSet) FilterByAuthorRegex(authors []string) (CommitSet, error) { } newCS := CommitSet{Year: cs.Year} for _, commit := range cs.Commits { + regset: for _, r := range regSet { if r.MatchString(commit.Author) { newCS.Commits = append(newCS.Commits, commit) - break + break regset } } }