添加分析进度

Author: yhy0

pkg/db/project.go

@@ -24,6 +24,7 @@ type Project struct {
 	Vul           int    `json:"vul"`
 	DefaultBranch string `json:"default_branch"`
 	LastScanTime  string
+	ProgressBar   string `json:"progress_bar"`
 }
 
 func AddProject(project Project) (int, int) {

pkg/runner/codeql.go

@@ -1,6 +1,7 @@
 package runner
 
 import (
+	"Yi/pkg/db"
 	"Yi/pkg/logging"
 	"Yi/pkg/utils"
 	"bytes"
@@ -34,7 +35,7 @@ func Analyze(database string, name string, language string, qls []string) map[st
 
 	logging.Logger.Infof("[[%s:%s]] analyze start ...", name, database)
 	fileName := fmt.Sprintf("%s/%d.json", filePath, time.Now().Unix())
-	for _, ql := range qls {
+	for i, ql := range qls {
 		cmd := exec.Command("codeql", "database", "analyze", "--rerun", database, Option.Path+ql, "--format=sarif-latest", "-o", fileName)
 		var stdout, stderr bytes.Buffer
 		cmd.Stdout = &stdout // 标准输出
@@ -54,9 +55,19 @@ func Analyze(database string, name string, language string, qls []string) map[st
 			result += i
 		}
 		res[fileName] = result
+
+		ProgressBar[name] = float32(i) / float32(len(qls)) * 100
 	}
 
-	logging.Logger.Infof("[[%s:%s]]  analysis completed.", name, database)
+	logging.Logger.Infof("[[%s:%s]] analysis completed.", name, database)
+	record := db.Record{
+		Project: name,
+		Url:     name,
+		Color:   "success",
+		Title:   name,
+		Msg:     fmt.Sprintf("%s 分析完毕", name),
+	}
+	db.AddRecord(record)
 	return res
 }
 

pkg/runner/options.go

@@ -43,6 +43,8 @@ var DirNames DirName
 
 var Pwd string
 
+var ProgressBar map[string]float32
+
 // Languages Codeql支持的语言，这里要根据机器上的配置，若要支持其他语言，请自行安装语言，以及指定对应语言的 codeql 规则
 var Languages = []string{"Go", "Java"}
 
@@ -106,4 +108,6 @@ func ParseArguments() {
 	// 生成配置文件，并监控更改
 	Init()
 	HotConf()
+
+	ProgressBar = make(map[string]float32)
 }

pkg/web/router.go

@@ -99,6 +99,13 @@ func Init() {
 			t, _ := time.Parse(time.RFC3339, pro.PushedAt)
 			data[i].PushedAt = t.Format("2006-01-02 15:04:05")
 			data[i].LastScanTime = data[i].UpdatedAt.Format("2006-01-02 15:04:05")
+			probar := runner.ProgressBar[pro.Project]
+			if probar != 0 {
+				data[i].ProgressBar = fmt.Sprintf("%.f", probar) + "%"
+			} else {
+				data[i].ProgressBar = fmt.Sprintf("%.f", probar)
+			}
+
 		}
 
 		p := utils.NewPaginator(c.Request, pageSize, total)

pkg/web/templates/index.tmpl

@@ -9,6 +9,7 @@
         .table tbody tr td{
             vertical-align: middle;
         }
+
     </style>
     <title>Yi 以有算无</title>
 </head>
@@ -79,6 +80,7 @@
                 <th class="text-center">Count</th>
                 <th class="text-center">LastScanTime</th>
                 <th class="text-center">PushedAt</th>
+                <th class="text-center">Progress</th>
             </tr>
             </thead>
             <tbody>
@@ -117,6 +119,11 @@
 
                     <td class="text-center">{{ $value.LastScanTime }}</td>
                     <td class="text-center">{{ $value.PushedAt }}</td>
+                    <td class="text-center">
+                        <div class="progress">
+                            <div class="progress-bar" role="progressbar" style="width: {{ $value.ProgressBar }}%;" aria-valuenow="25" aria-valuemin="0" aria-valuemax="100">{{ $value.ProgressBar }}</div>
+                        </div>
+                    </td>
                 </tr>
             {{ else }}
                 <tr>
@@ -127,6 +134,7 @@
                     <td></td>
                     <td></td>
                     <td></td>
+                    <td></td>
                 </tr>
             {{ end}}
             </tbody>