Rely on make(1)

tngen

@@ -4,15 +4,15 @@ set -e
 
 usage()
 {
-    echo "$0 [-s <size>] [-h] -d <dir> <path>"
+	echo "$0 [-s <size>] [-j <jobs>] [-h] <path>"
 }
 
 SIZE=96
 
-while getopts s:d:h arg
+while getopts j:s:h arg
 do
 	case $arg in
-    d) DIR="$OPTARG"
+	j) JOBS="$OPTARG"
 	;;
 	s) SIZE="$OPTARG"
 	;;
@@ -25,12 +25,6 @@ do
 	esac
 done
 
-if [ -z "$DIR" ]
-then
-    usage >&2
-    exit 1
-fi
-
 shift $(($OPTIND - 1))
 
 if [ $# != 1 ]; then
@@ -38,7 +32,7 @@ if [ $# != 1 ]; then
 	exit 1
 fi
 
-F="$1"
+DIR="$1"
 
 gen()
 {
@@ -61,16 +55,81 @@ gen()
 	fi
 }
 
-while read f; do
+scan()
-    if [ "$f" != "" ]
+{
+	while read d
+	do
+		if [ -n "$d" ]
 		then
-        THUMBNAIL=$(echo "$f" | sed "s,$DIR/user/,$DIR/thumbnails/,")
+			scan "$d"
-        gen "$f" "$THUMBNAIL"
 		fi
-done <<-EOF
+
-    $(find "$F" -type f \
+		TDIR="$(echo "$1" | sed "s,$DIR/user,$DIR/thumbnails,")"
+
+		eval find \"$1\"/* -prune >/dev/null || return 0
+
+		mkdir -p "$TDIR"
+
+		MK="$(echo "$TDIR/Makefile")"
+
+		cat <<-"EOF" > "$MK"
+			.POSIX:
+		EOF
+
+		echo "DIRS=\\" >> "$MK"
+
+		eval find \"$TDIR\"/* -prune -type d > "$TDIR/.dirs"
+
+		while read dir
+		do
+			D="$(echo "$dir" | sed "s, ,\\\\ ,g")"
+			echo "$D \\" >> "$MK"
+		done < "$TDIR/.dirs"
+
+		echo >> "$MK"
+
+		echo "DEPS=\\" >> "$MK"
+
+		eval find \"$1\"/* -prune -type f \
 				-a -iname '*.jpeg' \
 				-o -iname '*.jpg' \
 				-o -iname '*.png' \
-        -o -iname '*.jpeg')
+				-o -iname '*.jpeg' > "$TDIR/.files"
-EOF
+
+		while read f
+		do
+			THUMBNAIL="$(echo "$f" | sed "s,$DIR/user/,$DIR/thumbnails/," \
+				| sed "s, ,\\\\ ,g")"
+			echo "$THUMBNAIL \\" >> "$MK"
+		done < "$TDIR/.files"
+
+		echo >> "$MK"
+		echo 'all: $(DEPS) $(DIRS)' >> "$MK"
+		echo 'FORCE:' >> "$MK"
+
+		while read dir
+		do
+			D="$(echo "$dir" | sed "s, ,\\\\ ,g")"
+			echo "$D: FORCE" >> "$MK"
+			printf '\t+cd $@ && $(MAKE)\n' >> "$MK"
+		done < "$TDIR/.dirs"
+
+		while read f
+		do
+			THUMBNAIL="$(echo "$f" | sed "s,$DIR/user/,$DIR/thumbnails/," \
+				| sed "s, ,\\\\ ,g")"
+			EF=$(echo "$f" | sed "s, ,\\\\ ,g")
+			echo $THUMBNAIL: $EF >> "$MK"
+			printf '\tconvert -thumbnail x%d "$<" "$@" || :\n' $SIZE >> "$MK"
+		done < "$TDIR/.files"
+
+		echo "Successfully generated $MK"
+	done <<-EOF
+		$(eval find \"$1\"/* -prune -type d || return 0)
+	EOF
+}
+
+echo Generating Makefiles...
+scan "$DIR/user"
+
+cd "$DIR/thumbnails" && make ${JOBS:+-j$JOBS}

watchdir

@@ -2,15 +2,17 @@
 
 usage()
 {
-    echo "$0 [-s <size>] [-r] [-h] [-d <subdir>] <dir>"
+	echo "$0 [-s <size>] [-r] [-h] [-j <jobs>] <dir>"
 }
 
 REGEN=0
 SIZE=96
 
-while getopts rs:d:h arg
+while getopts rj:s:h arg
 do
 	case $arg in
+	j) JOBS="$OPTARG"
+	;;
 	r) REGEN=1
 	;;
 	s) SIZE="$OPTARG"
@@ -18,8 +20,6 @@ do
 	h) usage
 		exit 0
 	;;
-    d) SUBDIR="$OPTARG"
-    ;;
 	?) usage >&2
 		exit 1
 	;;
@@ -37,16 +37,15 @@ DIR="$1"
 
 [ "$REGEN" -eq 1 ] && "$(dirname $0)/tngen" \
 	${SIZE:+-s$SIZE} \
-    -d "$DIR" \
+	${JOBS:+-j$JOBS} \
-    "$DIR/user"
+	"$DIR"
 
 while :
 do
 	F="$(inotifywait -e modify,move,create,delete \
 		--format "%w%f" -qr "$DIR/user/")"
-    sleep 1 # TODO: revisit this
 	"$(dirname $0)/tngen" \
 		${SIZE:+-s$SIZE} \
-        -d "$DIR" \
+		${JOBS:+-j$JOBS} \
-        "$F"
+		"$DIR"
 done