correctly handle space in filesane

This commit is contained in:
Guillaume Castagnino 2020-03-18 15:31:44 +01:00
parent b30d7bc733
commit 69d87e9dd8
3 changed files with 18 additions and 14 deletions

View File

@ -151,6 +151,7 @@ do
;; ;;
esac esac
done done
shift "$((OPTIND-1))"
if [ "x${TITLE}" != "x" ] if [ "x${TITLE}" != "x" ]
then then
@ -196,18 +197,18 @@ add_file()
g_files+=("${file}") g_files+=("${file}")
} }
for rsrc in `seq $OPTIND $#` for rsrc in "$@"
do do
if [ -f "${!rsrc}" ] if [ -f "${rsrc}" ]
then then
add_file ${!rsrc} add_file "${rsrc}"
elif [ -d "${!rsrc}" ] elif [ -d "${rsrc}" ]
then then
echo "Recursing into '${!rsrc}'" echo "Recursing into '${rsrc}'"
while read file while read file
do do
add_file ${file} add_file ${file}
done < <(find "${!rsrc}" -type f | sort) done < <(find "${rsrc}" -type f | sort)
fi fi
done done

View File

@ -87,17 +87,18 @@ do
;; ;;
esac esac
done done
shift "$((OPTIND-1))"
echo "Output size set to ${size}" echo "Output size set to ${size}"
echo "Output jpeg quality set to ${quality}" echo "Output jpeg quality set to ${quality}"
for img in `seq $OPTIND $#` for img in "$@"
do do
if [ -f "${!img}" ] if [ -f "${img}" ]
then then
prepare "${!img}" $size $border $sign $quality prepare "${img}" $size $border $sign $quality
else else
echo "warning : ${!img} does not exists" echo "warning : ${img} does not exists"
fi fi
done done

View File

@ -29,14 +29,16 @@ do
;; ;;
esac esac
done done
shift "$((OPTIND-1))"
count=0 count=0
intput="" intput=()
vids="" vids=""
concat="" concat=""
for arg in `seq $OPTIND $#` for arg in "$@"
do do
input="$input -i ${!arg}" input[$((2*$count))]="-i"
input[$((2*$count+1))]=${arg}
if [ x"$scale" != x"" ] ; then if [ x"$scale" != x"" ] ; then
vids="$vids [$count:v:0] scale=$scale:$scale:force_original_aspect_ratio=decrease [v$count] ;" vids="$vids [$count:v:0] scale=$scale:$scale:force_original_aspect_ratio=decrease [v$count] ;"
concat="$concat [v$count] [$count:a:0]" concat="$concat [v$count] [$count:a:0]"
@ -50,5 +52,5 @@ if [ x"$rate" != x"" ] ; then
rate="-r $rate" rate="-r $rate"
fi fi
ffmpeg "$input" -filter_complex "$filter" -map "[v]" -map "[a]" $rate -c:v libx264 -preset medium -crf $crf -c:a libfdk_aac -b:a 128k -map_metadata 0:g "$output" ffmpeg "${input[@]}" -filter_complex "$filter" -map "[v]" -map "[a]" $rate -c:v libx264 -preset medium -crf $crf -c:a libfdk_aac -b:a 128k -map_metadata 0:g "$output"
# for i in *.mov ; do ~/scripts/video-convert.sh -o ${i/mov/mkv} $i ; done # for i in *.mov ; do ~/scripts/video-convert.sh -o ${i/mov/mkv} $i ; done