add commit.log

Author: wangle201210

commit.log

@@ -0,0 +1,10 @@
+{"date":"2021-08-12T06:03:26+08:00","hash":"40e24b24faa6ba51d1defbebc34ccc27dedcef93","msg":"完工"}
+{"date":"2021-08-12T05:04:24+08:00","hash":"3312b45d69d94d338e20ce48294feb2235df6e22","msg":"opt"}
+{"date":"2021-05-18T06:54:27+08:00","hash":"f332ed7f4e119b1cee6788ecfed79a93fe9366fc","msg":"cut ChangeLog.txt"}
+{"date":"2021-05-16T00:08:56+08:00","hash":"a58945a39b6b436e5e7ffd1bf8aa366b0b660395","msg":"add README.md"}
+{"date":"2021-08-01T23:49:36+08:00","hash":"ece6ddf8a4b2a53c247add6ec7f13d8c566711d2","msg":"可以用了"}
+{"date":"2021-08-11T23:48:37+08:00","hash":"2b21160d3008b17135289a81e53d3dad1ca1b9c2","msg":"modify go.sum"}
+{"date":"2021-08-11T23:47:16+08:00","hash":"59c784473a8cad2b99242436a46ed09f75f84bad","msg":"increase go.mod"}
+{"date":"2021-08-11T23:47:13+08:00","hash":"176e7fc09d961a2522042ae5c6620a0e0d714ddd","msg":"edit README.md"}
+{"date":"2021-08-11T23:43:21+08:00","hash":"87c44bdf6cbe6166615c962180d22910877f24fb","msg":"edit README.md"}
+{"date":"2021-08-11T23:38:31+08:00","hash":"2f51259d8417ade03b3297d85ebc7f7bb9025f73","msg":"increase client.go"}

git/commit.log

@@ -0,0 +1,10 @@
+{"date":"2021-08-12T06:03:26+08:00","hash":"40e24b24faa6ba51d1defbebc34ccc27dedcef93","msg":"完工"}
+{"date":"2021-08-12T05:04:24+08:00","hash":"3312b45d69d94d338e20ce48294feb2235df6e22","msg":"opt"}
+{"date":"2021-05-18T06:54:27+08:00","hash":"f332ed7f4e119b1cee6788ecfed79a93fe9366fc","msg":"cut ChangeLog.txt"}
+{"date":"2021-05-16T00:08:56+08:00","hash":"a58945a39b6b436e5e7ffd1bf8aa366b0b660395","msg":"add README.md"}
+{"date":"2021-08-01T23:49:36+08:00","hash":"ece6ddf8a4b2a53c247add6ec7f13d8c566711d2","msg":"可以用了"}
+{"date":"2021-08-11T23:48:37+08:00","hash":"2b21160d3008b17135289a81e53d3dad1ca1b9c2","msg":"modify go.sum"}
+{"date":"2021-08-11T23:47:16+08:00","hash":"59c784473a8cad2b99242436a46ed09f75f84bad","msg":"increase go.mod"}
+{"date":"2021-08-11T23:47:13+08:00","hash":"176e7fc09d961a2522042ae5c6620a0e0d714ddd","msg":"edit README.md"}
+{"date":"2021-08-11T23:43:21+08:00","hash":"87c44bdf6cbe6166615c962180d22910877f24fb","msg":"edit README.md"}
+{"date":"2021-08-11T23:38:31+08:00","hash":"2f51259d8417ade03b3297d85ebc7f7bb9025f73","msg":"increase client.go"}

git/git.go

@@ -1,11 +1,16 @@
 package git
 
 import (
+	"bufio"
 	"context"
+	"encoding/json"
 	"fmt"
 	"git.medlinker.com/wanghouwei/autoAddCommit/file"
 	"git.medlinker.com/wanghouwei/autoAddCommit/util"
+	"io"
 	"math/rand"
+	"os"
+	"strconv"
 	"time"
 )
 
@@ -15,8 +20,15 @@ var (
 	startTime time.Time
 	maxTimes  = 100
 	baseDir   = ""
+	commitTimes = 50
 )
 
