Media and static folders (#226).

cmd/build.go

@@ -43,7 +43,7 @@ func setBuildDir(siteConfig readers.SiteConfig) string {
 // buildCmd represents the build command
 var buildCmd = &cobra.Command{
 	Use:   "build",
-	Short: "Creates the static assets for your site",
+	Short: "Creates the public assets for your site",
 	Long: `Build generates the actual HTML, JS, and CSS into a directory
 of your choosing. The files that are created are all
 you need to deploy for your website.`,
@@ -129,10 +129,22 @@ func Build() error {
 		log.Fatal("\nError in EjectCopy build step", err)
 	}
 
-	// Directly copy static assets to the build dir.
-	err = build.AssetsCopy(buildPath)
-	if err != nil {
-		log.Fatal("\nError in AssetsCopy build step", err)
+	if _, err := os.Stat("static"); err == nil {
+		// static folder exists
+		// Directly copy static files to the build dir.
+		err = build.StaticCopy(buildPath)
+		if err != nil {
+			log.Fatal("\nError in StaticCopy build step", err)
+		}
+	}
+
+	if _, err := os.Stat("media"); err == nil {
+		// media folder exists
+		// Directly copy media to the build dir.
+		err = build.MediaCopy(buildPath)
+		if err != nil {
+			log.Fatal("\nError in MediaCopy build step", err)
+		}
 	}
 
 	// Prep the client SPA.

cmd/build/media_copy.go

@@ -0,0 +1,166 @@
+package build
+
+import (
+	"encoding/json"
+	"fmt"
+	"io"
+	"io/fs"
+	"io/ioutil"
+	"os"
+	"path/filepath"
+	"time"
+
+	"github.com/spf13/afero"
+)
+
+// MediaCopy does a direct copy of any media files (e.g. images, PDFs).
+func MediaCopy(buildPath string) error {
+
+	defer Benchmark(time.Now(), "Copying media files into build dir")
+
+	Log("\nCopying media files:")
+
+	mediaDir := "media"
+	copiedSourceCounter := 0
+	var err error
+
+	if ThemeFs != nil {
+		copiedSourceCounter, err = copyMediaFromTheme(mediaDir, buildPath, copiedSourceCounter)
+		if err != nil {
+			return err
+		}
+	} else {
+		copiedSourceCounter, err = copyMediaFromProject(mediaDir, buildPath, copiedSourceCounter)
+		if err != nil {
+			return err
+		}
+	}
+
+	Log(fmt.Sprintf("Number of media files copied: %d", copiedSourceCounter))
+	return nil
+
+}
+
+func copyMediaFromTheme(mediaDir string, buildPath string, copiedSourceCounter int) (int, error) {
+
+	// Index of copied media files to list them in media browser
+	var index []string
+
+	if err := afero.Walk(ThemeFs, mediaDir, func(path string, info os.FileInfo, err error) error {
+		if err != nil {
+			return err
+		}
+		fullPath := buildPath + "/" + path
+		if info.IsDir() {
+			if err = os.MkdirAll(fullPath, os.ModePerm); err != nil {
+				return fmt.Errorf("cannot create media dir %s: %w", path, err)
+			}
+			return nil
+		}
+		from, err := ThemeFs.Open(path)
+		if err != nil {
+			return fmt.Errorf("Could not open media file \"%s\" for copying: %w\n", path, err)
+
+		}
+		defer from.Close()
+
+		to, err := os.Create(fullPath)
+		if err != nil {
+			return fmt.Errorf("Could not create destination media file \"%s\" for copying from virtual theme: %w\n", fullPath, err)
+
+		}
+		defer to.Close()
+
+		_, err = io.Copy(to, from)
+		if err != nil {
+			return fmt.Errorf("Could not copy media file from virtual theme source %s to destination: %w\n", path, err)
+
+		}
+
+		index = append(index, path)
+		copiedSourceCounter++
+		return nil
+	}); err != nil {
+		return 0, fmt.Errorf("Could not get media file from virtual theme build: %w\n", err)
+	}
+
+	err := createMediaIndex(buildPath, index)
+	if err != nil {
+		return copiedSourceCounter, err
+	}
+
+	return copiedSourceCounter, nil
+}
+
+func copyMediaFromProject(mediaDir string, buildPath string, copiedSourceCounter int) (int, error) {
+
+	// Exit function if "media/" directory does not exist.
+	if _, err := os.Stat(mediaDir); os.IsNotExist(err) {
+		return 0, fmt.Errorf("%s driectory does not exist: %w", mediaDir, err)
+	}
+
+	// Index of copied media files to list them in media browser
+	var index []string
+
+	err := filepath.WalkDir(mediaDir, func(mediaPath string, mediaFileInfo fs.DirEntry, err error) error {
+		if err != nil {
+			return fmt.Errorf("can't stat %s: %w", mediaPath, err)
+		}
+		destPath := buildPath + "/" + mediaPath
+		if mediaFileInfo.IsDir() {
+			// Make directory if it doesn't exist.
+			// Move on to next path.
+			if err = os.MkdirAll(destPath, os.ModePerm); err != nil {
+				return fmt.Errorf("cannot create media dir %s: %w", mediaPath, err)
+			}
+			return nil
+
+		}
+		from, err := os.Open(mediaPath)
+		if err != nil {
+			return fmt.Errorf("Could not open media file \"%s\" for copying: %w\n", mediaPath, err)
+
+		}
+		defer from.Close()
+
+		to, err := os.Create(destPath)
+		if err != nil {
+			return fmt.Errorf("Could not create destination media file \"%s\" for copying: %w\n", destPath, err)
+
+		}
+		defer to.Close()
+
+		_, err = io.Copy(to, from)
+		if err != nil {
+			return fmt.Errorf("Could not copy media file from source \"%s\" to destination: %w\n", mediaPath, err)
+
+		}
+
+		index = append(index, mediaPath)
+		copiedSourceCounter++
+		return nil
+	})
+	if err != nil {
+		return 0, fmt.Errorf("Could not get media file: %w\n", err)
+	}
+
+	err = createMediaIndex(buildPath, index)
+	if err != nil {
+		return copiedSourceCounter, err
+	}
+
+	return copiedSourceCounter, nil
+}
+
+func createMediaIndex(buildPath string, index []string) error {
+	result, err := json.MarshalIndent(index, "", "\t")
+	if err != nil {
+		return fmt.Errorf("Unable to marshal JSON: %w", err)
+	}
+	result = append(append([]byte("let allMedia = "), result...), []byte(";\nexport default allMedia;")...)
+	err = ioutil.WriteFile(buildPath+"/spa/ejected/cms/media.js", result, os.ModePerm)
+	if err != nil {
+		return fmt.Errorf("Unable to write to media index file: %w\n", err)
+	}
+	return nil
+}