🐛 fix eta display (#7)

Author: kitstack

README.md

@@ -52,5 +52,47 @@ func main() {
 }
 ```
 
+## 💡 For better performance
+
+Using a modulo to reduce the eta display (fast example)
+
+```go
+package main
+
+import (
+	"github.com/lab210-dev/async-job"
+	"log"
+	"time"
+)
+
+func main() {
+	// create slice of jobs
+	var list []time.Duration
+	for i := 1; i <= 100; i++ {
+		list = append(list, time.Duration(1)*time.Millisecond)
+	}
+	err := asyncjob.New().
+		SetWorkers(2).
+		OnProgress(func(progress asyncjob.Progress) {
+			// Eta will be displayed every 10 jobs
+			if progress.Current()%10 != 0 {
+				return
+			}
+			// print the eta
+		    log.Printf("Progress: %s\n", progress.String())
+		}).
+		Run(func(job asyncjob.Job) error {
+			// slow down the job
+			time.Sleep(job.Data().(time.Duration))
+			return nil
+		}, list)
+	
+	// if a job returns an error, it stops the process
+	if err != nil {
+		log.Fatal(err)
+	}
+}
+```
+
 ## 🤝 Contributions
 Contributors to the package are encouraged to help improve the code.

main.go

@@ -88,7 +88,7 @@ func (aj *AsyncJob) _Progress() {
 	ret := aj.jobs.Len() - aj.position
 
 	// call the anonymous function with data
-	aj.onProgressFunc(Progress{aj.position, aj.jobs.Len(), time.Duration((time.Since(aj.startTimer).Milliseconds()/int64(aj.position))*int64(ret)) * time.Millisecond})
+	aj.onProgressFunc(Progress{aj.position, aj.jobs.Len(), time.Duration((time.Since(aj.startTimer).Nanoseconds()/int64(aj.position))*int64(ret)) * time.Nanosecond})
 }
 
 // _Next allows you to retrieve the next job

main_test.go

@@ -3,9 +3,7 @@ package asyncjob
 import (
 	"errors"
 	"github.com/stretchr/testify/assert"
-	"io/ioutil"
 	"log"
-	"os"
 	"sync"
 	"testing"
 	"time"
@@ -16,24 +14,6 @@ func LogJob(t *testing.T, job Job) {
 	t.Logf("OnJob=%s key=%d", job.Data(), job.Index())
 }
 
-// function for capture stout
-func CaptureStdout(t *testing.T, f func()) string {
-	r, w, err := os.Pipe()
-	if err != nil {
-		t.Fatal(err)
-	}
-	stdout := os.Stdout
-	os.Stdout = w
-	f()
-	w.Close()
-	os.Stdout = stdout
-	out, err := ioutil.ReadAll(r)
-	if err != nil {
-		t.Fatal(err)
-	}
-	return string(out)
-}
-
 func TestNew(t *testing.T) {
 	t.Run("Run with empty slice data", func(t *testing.T) {
 		err := New().
@@ -255,4 +235,34 @@ func TestNew(t *testing.T) {
 		assert.True(t, result[2] >= 0.500 && result[2] <= 0.600)
 		t.Log(result)
 	})
+	t.Run("Testing large eta", func(t *testing.T) {
+		var list []time.Duration
+		for i := 1; i <= 5000; i++ {
+			list = append(list, time.Duration(1)*time.Microsecond)
+		}
+		var result []float64
+		err := New().
+			SetWorkers(2).
+			OnProgress(func(progress Progress) {
+				if progress.Current()%1000 != 0 {
+					return
+				}
+				t.Log(progress.Current(), progress.Total(), progress.EstimateTimeLeft(), progress)
+				result = append(result, progress.EstimateTimeLeft().Seconds())
+			}).
+			Run(func(job Job) error {
+				time.Sleep(job.Data().(time.Duration))
+				return nil
+			}, list)
+
+		// test err if nil
+		if !assert.Nil(t, err) {
+			return
+		}
+		// verify all value into result
+		for _, v := range result {
+			assert.True(t, v != 0)
+		}
+		t.Log(result)
+	})
 }