From dcf43adf95ff191489a01af6ad1b4b2894799321 Mon Sep 17 00:00:00 2001
From: Tai Groot <tai@taigrr.com>
Date: Sat, 28 Jan 2023 00:39:27 -0800
Subject: [PATCH] move types to types package

---
 cmd/mgfetch/mgfetch.go | 29 ++++-------------------------
 types/helpers.go       | 23 +++++++++++++++++++++--
 types/types.go         | 36 ++++++++++++++++++------------------
 3 files changed, 43 insertions(+), 45 deletions(-)

diff --git a/cmd/mgfetch/mgfetch.go b/cmd/mgfetch/mgfetch.go
index ea428ca..ed79804 100644
--- a/cmd/mgfetch/mgfetch.go
+++ b/cmd/mgfetch/mgfetch.go
@@ -8,12 +8,13 @@ import (
 
 	git "github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/plumbing/object"
-	gterm "github.com/taigrr/gico/gitgraph/term"
 
 	"github.com/taigrr/gico/types"
 	"github.com/taigrr/mg/parse"
 )
 
+type Repo git.Repository
+
 func main() {
 	year := time.Now().Year() - 1
 	yearLength := 365
@@ -21,7 +22,7 @@ func main() {
 		yearLength++
 	}
 
-	gfreq := make(YearFreq, yearLength)
+	gfreq := make(types.YearFreq, yearLength)
 
 	mrconf, err := parse.LoadMRConfig()
 	if err != nil {
@@ -42,22 +43,6 @@ func main() {
 	fmt.Print(gfreq.String())
 }
 
-type Repo git.Repository
-
-func (a YearFreq) Merge(b YearFreq) YearFreq {
-	x := len(a)
-	y := len(b)
-	if x < y {
-		x = y
-	}
-	c := make(YearFreq, x)
-	copy(c, a)
-	for i := 0; i < y; i++ {
-		c[i] += b[i]
-	}
-	return c
-}
-
 func OpenRepo(directory string) (Repo, error) {
 	if s, err := os.Stat(directory); err != nil {
 		return Repo{}, err
@@ -71,13 +56,7 @@ func OpenRepo(directory string) (Repo, error) {
 	return Repo(*r), err
 }
 
-type YearFreq []int
-
-func (yf YearFreq) String() string {
-	return gterm.GetYearUnicode(yf)
-}
-
-func (repo Repo) GetYear(year int) (YearFreq, error) {
+func (repo Repo) GetYear(year int) (types.YearFreq, error) {
 	yearLength := 365
 	if year%4 == 0 {
 		yearLength++
diff --git a/types/helpers.go b/types/helpers.go
index 0f8acd3..fdc95e3 100644
--- a/types/helpers.go
+++ b/types/helpers.go
@@ -2,6 +2,8 @@ package types
 
 import (
 	"time"
+
+	gterm "github.com/taigrr/gico/gitgraph/term"
 )
 
 func NewDataSet() DataSet {
@@ -9,10 +11,27 @@ func NewDataSet() DataSet {
 }
 
 func NewCommit(Author, Message, Repo, Path string, LOC int) Commit {
-	ci := Commit{
+	return Commit{
 		Message: Message,
 		Author:  Author, LOC: LOC, TimeStamp: time.Now(),
 		Repo: Repo, Path: Path,
 	}
-	return ci
+}
+
+func (yf YearFreq) String() string {
+	return gterm.GetYearUnicode(yf)
+}
+
+func (a YearFreq) Merge(b YearFreq) YearFreq {
+	x := len(a)
+	y := len(b)
+	if x < y {
+		x = y
+	}
+	c := make(YearFreq, x)
+	copy(c, a)
+	for i := 0; i < y; i++ {
+		c[i] += b[i]
+	}
+	return c
 }
diff --git a/types/types.go b/types/types.go
index 6382102..395b6dd 100644
--- a/types/types.go
+++ b/types/types.go
@@ -4,21 +4,21 @@ import (
 	"time"
 )
 
-type Month string
-
-type Commit struct {
-	LOC       int       `json:"loc,omitempty"`
-	Message   string    `json:"message,omitempty"`
-	TimeStamp time.Time `json:"ts,omitempty"`
-	Author    string    `json:"author,omitempty"`
-	Repo      string    `json:"repo,omitempty"`
-	Path      string    `json:"path,omitempty"`
-}
-
-type DataSet map[time.Time]WorkDay
-
-type WorkDay struct {
-	Day     time.Time `json:"day"`
-	Count   int       `json:"count"`
-	Commits []Commit  `json:"commits,omitempty"`
-}
+type (
+	Month  string
+	Commit struct {
+		LOC       int       `json:"loc,omitempty"`
+		Message   string    `json:"message,omitempty"`
+		TimeStamp time.Time `json:"ts,omitempty"`
+		Author    string    `json:"author,omitempty"`
+		Repo      string    `json:"repo,omitempty"`
+		Path      string    `json:"path,omitempty"`
+	}
+	DataSet  map[time.Time]WorkDay
+	YearFreq []int
+	WorkDay  struct {
+		Day     time.Time `json:"day"`
+		Count   int       `json:"count"`
+		Commits []Commit  `json:"commits,omitempty"`
+	}
+)