修复report报告mac存在漏报问题 & version 1.3.1

Author: zan8in

cmd/afrog/main.go

@@ -55,7 +55,6 @@ func main() {
 			r := result.(*core.Result)
 
 			lock.Lock()
-			defer lock.Unlock()
 
 			if !options.Silent {
 				options.CurrentCount++
@@ -77,6 +76,8 @@ func main() {
 				fmt.Printf("\r%d/%d | %d%% ", options.CurrentCount, options.Count, options.CurrentCount*100/options.Count)
 			}
 
+			lock.Unlock()
+
 		})
 		if err != nil {
 			return err

internal/runner/banner.go

@@ -9,7 +9,7 @@ import (
 )
 
 func ShowBanner() string {
-	return "afrog"
+	return "afrog 五一劳动节版"
 }
 
 func ShowUsage() string {

pkg/config/config.go

@@ -39,7 +39,7 @@ type Ceye struct {
 }
 
 const afrogConfigFilename = "afrog-config.yaml"
-const Version = "1.3.0"
+const Version = "1.3.1"
 
 // Create and initialize afrog-config.yaml configuration info
 func New() (*Config, error) {

pkg/html/html.go

@@ -16,6 +16,7 @@ type HtmlTemplate struct {
 	Result   *core.Result
 	Filename string
 	Number   string
+	Syncfile *utils.Syncfile
 }
 
 const outputDirectory = "./reports"
@@ -30,14 +31,18 @@ func (ht *HtmlTemplate) New() error {
 		}
 
 		ouputFile := filepath.Join(outputDirectory, ht.Filename)
-		// if utils.Exists(ouputFile) {
-		// 	return errors.New("output filename had existed")
-		// }
 
 		os.MkdirAll(outputDirectory, os.ModePerm)
 		ht.Filename = ouputFile
 
-		return utils.WriteFile(ouputFile, []byte(header()))
+		os.Remove(ht.Filename)
+
+		sf, err := utils.NewSyncfile(ht.Filename)
+		if err != nil {
+			return err
+		}
+		ht.Syncfile = sf
+		sf.Write(header())
 	}
 	return nil
 }
@@ -124,12 +129,11 @@ func (ht *HtmlTemplate) Html() string {
 }
 
 func (ht *HtmlTemplate) Append() {
-	r := ht.Html()
-	if len(r) > 0 {
-		utils.AppendString(ht.Filename, r)
-		// fmt.Println(err)
+	content := ht.Html()
+	if len(content) > 0 {
+		// utils.AppendString(ht.Filename, r)
+		ht.Syncfile.Write(content)
 	}
-	// fmt.Println(len(r))
 }
 
 func header() string {

pkg/utils/syncfile.go

@@ -0,0 +1,32 @@
+package utils
+
+import (
+	"bufio"
+	"os"
+	"sync"
+)
+
+type Syncfile struct {
+	mutex     *sync.Mutex
+	iohandler *os.File
+}
+
+func NewSyncfile(filename string) (*Syncfile, error) {
+	f, err := os.OpenFile(filename, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0666)
+	if err != nil {
+		return nil, err
+	}
+	return &Syncfile{mutex: &sync.Mutex{}, iohandler: f}, nil
+}
+
+func (sf *Syncfile) Write(content string) {
+	sf.mutex.Lock()
+
+	wbuf := bufio.NewWriterSize(sf.iohandler, len(content))
+	wbuf.WriteString(content)
+	wbuf.Flush()
+
+	RandSleep(1)
+
+	sf.mutex.Unlock()
+}