Copy image dir (#119)

Author: pjohnst5

build.go

@@ -286,15 +286,7 @@ func build(c *modulir.Context) []error {
 	//
 	// Copy over remaining images to /content/images
 	//
-	if err := mfile.CopyFile(c, c.SourceDir+"/content/images/CoolsterCodes.png", c.TargetDir+"/content/images/CoolsterCodes.png"); err != nil {
-		return []error{err}
-	}
-	if err := mfile.CopyFile(c, c.SourceDir+"/content/images/favicon.png", c.TargetDir+"/content/images/favicon.png"); err != nil {
-		return []error{err}
-	}
-
-	// Copy over "staticwebapp.config.json" to target build directory
-	if err := mfile.CopyFile(c, c.SourceDir+"/web/staticwebapp.config.json", c.TargetDir+"/staticwebapp.config.json"); err != nil {
+	if err := mfile.CopyDirectory(c, c.SourceDir+"/content/images", c.TargetDir+"/content/images"); err != nil {
 		return []error{err}
 	}
 

modules/modulir/mfile/mfile.go

@@ -24,36 +24,27 @@ import (
 //
 //////////////////////////////////////////////////////////////////////////////
 
-// CopyDirectoryImages is a shortcut for copying over all non-md files into the /public/images/<identifier>/.
-func CopyDirectoryImages(c *modulir.Context, source, target string) error {
-	dirs, err := ReadDirWithOptions(c, source, &ReadDirOptions{ShowDirs: true})
-	if err != nil {
+// CopyDirectory copies all files from source directory directly to target directory (non-recursive).
+// This is useful for copying static assets like images without subdirectory structure.
+func CopyDirectory(c *modulir.Context, source, target string) error {
+	// Ensure target directory exists
+	if err := EnsureDir(c, target); err != nil {
 		return err
 	}
 
-	for _, dir := range dirs {
-		// Read the files from that dir ignoring *.md
-		files, err := ReadDirWithOptions(c, dir, &ReadDirOptions{IgnoreMDs: true})
-		if err != nil {
-			return err
-		}
-
-		// Make new target directory path
-		justNameOfDir := filepath.Base(dir)
-		targetDir := filepath.Join(target, justNameOfDir)
+	// Read files from source directory (ignoring subdirectories by default)
+	files, err := ReadDirWithOptions(c, source, &ReadDirOptions{IgnoreMDs: true})
+	if err != nil {
+		return err
+	}
 
-		// Ensure target directory exists
-		if err = EnsureDir(c, targetDir); err != nil {
+	// Copy all files to target directory
+	for _, file := range files {
+		if err = CopyFileToDir(c, file, target); err != nil {
 			return err
 		}
-
-		// Copy all files into there
-		for _, file := range files {
-			if err = CopyFileToDir(c, file, targetDir); err != nil {
-				return err
-			}
-		}
 	}
+
 	return nil
 }
 
@@ -204,20 +195,6 @@ func MustAbs(path string) string {
 	return absPath
 }
 
-//
-// ReadDir
-//
-
-// ReadDir reads files in a directory and returns a list of file paths.
-//
-// Unlike os.ReadDir, this function skips hidden, "meta" (i.e. prefixed by
-// an underscore), and Vim backup (i.e. suffixed with a tilde) files, and
-// returns a list of full paths (easier to plumb into other functions), and
-// sets up a watch on the listed source.
-func ReadDir(c *modulir.Context, source string) ([]string, error) {
-	return ReadDirWithOptions(c, source, nil)
-}
-
 // ReadDirOptions are options for ReadDirWithOptions.
 type ReadDirOptions struct {
 	// RecurseDir tells the function to recurse into subdirectories.