Merge pull request #25 from adhocore/refactor-batch

.goreleaser.yml

@@ -2,8 +2,8 @@ project_name: tasker
 
 release:
   prerelease: auto
-  name_template: "v{{.Version}}"
-  draft: true
+  name_template: "Version v{{.Version}}"
+  # draft: true
   mode: "keep-existing"
 
 before:

README.md

@@ -147,8 +147,8 @@ func main() {
 	})
 
 	// run task without overlap, set concurrent flag to false:
-    concurrent := false
-    taskr.Task("* * * * * *", , tasker.Taskify("sleep 2", tasker.Option{}), concurrent)
+	concurrent := false
+	taskr.Task("* * * * * *", , tasker.Taskify("sleep 2", tasker.Option{}), concurrent)
 
 	// every 10 minute with arbitrary command
 	taskr.Task("@10minutes", taskr.Taskify("command --option val -- args", tasker.Option{Shell: "/bin/sh -c"}))

batch.go

@@ -1,6 +1,7 @@
 package gronx
 
 import (
+	"strings"
 	"time"
 )
 
@@ -9,7 +10,6 @@ type Expr struct {
 	Expr string
 	Due  bool
 	Err  error
-	segs []string
 }
 
 // BatchDue checks if multiple expressions are due for given time (or now).
@@ -18,20 +18,34 @@ func (g *Gronx) BatchDue(exprs []string, ref ...time.Time) []Expr {
 	ref = append(ref, time.Now())
 	g.C.SetRef(ref[0])
 
-	batch := make([]Expr, len(exprs))
+	var segs []string
+
+	cache, batch := map[string]Expr{}, make([]Expr, len(exprs))
 	for i := range exprs {
-		if batch[i].segs, batch[i].Err = Segments(exprs[i]); batch[i].Err != nil {
+		batch[i].Expr = exprs[i]
+		segs, batch[i].Err = Segments(exprs[i])
+		key := strings.Join(segs, " ")
+		if batch[i].Err != nil {
+			cache[key] = batch[i]
 			continue
 		}
+
+		if c, ok := cache[key]; ok {
+			batch[i] = c
+			batch[i].Expr = exprs[i]
+			continue
+		}
+
 		due := true
-		for pos, seg := range batch[i].segs {
+		for pos, seg := range segs {
 			if seg != "*" && seg != "?" {
 				if due, batch[i].Err = g.C.CheckDue(seg, pos); !due || batch[i].Err != nil {
 					break
 				}
 			}
 		}
 		batch[i].Due = due
+		cache[key] = batch[i]
 	}
 	return batch
 }

pkg/tasker/README.md

@@ -55,8 +55,8 @@ func main() {
 	})
 
 	// run task without overlap, set concurrent flag to false:
-    concurrent := false
-    taskr.Task("* * * * * *", , tasker.Taskify("sleep 2", tasker.Option{}), concurrent)
+	concurrent := false
+	taskr.Task("* * * * * *", , tasker.Taskify("sleep 2", tasker.Option{}), concurrent)
 
 	// every 10 minute with arbitrary command
 	taskr.Task("@10minutes", taskr.Taskify("command --option val -- args", tasker.Option{Shell: "/bin/sh -c"}))