Move http_cache.yml to ./assets/data/cache.yml

Was in ./internal/http_cache.yml, difficult to choose a convential
location. It is data that's used in the build. But it's also modified by
the build.

internal/blog/blog.go

@@ -2,6 +2,7 @@ package blog
 
 import (
 	"context"
+	"fmt"
 	"path/filepath"
 	"strings"
 
@@ -11,6 +12,7 @@ import (
 
 func Write(catalog *rprCatalog.Catalog) ([]*BlogPost, error) {
 	postPaths := utils.Files(".", "assets/blog", func(filePath string) (*string, error) {
+		fmt.Println("Post Path:", filePath)
 		ext := filepath.Ext(filePath)
 		if strings.ToLower(ext) != ".md" {
 			return nil, nil

internal/catalog/asset.go

@@ -112,6 +112,7 @@ type AssetFrontMatter struct {
 }
 
 func NewAsset(assetPath string, markdownParser goldmark.Markdown, httpCache *cache.HTTPCache, avatarPaths *AvatarPaths) (*Asset, error) {
+	fmt.Println("new asset: " + assetPath)
 	fileName := filepath.Base(assetPath)
 	fileStem := strings.TrimSuffix(fileName, filepath.Ext(assetPath))
 
@@ -122,6 +123,7 @@ func NewAsset(assetPath string, markdownParser goldmark.Markdown, httpCache *cac
 
 	// 🔗 Details
 
+	fmt.Println("File stem: ", fileStem)
 	id := fileStem[11:]
 	urlAbsPath := "/" + id
 	editPermalink := global.GITHUB_LINK + path.Join("/edit/main", assetPath)

internal/catalog/catalog.go

@@ -41,7 +41,7 @@ func NewCatalog(assetsPath string) *Catalog {
 
 	// 📶 Get HTTP Cache from file
 
-	cacheData, err := cache.DataFromYAMLFile("./internal/http_cache.yml")
+	cacheData, err := cache.DataFromYAMLFile(global.CACHE_PATH)
 	if err != nil {
 		log.Panicf("Failed to read cache file '%v': %v", global.CACHE_PATH, err)
 	}

internal/global/global.go

@@ -6,7 +6,7 @@ import (
 
 const BUILD_OUTPUT = "./build"
 const ASSETS = "./assets"
-const CACHE_PATH = "./internal/http_cache.yml"
+const CACHE_PATH = "./assets/data/cache.yml"
 
 const GITHUB_LINK = "https://github.com/marcuswhybrow/ray-peat-rodeo"
 const SPONSOR_LINK = "https://github.com/sponsors/marcuswhybrow"

internal/utils/filesystem.go

@@ -1,7 +1,6 @@
 package utils
 
 import (
-	"fmt"
 	"io/fs"
 	"log"
 	"os"
@@ -16,27 +15,24 @@ import (
 func Files[Result any](pwd, scope string, f func(filePath string) (*Result, error)) []Result {
 	results := []Result{}
 
-	err := fs.WalkDir(os.DirFS(pwd), scope, func(filePath string, entry fs.DirEntry, err error) error {
-		if err != nil {
-			return fmt.Errorf("Failed to walk dir: %v", err)
-		}
-
-		if !entry.IsDir() {
-			result, err := f(filePath)
-			if err != nil {
-				return err
-			}
+	entries, err := fs.ReadDir(os.DirFS(pwd), scope)
+	if err != nil {
+		log.Fatalf("Failed to read directory '%v': %v\n", path.Join(pwd, scope), err)
+	}
 
-			if result != nil {
-				results = append(results, *result)
-			}
+	for _, entry := range entries {
+		if entry.IsDir() {
+			continue
 		}
 
-		return nil
-	})
+		result, err := f(path.Join(scope, entry.Name()))
+		if err != nil {
+			log.Fatal("Failed to convert file entry to Result:", err)
+		}
 
-	if err != nil {
-		log.Panicf("Failed to read directory '%v': %v", path.Join(pwd, scope), err)
+		if result != nil {
+			results = append(results, *result)
+		}
 	}
 
 	return results