From 6aca0bc03960e8d520a7c707bf542716e181f625 Mon Sep 17 00:00:00 2001 From: Matt Way Date: Wed, 4 Sep 2024 20:19:12 +1000 Subject: [PATCH] Check multiple potential input filenames in csv-normaliser --- csv-normaliser/main.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/csv-normaliser/main.php b/csv-normaliser/main.php index fbe941c..5f01eaf 100644 --- a/csv-normaliser/main.php +++ b/csv-normaliser/main.php @@ -4,13 +4,15 @@ $options = getopt("", ["folder:", "input:", "output:", "media:"]); if (isset($options['folder'])) { $folder = $options['folder']; if (is_dir($folder)) { - $expectedInputFileName = str_replace("-", " ", strtoupper(basename($folder))) . ".csv"; + $expectedInputFileNames = []; + $expectedInputFileNames[] = str_replace("-", " ", strtoupper(basename($folder))) . ".csv"; + $expectedInputFileNames[] = strtoupper(basename($folder)) . ".csv"; if (!isset($options['input'])) { - $expectedInputFile = $folder . DIRECTORY_SEPARATOR . $expectedInputFileName; - if (is_file($expectedInputFile)) { - $options['input'] = $expectedInputFile; - } else { - error_log("Couldn't find " . $expectedInputFile . "\n"); + foreach ($expectedInputFileNames as $expectedInputFileName) { + $expectedInputFile = $folder . DIRECTORY_SEPARATOR . $expectedInputFileName; + if (is_file($expectedInputFile)) { + $options['input'] = $expectedInputFile; + } } } if (!isset($options['output'])) {