支持：改为 issue 方式选题

polaris1119 · polaris1119 · commit 67f1b505c8b5 · 2018-01-16T20:13:42.000+08:00
diff --git a/src/logic/github.go b/src/logic/github.go
@@ -183,6 +183,24 @@ func (self GithubLogic) translating(filesResult gjson.Result, _prInfo *prInfo) e
 		filename := val.Get("filename").String()
 		// 是否对原文的改动
 		if !strings.HasPrefix(filename, "sources") {
+
+			// 目前改为采用 issue 的方式选题，不再有 sources
+			if strings.HasPrefix(filename, "translated") {
+				filenames := strings.SplitN(filename, "/", 3)
+				if len(filenames) < 3 {
+					return true
+				}
+				title := filenames[2]
+				if title == "" {
+					return true
+				}
+
+				err := self.issueTranslated(_prInfo, title)
+				if err != nil {
+					outErr = err
+				}
+			}
+
 			return true
 		}
 
@@ -209,6 +227,53 @@ func (self GithubLogic) translating(filesResult gjson.Result, _prInfo *prInfo) e
 	return outErr
 }
 
+func (self GithubLogic) issueTranslated(_prInfo *prInfo, title string) error {
+	md5 := goutils.Md5(title)
+	gcttGit := &model.GCTTGit{}
+	_, err := MasterDB.Where("md5=?", md5).Get(gcttGit)
+	if err != nil {
+		logger.Errorln("GithubLogic insertOrUpdateGCCT get error:", err)
+		return err
+	}
+
+	if gcttGit.Id > 0 {
+		return nil
+	}
+
+	gcttUser := DefaultGCTT.FindOne(nil, _prInfo.username)
+
+	session := MasterDB.NewSession()
+	defer session.Close()
+	session.Begin()
+
+	if gcttUser.Id == 0 {
+		gcttUser.Username = _prInfo.username
+		gcttUser.Avatar = _prInfo.avatar
+		gcttUser.JoinedAt = _prInfo.prTime.Unix()
+		_, err = session.Insert(gcttUser)
+		if err != nil {
+			session.Rollback()
+			logger.Errorln("GithubLogic issueTranslated insert gctt_user error:", err)
+			return err
+		}
+	}
+
+	gcttGit.Username = _prInfo.username
+	gcttGit.Title = title
+	gcttGit.Md5 = md5
+	gcttGit.PR = _prInfo.number
+	gcttGit.TranslatedAt = _prInfo.prTime.Unix()
+	_, err = MasterDB.Insert(gcttGit)
+	if err != nil {
+		session.Rollback()
+		logger.Errorln("GithubLogic issueTranslated insert error:", err)
+		return err
+	}
+
+	session.Commit()
+	return nil
+}
+
 func (self GithubLogic) translated(filesResult gjson.Result, _prInfo *prInfo) error {
 	var (
 		sourceTitle  string
diff --git a/src/logic/github_test.go b/src/logic/github_test.go
@@ -17,7 +17,7 @@ import (
 func TestPullPR(t *testing.T) {
 	logger.Init(config.ROOT+"/log", config.ConfigFile.MustValue("global", "log_level", "DEBUG"))
 
-	err := logic.DefaultGithub.PullPR("studygolang/GCTT", false)
+	err := logic.DefaultGithub.PullPR("studygolang/GCTT", true)
 	if err != nil {
 		t.Error("pull request error:", err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ import (`
`17`	`17`	`func TestPullPR(t *testing.T) {`
`18`	`18`	`logger.Init(config.ROOT+"/log", config.ConfigFile.MustValue("global", "log_level", "DEBUG"))`
`19`	`19`
`20`		`- err := logic.DefaultGithub.PullPR("studygolang/GCTT", false)`
	`20`	`+ err := logic.DefaultGithub.PullPR("studygolang/GCTT", true)`
`21`	`21`	`if err != nil {`
`22`	`22`	`t.Error("pull request error:", err)`
`23`	`23`	`}`