refactor TargetURL

Author: wxiaoguang

models/git/commit_status.go

@@ -30,17 +30,21 @@ import (
 
 // CommitStatus holds a single Status of a single Commit
 type CommitStatus struct {
-	ID          int64                          `xorm:"pk autoincr"`
-	Index       int64                          `xorm:"INDEX UNIQUE(repo_sha_index)"`
-	RepoID      int64                          `xorm:"INDEX UNIQUE(repo_sha_index)"`
-	Repo        *repo_model.Repository         `xorm:"-"`
-	State       commitstatus.CommitStatusState `xorm:"VARCHAR(7) NOT NULL"`
-	SHA         string                         `xorm:"VARCHAR(64) NOT NULL INDEX UNIQUE(repo_sha_index)"`
-	TargetURL   string                         `xorm:"TEXT"`
-	Description string                         `xorm:"TEXT"`
-	ContextHash string                         `xorm:"VARCHAR(64) index"`
-	Context     string                         `xorm:"TEXT"`
-	Creator     *user_model.User               `xorm:"-"`
+	ID     int64                          `xorm:"pk autoincr"`
+	Index  int64                          `xorm:"INDEX UNIQUE(repo_sha_index)"`
+	RepoID int64                          `xorm:"INDEX UNIQUE(repo_sha_index)"`
+	Repo   *repo_model.Repository         `xorm:"-"`
+	State  commitstatus.CommitStatusState `xorm:"VARCHAR(7) NOT NULL"`
+	SHA    string                         `xorm:"VARCHAR(64) NOT NULL INDEX UNIQUE(repo_sha_index)"`
+
+	// TargetURL points to the commit status page reported by a CI system
+	// If Gitea Actions is used, it is a relative  like "{RepoLink}/actions/runs/{RunID}/jobs{JobID}"
+	TargetURL string `xorm:"TEXT"`
+
+	Description string           `xorm:"TEXT"`
+	ContextHash string           `xorm:"VARCHAR(64) index"`
+	Context     string           `xorm:"TEXT"`
+	Creator     *user_model.User `xorm:"-"`
 	CreatorID   int64
 
 	CreatedUnix timeutil.TimeStamp `xorm:"INDEX created"`
@@ -211,26 +215,45 @@ func (status *CommitStatus) LocaleString(lang translation.Locale) string {
 
 // HideActionsURL set `TargetURL` to an empty string if the status comes from Gitea Actions
 func (status *CommitStatus) HideActionsURL(ctx context.Context) {
-	if status.CreatedByGiteaActions(ctx) {
+	if _, ok := status.cutTargetURLGiteaActionsPrefix(ctx); ok {
 		status.TargetURL = ""
 	}
 }
 
-// CreatedByGiteaActions returns true if the commit status is created by Gitea Actions
-func (status *CommitStatus) CreatedByGiteaActions(ctx context.Context) bool {
+func (status *CommitStatus) cutTargetURLGiteaActionsPrefix(ctx context.Context) (string, bool) {
 	if status.RepoID == 0 {
-		return false
+		return "", false
 	}
 
 	if status.Repo == nil {
 		if err := status.loadRepository(ctx); err != nil {
 			log.Error("loadRepository: %v", err)
-			return false
+			return "", false
 		}
 	}
 
 	prefix := status.Repo.Link() + "/actions"
-	return strings.HasPrefix(status.TargetURL, prefix)
+	return strings.CutPrefix(prefix, status.TargetURL)
+}
+
+// ParseGiteaActionsTargetURL parses the commit status target URL as Gitea Actions link
+func (status *CommitStatus) ParseGiteaActionsTargetURL(ctx context.Context) (runID, jobID int64, ok bool) {
+	s, ok := status.cutTargetURLGiteaActionsPrefix(ctx)
+	if !ok {
+		return 0, 0, false
+	}
+
+	parts := strings.Split(s, "/") // expect: /runs/{runID}/jobs/{jobID}
+	if len(parts) < 5 || parts[1] != "runs" || parts[3] != "jobs" {
+		return 0, 0, false
+	}
+
+	runID, err1 := strconv.ParseInt(parts[2], 10, 64)
+	jobID, err2 := strconv.ParseInt(parts[4], 10, 64)
+	if err1 != nil || err2 != nil {
+		return 0, 0, false
+	}
+	return runID, jobID, true
 }
 
 // CalcCommitStatus returns commit status state via some status, the commit statues should order by id desc

services/actions/commit_status.go

@@ -8,7 +8,6 @@ import (
 	"errors"
 	"fmt"
 	"path"
-	"regexp"
 	"strconv"
 
 	actions_model "code.gitea.io/gitea/models/actions"
@@ -57,14 +56,11 @@ func CreateCommitStatusForRunJobs(ctx context.Context, run *actions_model.Action
 func GetRunsFromCommitStatuses(ctx context.Context, statuses []*git_model.CommitStatus) ([]*actions_model.ActionRun, error) {
 	runMap := make(map[int64]*actions_model.ActionRun)
 	for _, status := range statuses {
-		if !status.CreatedByGiteaActions(ctx) {
+		runIndex, _, ok := status.ParseGiteaActionsTargetURL(ctx)
+		if !ok {
 			continue
 		}
-		runIndex, _, err := getActionRunAndJobIndexFromCommitStatus(status)
-		if err != nil {
-			return nil, fmt.Errorf("getActionRunAndJobIndexFromCommitStatus: %w", err)
-		}
-		_, ok := runMap[runIndex]
+		_, ok = runMap[runIndex]
 		if !ok {
 			run, err := actions_model.GetRunByIndex(ctx, status.RepoID, runIndex)
 			if err != nil {
@@ -84,27 +80,6 @@ func GetRunsFromCommitStatuses(ctx context.Context, statuses []*git_model.Commit
 	return runs, nil
 }
 
-func getActionRunAndJobIndexFromCommitStatus(status *git_model.CommitStatus) (int64, int64, error) {
-	// status.TargetURL should be like "<repo_link>/actions/runs/<run_index>/jobs/<job_index>"
-	re := regexp.MustCompile(regexp.QuoteMeta(status.Repo.Link()+"/actions/runs/") + `(\d+)/jobs/(\d+)$`)
-	matches := re.FindStringSubmatch(status.TargetURL)
-
-	if len(matches) != 3 {
-		return 0, 0, fmt.Errorf("%s is not a Gitea Actions link", status.TargetURL)
-	}
-
-	runIndex, err := strconv.ParseInt(matches[1], 10, 64)
-	if err != nil {
-		return 0, 0, fmt.Errorf("parse run index: %w", err)
-	}
-	jobIndex, err := strconv.ParseInt(matches[2], 10, 64)
-	if err != nil {
-		return 0, 0, fmt.Errorf("parse job index: %w", err)
-	}
-
-	return runIndex, jobIndex, nil
-}
-
 func getCommitStatusEventNameAndCommitID(run *actions_model.ActionRun) (event, commitID string, _ error) {
 	switch run.Event {
 	case webhook_module.HookEventPush: