Multi-threaded renderer implemented successfully. Better error handling. Minor changes in multiple areas

1 files changed, 18 insertions, 8 deletions

diff --git a/stylize.sh b/stylize.sh
index 434c079..ac9beba 100755
--- a/stylize.sh
+++ b/stylize.sh
@@ -1,25 +1,35 @@
-#!/bin/zsh
+#!/bin/bash
 
 ### You must be in the 'neural-art' directory when you run this
 
-if [ $# -eq 0 ]
-  then
+cwd=$(pwd | sed -r 's%.*/%%g')
+if [ $cwd != "neural-art" ] ; then
+    echo "You must be in the 'neural-art' directory when you run this"
+    exit 1
+fi
+
+if [ $# -eq 0 ] ; then
     echo "Style Image and Content Image need to be specified as arguments"
     echo "Example: ./stylize.sh Images/Jitter_Doll.jpg Images/cute.jpg"
     exit 1
 fi
 
-if [ $# -eq 1 ]
-  then
-    echo "Content image needs to be specified"
+if [ $# -eq 1 ] ; then
+    echo "Content image needs to be specified as well"
+    echo "Example: ./stylize.sh Images/Jitter_Doll.jpg Images/cute.jpg"
     exit 1
 fi
 
+./clear_dir.sh
+
 # stylize data [pair (style, content)]
 python neuralart.py $1 $2
 
 # render images (actual frames) from (an) images.npy
-python renderer.py $1 $2
+python renderer.py
+
+# render fix
+python renderer.py --fix
 
 # turn everything into a video
-ffmpeg -framerate 60 -pattern_type glob -i 'Output/neural_art_*.png' -vf "pad=ceil(iw/2)*2:ceil(ih/2)*2" ${${2/*\/}/.*}_in_${${1/*\/}/.*}.mp4
+ffmpeg -framerate 60 -pattern_type glob -i 'Output/neural_art_*.png' -vf "pad=ceil(iw/2)*2:ceil(ih/2)*2" $(basename ${2%.*})'_in_'$(basename ${1%.*})'.mp4'