From 5257ca24dc184c3b728c8d28d39cfe18fe79629f Mon Sep 17 00:00:00 2001 From: Matt Way Date: Sun, 11 Aug 2024 21:57:23 +1000 Subject: [PATCH] Add support for passing media data to template --- make-council-pages.sh | 6 +++++- php-template/main.php | 13 +++++++++++-- php-template/page_renderer.php | 2 +- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/make-council-pages.sh b/make-council-pages.sh index c4ca632..07e59e4 100644 --- a/make-council-pages.sh +++ b/make-council-pages.sh @@ -25,7 +25,9 @@ function create_or_update_page() { slug=$(echo "$council_block" | jq -r '.slug') - content=$(echo "$council_block" | jq -c | php php-template/main.php --council-file "php://stdin" --candidates-file "$DATA_PATH/$slug/candidates.csv) + jq -n '[inputs | { (input_filename | sub("\\.json$"; "") | sub("^.+/"; "")): . }] | reduce .[] as $item ({}; . + $item)' "$DATA_PATH"/$slug/*.json > "$DATA_PATH"/$slug/media.json + + content=$(echo "$council_block" | jq -c | php php-template/main.php --council-file "php://stdin" --candidates-file "$DATA_PATH"/$slug/candidates.csv --media-file "$DATA_PATH"/$slug/media.json ) if [ $? -eq 0 ]; then @@ -40,6 +42,8 @@ function create_or_update_page() { else echo "Failed to generate page content for $short_name" fi + + rm "$DATA_PATH"/$slug/media.json } # Read council data diff --git a/php-template/main.php b/php-template/main.php index 8b1df3d..39cec97 100644 --- a/php-template/main.php +++ b/php-template/main.php @@ -1,7 +1,7 @@ renderCouncilPage($councilData, $candidateData); +$pageContent = $renderer->renderCouncilPage($councilData, $candidateData, $mediaData); if ($pageContent === null) { exit(2); } diff --git a/php-template/page_renderer.php b/php-template/page_renderer.php index fb38e54..3a300f7 100644 --- a/php-template/page_renderer.php +++ b/php-template/page_renderer.php @@ -1,7 +1,7 @@