+type commit struct {
+	Date string `json:"date"`
+	Hash string `json:"hash"`
+	Msg string `json:"msg"`
+}
+
 func changeDate() {
 	id, _ := getCommitID()
 	cmd := `if [ $GIT_COMMIT = %s ]; then export GIT_AUTHOR_DATE="%s" export GIT_COMMITTER_DATE="%s"; fi`
@@ -31,13 +43,20 @@ func changeDate() {
 }
 
 func Run(dir string) {
+	now := time.Now()
+	// 前推4个月
+	startTime = now.Add(time.Second * -1 * 60 * 60 * 24 * 30 * 4)
 	//changeDate()
 	//return
 	//dir = "/Users/med/mine/goPkgLearn"
+	// 最后50次
+	log := getCommitLog(commitTimes)
+	if len(log) == commitTimes {
+		util.Infof("commit log 已经够分配")
+		deviceCommit(log)
+		return
+	}
 	baseDir = dir
-	now := time.Now()
-	// 前推4个月
-	startTime = now.Add(time.Second * -1 * 60 * 60 * 24 * 30 * 4)
 	if err := getBranch(); err != nil {
 		util.Errorf("getBranch err (%+v)", err)
 		return
@@ -181,3 +200,47 @@ func getTime() {
 	}
 	startTime = startTime.Add(time.Second * time.Duration(randNum))
 }
+
+// 如果以前的commit 够用了，则直接随机分配
+//git log -n 5 --pretty=format:"%cI | %H | %s" > abc.txt
+func getCommitLog(times int) (res []commit) {
+	err := util.RunCmd("git", "log", "-n", strconv.Itoa(times), "--pretty=format:\"{\\\"date\\\":\\\"%cI\\\",\\\"hash\\\":\\\"%H\\\",\\\"msg\\\":\\\"%s\\\"}\" > commit.log")
+	if err != nil {
+		util.Errorf("git log err (%+v)", err)
+		return
+	}
+	// 读取
+	f, err := os.Open("commit.log")
+	if err != nil {
+		panic(err)
+	}
+	defer f.Close()
+	rd := bufio.NewReader(f)
+	for {
+		line, err := rd.ReadBytes('\n') //以'\n'为结束符读入一行
+		if err != nil || io.EOF == err {
+			break
+		}
+		r := commit{}
+		if err = json.Unmarshal(line, &r); err != nil {
+			util.Errorf("Unmarshal err (%+v)", err)
+			return
+		}
+		res = append(res, r)
+	}
+	return
+}
+
+func deviceCommit(list []commit)  {
+	l :=  len(list)
+	// 4个月
+	total := 60 * 60 * 24 * 30 * 4
+	timeList := []int{total}
+	for i := 0; i < len(list); i++ {
+		reduce := util.DoubleAverage(l, total)
+		total-= reduce
+		l--
+		println(reduce)
+		timeList = append(timeList, total)
+	}
+}

git/git_test.go

@@ -0,0 +1,11 @@
+package git
+
+import "testing"
+
+func Test_getCommitLog(t *testing.T)  {
+	getCommitLog(10)
+}
+
+func Test_Run(t *testing.T)  {
+	Run("./")
+}

git/mainFile/mit.log

@@ -0,0 +1,10 @@
+{"date":"2021-08-12T06:03:26+08:00","hash":"40e24b24faa6ba51d1defbebc34ccc27dedcef93","msg":"完工"}
+{"date":"2021-08-12T05:04:24+08:00","hash":"3312b45d69d94d338e20ce48294feb2235df6e22","msg":"opt"}
+{"date":"2021-05-18T06:54:27+08:00","hash":"f332ed7f4e119b1cee6788ecfed79a93fe9366fc","msg":"cut ChangeLog.txt"}
+{"date":"2021-05-16T00:08:56+08:00","hash":"a58945a39b6b436e5e7ffd1bf8aa366b0b660395","msg":"add README.md"}
+{"date":"2021-08-01T23:49:36+08:00","hash":"ece6ddf8a4b2a53c247add6ec7f13d8c566711d2","msg":"可以用了"}
+{"date":"2021-08-11T23:48:37+08:00","hash":"2b21160d3008b17135289a81e53d3dad1ca1b9c2","msg":"modify go.sum"}
+{"date":"2021-08-11T23:47:16+08:00","hash":"59c784473a8cad2b99242436a46ed09f75f84bad","msg":"increase go.mod"}
+{"date":"2021-08-11T23:47:13+08:00","hash":"176e7fc09d961a2522042ae5c6620a0e0d714ddd","msg":"edit README.md"}
+{"date":"2021-08-11T23:43:21+08:00","hash":"87c44bdf6cbe6166615c962180d22910877f24fb","msg":"edit README.md"}
+{"date":"2021-08-11T23:38:31+08:00","hash":"2f51259d8417ade03b3297d85ebc7f7bb9025f73","msg":"increase client.go"}

util/util.go

@@ -4,8 +4,10 @@ import (
 	"context"
 	"fmt"
 	"github.com/fatih/color"
+	"math/rand"
 	"os/exec"
 	"strings"
+	"time"
 )
 
 var (
@@ -69,3 +71,24 @@ func Infof(format string, args ...interface{}) {
 func Errorf(format string, args ...interface{}) {
 	color.Red(format+"\n", args...)
 }
+
+//二倍均值算法,count剩余个数,amount剩余时间
+func DoubleAverage(count, total int) int {
+	if count == 1 {
+		//返回剩余时间
+		return total
+	}
+	// 提交间隔至少 1h
+	min := 60 * 60
+	//计算最大可用时间,min最小是1分钱,减去的min,下面会加上,避免出现0分钱
+	max := total - min*count
+	//计算最大可用平均值
+	avg := max / count
+	//二倍均值基础加上最小时间,防止0出现,作为上限
+	avg2 := 2*avg + min
+	//随机commit时间序列元素,把二倍均值作为随机的最大数
+	rand.Seed(time.Now().UnixNano())
+	//加min是为了避免出现0值,上面也减去了min
+	x := rand.Intn(avg2) + min
+	return x
+}