From ea7fce79e36db82ba2ce280edb0bba262bdc1872 Mon Sep 17 00:00:00 2001
From: Thomas Reggi <thomas@reggi.com>
Date: Sun, 24 Mar 2024 23:27:07 -0400
Subject: [PATCH] fix pluralization of img outdir

---
 .github/workflows/create-image-shared.yml           |  12 +++---------
 .github/workflows/create-image.yml                  |   2 +-
 packages/image-generator/cli.ts                     |   8 ++++++--
 .../{meetup => meetup-image}/default.png            | Bin
 .../{meetup => meetup-image}/index.json             |   0
 .../{meetup => meetup-image}/template.png           | Bin
 packages/image-generator/package.json               |   2 +-
 7 files changed, 11 insertions(+), 13 deletions(-)
 rename packages/image-generator/{meetup => meetup-image}/default.png (100%)
 rename packages/image-generator/{meetup => meetup-image}/index.json (100%)
 rename packages/image-generator/{meetup => meetup-image}/template.png (100%)

diff --git a/.github/workflows/create-image-shared.yml b/.github/workflows/create-image-shared.yml
index 231af6a..9faaecc 100644
--- a/.github/workflows/create-image-shared.yml
+++ b/.github/workflows/create-image-shared.yml
@@ -8,7 +8,7 @@ on:
         required: true
         type: string
       image:
-        description: 'Image Type (banner, meetup)'
+        description: 'Image Type (banner, meetup-image)'
         default: banner
         type: string
 
@@ -38,18 +38,12 @@ jobs:
           npm i tsx -g
           cd ./packages/image-generator
           npm i
-          cd ../..
-
           IFS=',' read -ra ADDR <<< "${{ inputs.image }}"
           for i in "${ADDR[@]}"; do
             trimmed=$(echo "$i" | xargs) # Trim whitespace
-            # Create directory if it doesn't exist
-            
             echo "$trimmed"
-
-            mkdir -p "./public/${trimmed}"
-            
-            tsx --tsconfig ./packages/image-generator/tsconfig.json ./packages/image-generator/cli.ts --image "${trimmed}" --date ${{ inputs.date }} > "./public/${trimmed}/${{ inputs.date }}.png"
+            mkdir -p "../../public/${trimmed}s"
+            npm run --silent cli -- --image "${trimmed}" --date ${{ inputs.date }} > "../../public/${trimmed}s/${{ inputs.date }}.png"
           done
 
       - name: Generate unique branch name
diff --git a/.github/workflows/create-image.yml b/.github/workflows/create-image.yml
index 6e01a0b..ef119fa 100644
--- a/.github/workflows/create-image.yml
+++ b/.github/workflows/create-image.yml
@@ -7,7 +7,7 @@ on:
         description: 'Event Date (YYYY-MM-DD)'
         required: true
       image:
-        description: 'Image Type (banner, meetup)'
+        description: 'Image Type (banner, meetup-image)'
         default: banner
         type: string
 
diff --git a/packages/image-generator/cli.ts b/packages/image-generator/cli.ts
index f56e8d7..7305645 100644
--- a/packages/image-generator/cli.ts
+++ b/packages/image-generator/cli.ts
@@ -3,7 +3,10 @@ import {buildRelative} from './index'
 
 const program = new Command()
 
-program.option('-i, --image <string>', 'Image path').option('-d, --date <string>', 'Date string')
+program
+.option('-i, --image <string>', 'Image path')
+.option('-d, --date <string>', 'Date string')
+.option('-o, --out <string>', 'Output Path string')
 
 program.parse(process.argv)
 
@@ -11,9 +14,10 @@ const options = program.opts()
 
 const image = options.image && typeof options.image === 'string' ? options.image : null
 const date = options.date && typeof options.date === 'string' ? options.date : null
+const outputPath = options.out && typeof options.out === 'string' ? options.out : null
 
 if (image && date) {
-  buildRelative({image, date})
+  buildRelative({image, date, outputPath})
 } else {
   console.error('Both image and date flags are required.')
   process.exit(1)
diff --git a/packages/image-generator/meetup/default.png b/packages/image-generator/meetup-image/default.png
similarity index 100%
rename from packages/image-generator/meetup/default.png
rename to packages/image-generator/meetup-image/default.png
diff --git a/packages/image-generator/meetup/index.json b/packages/image-generator/meetup-image/index.json
similarity index 100%
rename from packages/image-generator/meetup/index.json
rename to packages/image-generator/meetup-image/index.json
diff --git a/packages/image-generator/meetup/template.png b/packages/image-generator/meetup-image/template.png
similarity index 100%
rename from packages/image-generator/meetup/template.png
rename to packages/image-generator/meetup-image/template.png
diff --git a/packages/image-generator/package.json b/packages/image-generator/package.json
index 1f820db..fe4ea64 100644
--- a/packages/image-generator/package.json
+++ b/packages/image-generator/package.json
@@ -4,7 +4,7 @@
   "description": "",
   "main": "index.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "cli": "tsx --tsconfig ./tsconfig.json ./cli.ts"
   },
   "keywords": [],
   "author": "",