Add: Add RunOnce

Author: Hayao0819

alteriso5/cmd/build/build.go

@@ -31,6 +31,6 @@ func build() error {
 	}
 
 	profile := config.DummyProfile()
-	target := config.NewTarget([]string{"x86_64"}, outDir)
+	target := config.NewTarget("x86_64", outDir)
 	return work.Build(profile, target)
 }

alteriso5/cmd/build/config/target.go

@@ -1,10 +1,10 @@
 package config
 
 type Target struct {
-	Arch []string
+	Arch string
 	Out  string
 }
 
-func NewTarget(arch []string, out string) Target {
+func NewTarget(arch string, out string) Target {
 	return Target{arch, out}
 }

alteriso5/cmd/build/work/build.go

@@ -7,13 +7,15 @@ func (work Work) Build(p config.Profile, t config.Target) error {
 	work.profile = &p
 	work.target = &t
 
-	var tasks []BuildTask = []BuildTask{
-		work.MakeBaseDirs,
-		work.MakeChroot,
+	tasks := []*BuildTask{
+		makeBaseDirs,
+		makeChroot,
 	}
 
 	for _, t := range tasks {
-		err := t()
+		//err := (*t).task(&work)
+
+		err := work.RunOnce(t)
 		if err != nil {
 			return err
 		}

alteriso5/cmd/build/work/tasks.go

@@ -3,30 +3,31 @@ package work
 import (
 	"path"
 
-	"github.com/FascodeNet/alterlinux/alteriso5/utils"
 	"github.com/FascodeNet/alterlinux/alteriso5/cmd/build/work/chroot"
+	"github.com/FascodeNet/alterlinux/alteriso5/utils"
 )
 
-func (work *Work) MakeBaseDirs() error {
-
-	dirs := []string{
-		work.Base,
-		work.target.Out,
-	}
+var makeBaseDirs *BuildTask = NewBuildTask("makeBaseDirs",
+	func(work *Work) error {
 
-	if err := utils.MkdirsAll(dirs...); err != nil {
-		return err
-	}
-	return nil
-}
+		dirs := []string{
+			work.Base,
+			work.target.Out,
+		}
 
-func (work *Work) MakeChroot() error {
-	for _, arch := range work.target.Arch {
-		dir := path.Join(work.Base, arch)
-		env := chroot.New(dir, arch)
-		if err := env.Init(); err != nil {
+		if err := utils.MkdirsAll(dirs...); err != nil {
 			return err
 		}
+		return nil
+	})
+
+var makeChroot *BuildTask = NewBuildTask("makeChroot", func(work *Work) error {
+
+	dir := path.Join(work.Base, work.target.Arch, "airootfs")
+	env := chroot.New(dir, work.target.Arch)
+	if err := env.Init(); err != nil {
+		return err
+
 	}
 	return nil
-}
+})

alteriso5/cmd/build/work/utils.go

@@ -0,0 +1,16 @@
+package work
+
+import (
+	"path"
+
+	"github.com/Hayao0819/nahi/osutils"
+)
+
+func (w *Work) RunOnce(task *BuildTask) error {
+	lp := path.Join(w.Base, w.target.Arch, "lockfile", task.Name())
+	if osutils.Exists(lp) {
+		return nil
+	}
+
+	return task.Run(w)
+}

alteriso5/cmd/build/work/work.go

@@ -1,11 +1,29 @@
 package work
 
 import (
-	"github.com/FascodeNet/alterlinux/alteriso5/cmd/build/work/chroot"
 	"github.com/FascodeNet/alterlinux/alteriso5/cmd/build/config"
+	"github.com/FascodeNet/alterlinux/alteriso5/cmd/build/work/chroot"
 )
 
-type BuildTask func() error
+type BuildTask struct {
+	name string
+	task func(work *Work) error
+}
+
+func NewBuildTask(name string, task func(*Work) error) *BuildTask {
+	return &BuildTask{
+		name: name,
+		task: task,
+	}
+}
+
+func (t *BuildTask) Name() string {
+	return t.name
+}
+
+func (t *BuildTask) Run(w *Work) error {
+	return t.task(w)
+}
 
 type Work struct {
 	Base    string