Rework gallery build

1 files changed, 12 insertions, 16 deletions

diff --git a/build.js b/build.js
index c3d371c..af21c39 100644
--- a/build.js
+++ b/build.js
@@ -17,39 +17,35 @@ function transpose(matrix) {
     return matrix[0].map((col, i) => matrix.map(row => row[i]));

 }

 

-const GALLERY_DIR = "_gallery";

 const SITE_CONFIG_DIR = "_configuration";

 const SRC_DIR = "src";

 const DIST_DIR = "dist";

 const HTML_TEMP_PATH = path.join(SRC_DIR, "index.html.mustache");

 const HTML_OUT_PATH = path.join(DIST_DIR, "index.html");

 const CONTACT_INFO_PATH = path.join(SITE_CONFIG_DIR, "contact_info.json");

+const GALLERIES_PATH = path.join(SITE_CONFIG_DIR, "galleries.json");

 

 fs.rmSync(DIST_DIR, { recursive: true, force: true });

 fs.cpSync(SRC_DIR, DIST_DIR, { recursive: true });

 

 const htmlTemplate = fs.readFileSync(HTML_TEMP_PATH, "utf-8");

 

-let galleryJsonList = [];

-try {

-    galleryJsonList = fs.readdirSync(GALLERY_DIR);

-} catch (err) {

-    if (err.message?.includes("ENOENT")) {

-        console.warn("Could not read galleries, using empty list.");

-    } else {

-        throw err;

-    }

-}

-

-const galleryViews = galleryJsonList

-    .map((fileName) => fs.readFileSync(path.join(GALLERY_DIR, fileName), "utf-8"))

-    .map(JSON.parse)

+const galleriesJson = fs.readFileSync(GALLERIES_PATH, "utf-8");

+const galleriesView = JSON.parse(galleriesJson)

+const galleryViews = galleriesView["galleries"]

     .map((gallery) => {

         // If display_title is "-", do not render a title. Netlify CMS doesn't support optionals well.

         const display_title = gallery["display_title"].trim() !== "-"

             ? gallery["display_title"]

             : undefined;

-        const rows = sliceIntoChunks(gallery["images"], gallery["column_count"]);

+

+        const images = gallery["images"];

+        const columnCount = gallery["column_count"];

+        while (images.length < columnCount) {

+            images.push(null);

+        }

+

+        const rows = sliceIntoChunks(images, columnCount);

         const columns = transpose(rows);

         return {

             ...gallery,