@@ -34,18 +34,18 @@ done
numfiles=0
for filename in *.[jJ][pP][gG]; do
debug && echo -n "$filename: "
- $jhead -autorot $filename 2>/dev/null | grep ^Modified: >/dev/null && echo -n "rotated "
- [[ -s $thumbdir/$filename ]] || $convert -scale x$thumby $filename $thumbdir/$filename || continue
+ $jhead -autorot "$filename" 2>/dev/null | grep ^Modified: >/dev/null && echo -n "rotated "
+ [[ -s $thumbdir/$filename ]] || $convert -scale x$thumby "$filename" "$thumbdir/$filename" || continue
filelist[$numfiles]=$filename
let numfiles++
for res in ${heights[*]}; do
debug && echo -n "$res "
if [[ ! -s .$res/$filename ]]; then
- $convert -scale x$res $filename .$res/$filename
- $fadvise .$res/$filename 2>/dev/null
+ $convert -scale x$res "$filename" ".$res/$filename"
+ $fadvise ".$res/$filename" 2>/dev/null
fi
done
- $fadvise $filename 2>/dev/null
+ $fadvise "$filename" 2>/dev/null
debug && echo
done
@@ -56,7 +56,7 @@ sheet=0 cury=0 curx=0 file=0
while [[ $file -lt $numfiles ]]; do
filename=${filelist[$file]}
thumb=$thumbdir/$filename
- twidth=$($jhead $thumb 2>/dev/null | grep ^Res | awk '{print $3}')
+ twidth=$($jhead "$thumb" 2>/dev/null | awk '($1 == "Resolution") {print $3}')
# generate the thumbnail sheets
if [[ $((curx + twidth)) -gt $sheetx ]]; then
@@ -73,7 +73,7 @@ while [[ $file -lt $numfiles ]]; do
fi
fi
debug && echo -n "$filename "
- $convert +append $tmprow $thumb $tmprow 2>/dev/null
+ $convert +append $tmprow "$thumb" $tmprow 2>/dev/null
# generate the html in .1024/.html/file.jpg.html
for res in ${heights[*]}; do
@@ -81,30 +81,29 @@ while [[ $file -lt $numfiles ]]; do
[[ $file -ne 0 ]] && prev=${filelist[$((file - 1))]}
[[ $file -ne $((numfiles - 1)) ]] && next=${filelist[$((file + 1))]}
htmlfile=.$res/.html/$filename.html
- xsize=$($jhead .$res/$filename 2>/dev/null | grep ^Res | awk '{print $3}')
- cat >$htmlfile <<EOF
+ xsize=$($jhead ".$res/$filename" 2>/dev/null | awk '($1 == "Resolution") {print $3}')
+ cat >"$htmlfile" <<EOF
<html><head><title>$filename</title>
<script language="JavaScript">
prev=new Image();
next=new Image();
function f(){
EOF
- [[ $prev ]] && echo "prev.src='../$prev';" >>$htmlfile
- [[ $next ]] && echo "next.src='../$next';" >>$htmlfile
- cat >>$htmlfile <<EOF
+ [[ $prev ]] && echo "prev.src='../$prev';" >>"$htmlfile"
+ [[ $next ]] && echo "next.src='../$next';" >>"$htmlfile"
+ cat >>"$htmlfile" <<EOF
}
</script></head><body onLoad="f()">
<a href='../../.$res.$index'>^ up to thumbnails ^</a>
EOF
- [[ $prev ]] && echo "<a href=$prev.html><- prev</a> " >>$htmlfile || echo -n "<- prev " >>$htmlfile
- [[ $next ]] && echo "<a href=$next.html>next -></a> " >>$htmlfile || echo -n "next -> " >>$htmlfile
+ [[ $prev ]] && echo "<a href='$prev.html'><- prev</a> " >>"$htmlfile" || echo -n "<- prev " >>"$htmlfile"
+ [[ $next ]] && echo "<a href='$next.html'>next -></a> " >>"$htmlfile" || echo -n "next -> " >>"$htmlfile"
for size in ${heights[*]}; do
[[ $size == $res ]] && echo -n "$size " || echo -n "<a href='../../.$size/.html/$filename.html'>$size</a> "
- done >>$htmlfile
- echo "<p><a href="../../$filename"><img border=0 width=$xsize height=$res src=../$filename></a><p>" >>$htmlfile
- $jhead $filename 2>/dev/null | sed 's/$/<br>/' >>$htmlfile
- echo '<hr><font size="-1">Generated by <a href="http://shapor.com/bashgal">bashgal</a></font></body>' >>$htmlfile
- #generate the 600.index.html
+ done >>"$htmlfile"
+ echo "<p><a href="../../$filename"><img border=0 width=$xsize height=$res src='../$filename'></a><p>" >>"$htmlfile"
+ $jhead "$filename" 2>/dev/null | sed 's/$/<br>/' >>"$htmlfile"
+ echo '<hr><font size="-1">Generated by <a href="http://shapor.com/bashgal">bashgal</a></font></body>' >>"$htmlfile"
echo "<div style='width:${twidth}px'><a href='.$res/.html/$filename.html'><img border=0 alt='$filename' src='$sheetdir/$sheet.jpg' style='left:-${curx}px;top:-${cury}px;position:absolute'></a></div>" >>$tmpindex.$res
done
bashgal
e180c5cdf0033ce91d31d1f74545cbd6d2b68ed9
Shapor Naghibzadeh
shapor@yzf.shapor.com
http://github.com/shapor/bashgal/commit/ae9335edb46d5474d9d27b9cde61f68164d7dd5b
ae9335edb46d5474d9d27b9cde61f68164d7dd5b
2009-03-25T17:31:08-07:00
2009-03-25T17:31:08-07:00
Fix quoting to deal with filenames with space.
Remove spurious historical comment dropping.
Extract resolution from jhead somewhat more intelligently.
3c4b0199c7ca9359d31051c37f9cdd536c142954
Shapor Naghibzadeh
shapor@yzf.shapor.com