From 0f89ddf779ce9340d2ec08db0353f0a3d33f81cd Mon Sep 17 00:00:00 2001
From: Kim Taylor <kmtaylor@gmx.com>
Date: Tue, 17 Sep 2024 21:19:26 +1000
Subject: [PATCH] Use pledges.csv files as override of candidates.csv files.

---
 pledge-update/main.php | 20 +++++++++++---------
 update-pledges.sh      |  8 ++++----
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/pledge-update/main.php b/pledge-update/main.php
index 594084c..b9efc7c 100644
--- a/pledge-update/main.php
+++ b/pledge-update/main.php
@@ -1,15 +1,15 @@
 <?php
 
-$options = getopt("", ["pledges-files:"]);
+$options = getopt("", ["candidates-files:"]);
 
-if (isset($options['pledges-files'])) {
-    $pledges_files = $options['pledges-files'];
+if (isset($options['candidates-files'])) {
+    $candidates_files = $options['candidates-files'];
 } else {
-    error_log("Error: Missing required option '--pledges-files'.");
+    error_log("Error: Missing required option '--candidates-files'.");
     exit(1);
 }
 
-$files = explode(" ", $pledges_files);
+$files = explode(" ", $candidates_files);
 
 $candidate_data = [];
 foreach ($files as $key => $file) {
@@ -23,9 +23,7 @@ foreach ($files as $key => $file) {
         exit(1);
     }
 
-    $candidate_file = dirname($file)."/candidates.csv";
-
-    if (($handle = fopen($candidate_file, "r")) !== FALSE) {
+    if (($handle = fopen($file, "r")) !== FALSE) {
         $headers = fgetcsv($handle);
         while (($data = fgetcsv($handle)) !== FALSE) {
             $candidate = [];
@@ -43,7 +41,11 @@ foreach ($files as $key => $file) {
         exit(1);
     }
 
-    if (($handle = fopen($file, "r")) !== FALSE) {
+    $pledges_file = dirname($file)."/pledges.csv";
+
+    if (!file_exists($pledges_file)) continue;
+
+    if (($handle = fopen($pledges_file, "r")) !== FALSE) {
         $headers = fgetcsv($handle);
         while (($data = fgetcsv($handle)) !== FALSE) {
             $candidate = [];
diff --git a/update-pledges.sh b/update-pledges.sh
index 9283f8a..7385994 100755
--- a/update-pledges.sh
+++ b/update-pledges.sh
@@ -13,14 +13,14 @@
 
 DATA_PATH="../spl-data"
 
-pledges_files=()
+candidates_files=()
 for folder in "$DATA_PATH"/*; do
-    if test -f "$folder"/pledges.csv; then
-        pledges_files+=("$folder"/pledges.csv)
+    if test -f "$folder"/candidates.csv; then
+        candidates_files+=("$folder"/candidates.csv)
     fi
 done
 
-pledge_sed=$(php pledge-update/main.php --pledges-files "${pledges_files[*]}")
+pledge_sed=$(php pledge-update/main.php --candidates-files "${candidates_files[*]}")
 
 content=$(sed "$pledge_sed" ../spl-data/movie-homepage)