improved sketch init

Author: aldernero

cmd/sketchy/main.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 	"flag"
 	"fmt"
+	"io"
 	"io/fs"
 	"log"
 	"os"
@@ -29,9 +30,76 @@ func main() {
 		if _, err := os.Stat(dirPath); errors.Is(err, fs.ErrExist) {
 			log.Fatal("can't make directory: ", err)
 		}
-		err := os.Mkdir(dirPath, 0644)
+		err := os.Mkdir(dirPath, 0700)
 		if err != nil {
 			log.Fatal("error while creating directory: ", err)
 		}
+		err = copyTemplate(dirPath)
+		if err != nil {
+			log.Fatal("error while copying template files: ", err)
+		}
+	}
+}
+
+func copyTemplate(targetDir string) error {
+	cwd, err := os.Getwd()
+	if err != nil {
+		log.Fatal("error while getting working directory: ", err)
+	}
+	configFname := path.Join(cwd, "template", "sketch.json")
+	appFname := path.Join(cwd, "template", "main.go")
+	exists, err := regularFileExists(configFname)
+	if err != nil {
+		return fmt.Errorf("error while checking for config file: %v", err)
+	}
+	if !exists {
+		return fmt.Errorf("config file %s doesn't exist", configFname)
+	}
+	exists, err = regularFileExists(appFname)
+	if err != nil {
+		return fmt.Errorf("error while checking for config file: %v", err)
+	}
+	if !exists {
+		return fmt.Errorf("app file %s doesn't exist", appFname)
+	}
+	err = copyFile(configFname, path.Join(targetDir, "sketch.json"))
+	if err != nil {
+		return fmt.Errorf("error while copying config file: %v", err)
+	}
+	err = copyFile(appFname, path.Join(targetDir, "main.go"))
+	if err != nil {
+		return fmt.Errorf("error while copying app file: %v", err)
+	}
+	return nil
+}
+
+func regularFileExists(fname string) (bool, error) {
+	stat, err := os.Stat(fname)
+	if err == nil {
+		return stat.Mode().IsRegular(), nil
+	} else {
+		if errors.Is(err, fs.ErrNotExist) {
+			return false, nil
+		}
+	}
+	return false, err
+}
+
+func copyFile(src string, dst string) error {
+	srcFd, err := os.Open(src)
+	if err != nil {
+		return err
+	}
+	defer srcFd.Close()
+	dstFd, err := os.Create(dst)
+	if err != nil {
+		return err
+	}
+	defer dstFd.Close()
+	_, err = io.Copy(dstFd, srcFd)
+	if err != nil {
+		return err
 	}
+	err = dstFd.Sync()
+	return err
 }

go.mod

@@ -4,7 +4,7 @@ go 1.17
 
 require (
 	github.com/fogleman/gg v1.3.0
-	github.com/hajimehoshi/ebiten/v2 v2.2.4
+	github.com/hajimehoshi/ebiten/v2 v2.2.5
 	github.com/lucasb-eyer/go-colorful v1.2.0
 	github.com/ojrac/opensimplex-go v1.0.2
 )

go.sum

@@ -6,8 +6,8 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20210727001814-0db043d8d5be/go.mod h1:tQ2
 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g=
 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
 github.com/hajimehoshi/bitmapfont/v2 v2.1.3/go.mod h1:2BnYrkTQGThpr/CY6LorYtt/zEPNzvE/ND69CRTaHMs=
-github.com/hajimehoshi/ebiten/v2 v2.2.4 h1:/+qrmbv+W6scgVWwQJ7IyiI2z4y8QM2n0JDHStNC+Ns=
-github.com/hajimehoshi/ebiten/v2 v2.2.4/go.mod h1:olKl/qqhMBBAm2oI7Zy292nCtE+nitlmYKNF3UpbFn0=
+github.com/hajimehoshi/ebiten/v2 v2.2.5 h1:i6NdS6pEi5kgfTh+4XAVCVtCXxjTyxzU1cj1oqHWkZQ=
+github.com/hajimehoshi/ebiten/v2 v2.2.5/go.mod h1:olKl/qqhMBBAm2oI7Zy292nCtE+nitlmYKNF3UpbFn0=
 github.com/hajimehoshi/file2byteslice v0.0.0-20210813153925-5340248a8f41/go.mod h1:CqqAHp7Dk/AqQiwuhV1yT2334qbA/tFWQW0MD2dGqUE=
 github.com/hajimehoshi/go-mp3 v0.3.2/go.mod h1:qMJj/CSDxx6CGHiZeCgbiq2DSUkbK0UbtXShQcnfyMM=
 github.com/hajimehoshi/oto v0.6.1/go.mod h1:0QXGEkbuJRohbJaxr7ZQSxnju7hEhseiPx2hrh6raOI=

template/main.go

@@ -22,7 +22,7 @@ func main() {
 	var prefix string
 	var randomSeed int64
 	flag.StringVar(&configFile, "c", "sketch.json", "Sketch config file")
-	flag.StringVar(&configFile, "p", "sketch", "Output file prefix")
+	flag.StringVar(&prefix, "p", "sketch", "Output file prefix")
 	flag.Int64Var(&randomSeed, "s", 0, "Random number generator seed")
 	s, err := sketchy.NewSketchFromFile(configFile)
 	if err != nil {