output option is now optional

Author: linalinn

Dockerfile

@@ -13,4 +13,6 @@ COPY *.sh /usr/bin/
 
 RUN sudo chmod a+rx /usr/bin/render-pcb.sh && sudo chmod a+rx /usr/bin/kicad_animation.sh
 
-USER root
+USER root
+
+WORKDIR /pwd

kicad_animation.sh

@@ -4,6 +4,26 @@
 # Original by: arturo182
 # gist: https://gist.github.com/arturo182/57ab066e6a4a36ee22979063e4d5cce1
 #
+
+extract_project_name() {
+  echo "$1" | rev | cut -d '/' -f 1 | rev | sed -e "s/.kicad_pcb//g"
+}
+
+extract_output_path() {
+  echo "$1" | sed -e "s/[^\/]*\.kicad_pcb//g"
+}
+
+OUTPUT_FILE=""
+
+if [[ -z "$3" ]]; then
+    path=$(extract_output_path "$2")
+    name=$(extract_project_name "$2")
+    OUTPUT_FILE="${path}${name}"
+    echo "OUTPUT_FILE: $OUTPUT_FILE"
+else
+    OUTPUT_FILE="$3/rotating"
+fi
+
 FORMAT="$1"
 OUTPUT_DIR="${3:-/pwd}"
 FRAME_DIR="/tmp/render"
@@ -27,17 +47,17 @@ for ((i = 0; i < FRAMES; i++)); do
     ROTATE_Y=-$(($i * STEP))
     OUTPUT_PATH="$FRAME_DIR/frame$i.png"
     echo "Rendering frame $i ($ROTATE_Y degrees) to $OUTPUT_PATH"
-    $KICAD_CLI pcb render --rotate "$ROTATE_X,$ROTATE_Y,$ROTATE_Z" --zoom $ZOOM -w $WIDTH -h $HEIGHT --background opaque -o $OUTPUT_PATH $INPUT_FILE > /dev/null
+    $KICAD_CLI pcb render --rotate "$ROTATE_X,$ROTATE_Y,$ROTATE_Z" --zoom $ZOOM -w $WIDTH -h $HEIGHT --background opaque -o $OUTPUT_PATH "$INPUT_FILE" > /dev/null
 done
 
 # Combine frames into an MP4 with the specified framerate
 if [[ $FORMAT == "mp4" ]]; then
     echo "Combining frames into an MP4..."
-    ffmpeg -y -framerate $FRAMERATE -i "$FRAME_DIR/frame%d.png" -c:v libx264 -r 30 -pix_fmt yuv420p "$OUTPUT_DIR/rotating.mp4"
+    ffmpeg -y -framerate $FRAMERATE -i "$FRAME_DIR/frame%d.png" -c:v libx264 -r 30 -pix_fmt yuv420p "$OUTPUT_FILE.mp4"
     echo "MP4 created successfully."
 elif [[ $FORMAT == "gif" ]]; then
     echo "Combining frames into an GIF..."
-    ffmpeg -y -framerate $FRAMERATE -i "$FRAME_DIR/frame%d.png" "$OUTPUT_DIR/rotating.gif"
+    ffmpeg -y -framerate $FRAMERATE -i "$FRAME_DIR/frame%d.png" "$OUTPUT_FILE.gif"
     echo "GIF created successfully."
 else
     # TODO: this should be vaildated before rendering anything

render-pcb.sh

@@ -15,7 +15,14 @@ help() {
     exit
 }
 
-output_path="/pwd"
+extract_project_name() {
+  echo "$1" | rev | cut -d '/' -f 1 | rev | sed -e "s/.kicad_pcb//g"
+}
+
+extract_output_path() {
+  echo "$1" | sed -e 's/[^\/]*\.kicad_pcb//g'
+}
+
 background="transparent"
 
 while getopts :f:o:a:b:hv option
@@ -37,27 +44,37 @@ if [[ -z "$kicad_pcb" ]]; then
     help
 fi
 
-if [[ -n "$animation" ]]; then
-    if [ "$animation" != "gif" ] -a [[ "$animation" != "mp4" ]]; then
-        help
-    fi
+if [[ -z "$output_path" ]]; then
+    path=$(extract_output_path "$2")
+    name=$(extract_project_name "$2")
+    echo "name: $name"
+    echo "path: $path"
+    output_path="$path"
+    output_top="${path}${name}_top.png"
+    output_bottom="${path}${name}_bottom.png"
+    echo "output_top: $output_top"
+    echo "output_bottom: $output_bottom"
+else
+    output_top="$output_path/top.png"
+    output_bottom="$output_path/bottom.png"
+    output_animation="$output_path"
 fi
 
 
-
 KICAD_CLI=$(which kicad-cli || which kicad-cli-nightly)
 
 echo "$output_path"
 
 mkdir -p "$output_path"
+
 echo "rendering top"
-$KICAD_CLI pcb render --side top --background $background -o "$output_path/top.png" "$kicad_pcb"
+$KICAD_CLI pcb render --side top --background $background -o "$output_top" "$kicad_pcb"
 echo "rendering bottom"
-$KICAD_CLI pcb render --side bottom --background $background -o "$output_path/bottom.png" "$kicad_pcb"
+$KICAD_CLI pcb render --side bottom --background $background -o "$output_bottom" "$kicad_pcb"
 
 if [[ -n "$animation" ]]; then
     echo "rendering animation"
-    kicad_animation.sh $animation "$kicad_pcb" "$output_path"
+    kicad_animation.sh $animation "$kicad_pcb" "$output_animation"
 fi
 
 ls "$output_path"