X-Git-Url: http://www.average.org/gitweb/?p=mkgallery.git;a=blobdiff_plain;f=mkgallery.pl;h=385342ca0bcfa9b10dc13577fe7e186a0601c57d;hp=7f54b01786aa1ebef323bf1fe7b0ed652d492a82;hb=8d5a6921d193300a214cdc2c455f25363f960725;hpb=d104afdbde8eba624eebe78225833016121f7b22

diff --git a/mkgallery.pl b/mkgallery.pl
index 7f54b01..385342c 100755
--- a/mkgallery.pl
+++ b/mkgallery.pl
@@ -130,29 +130,72 @@ sub iterate {
 	my @imglist = sort {$a->{-base} cmp $b->{-base}} @rimglist;
 	undef @rimglist; # optimize away unsorted versions
 
+	print "Dir: $self->{-fullpath}\n" if ($debug);
+
 # 1. first of all, fill title for this directory and create hidden subdirs
 
 	$self->initdir;
 
-# 2. iterate through subdirectories to get their titles filled
+# 2. recurse into subdirectories to get their titles filled
 #    before we start writing out subalbum list
 
 	foreach my $dir(@dirlist) {
-		print "Dir: $dir->{-fullpath}\n" if ($debug);
 		$dir->iterate;
 	}
 
-# 3. start building index.html for the directory
-# 4. iterate through subdirectories to build subalbums list
-# 5. iterate through images to build cross-links
+# 3. iterate through images to build cross-links,
+
+	my $previmg = undef;
+	foreach my $img(@imglist) {
+		# list-linking must be done before generating
+		# aux html because aux pages rely on prev/next refs
+		if ($previmg) {
+			$previmg->{-nextimg} = $img;
+			$img->{-previmg} = $previmg;
+		}
+		$previmg=$img;
+	}
+
+# 4. create scaled versions and aux html pages
 
 	foreach my $img(@imglist) {
-		print "Img: $img->{-fullpath}\n" if ($debug);
+		# scaled versions must be generated before aux html
+		# and main image index because they both rely on
+		# refs to scaled images and they may be just original
+		# images, this is not known before we try scaling.
+		$img->makescaled;
+		# finally, make aux html pages
+		$img->makeaux;
 	}
 
-# 6. iterate through images to build thumb list and aux html files
-# 7. comlplete building index.html for the directory
+# 5. start building index.html for the directory
+
+	$self->startindex;
+
+# 6. iterate through subdirectories to build subalbums list
+
+	if (@dirlist) {
+		$self->startsublist;
+		foreach my $dir(@dirlist) {
+			$dir->sub_entry;
+		}
+		$self->endsublist;
+	}
 
+# 7. iterate through images to build thumb list
+
+	if (@imglist) {
+		$self->startimglist;
+		foreach my $img(@imglist) {
+			print "Img: $img->{-fullpath}\n" if ($debug);
+			$img->img_entry;
+		}
+		$self->endimglist;
+	}
+
+# 8. comlplete building index.html for the directory
+
+	$self->endindex;
 }
 
 sub isdir {
@@ -210,12 +253,200 @@ sub edittitle {
 		}
 	}
 	unless ($title) {
-		$title=substr($fullpath,length($self->{-root}))
+		$title=substr($fullpath,length($self->{-root}));
 	}
 	$self->{-title}=$title;
 	print "title in $fullpath is $title\n" if ($debug);
 }
 
+sub makescaled {
+	my $self = shift;
+	my $fn = $self->{-fullpath};
+	my $name = $self->{-base};
+	my $dn = $self->{-parent}->{-fullpath};
+	my ($w, $h) = dim($self->{-info});
+	my $max = ($w > $h)?$w:$h;
+
+	foreach my $size(@sizes) {
+		my $nref = '.'.$size.'/'.$name;
+		my $nfn = $dn.'/'.$nref;
+		my $factor=$size/$max;
+		if ($factor >= 1) {
+			$self->{$size} = $name;	# unscaled version will do
+		} else {
+			$self->{$size} = $nref;
+			if (isnewer($fn,$nfn)) {
+				doscaling($fn,$nfn,$factor,$w,$h);
+			}
+		}
+	}
+}
+
+sub isnewer {
+	my ($fn1,$fn2) = @_;			# this is not a method
+	my @stat1=stat($fn1);
+	my @stat2=stat($fn2);
+	return (!@stat2 || ($stat1[9] > $stat2[9]));
+	# true if $fn2 is absent or is older than $fn1
+}
+
+sub doscaling {
+	my ($src,$dest,$factor,$w,$h) = @_;	# this is not a method
+	my $im = new Image::Magick;
+	my $err;
+	print "doscaling $src -> $dest by $factor\n" if ($debug);
+	$err = $im->Read($src);
+	unless ($err) {
+		$im->Scale(width=>$w*$factor,height=>$h*$factor);
+		$err=$im->Write($dest);
+		warn "ImageMagick: write \"$dest\": $err" if ($err);
+	} else {	# fallback to command-line tools
+		warn "ImageMagick: read \"$src\": $err";
+		system("djpeg \"$src\" | pnmscale \"$factor\" | cjpeg >\"$dest\"");
+	}
+	undef $im;
+}
+
+sub makeaux {
+	my $self = shift;
+	my $name = $self->{-base};
+	my $dn = $self->{-parent}->{-fullpath};
+	my $pref = $self->{-previmg}->{-base};
+	my $nref = $self->{-nextimg}->{-base};
+	my $inc = $self->{-inc};
+	my $title = $self->{-info}->{'Comment'};
+	$title = $name unless ($title);
+
+	print "slide: \"$pref\"->\"$name\"->\"$nref\"\n" if ($debug);
+
+	# slideshow
+	for my $refresh('static', 'slide') {
+		my $fn = sprintf("%s/.html/%s-%s.html",$dn,$name,$refresh);
+		my $bakref = sprintf("%s-%s.html",$pref,$refresh);
+		my $fwdref = sprintf("%s-%s.html",$nref,$refresh);
+		my $imgsrc = sprintf("../.%s/%s",$sizes[1],$name);
+		my $toggleref;
+		my $toggletext;
+		if ($refresh eq 'slide') {
+			$toggleref=sprintf("%s-static.html",$name);
+			$toggletext = 'Stop!';
+		} else {
+			$toggleref=sprintf("%s-slide.html",$name);
+			$toggletext = 'Play->';
+		}
+		my $F;
+		unless (open($F,'>'.$fn)) {
+			warn "cannot open \"$fn\": $!";
+			next;
+		}
+		if ($refresh eq 'slide') {
+			print $F start_html(-title=>$title,
+					-bgcolor=>"#808080",
+					-head=>meta({-http_equiv=>'Refresh',
+						-content=>"3; url=$fwdref"}),
+					-style=>{-src=>$inc."gallery.css"},
+				),"\n";
+					
+		} else {
+			print $F start_html(-title=>$title,
+					-bgcolor=>"#808080",
+					-style=>{-src=>$inc."gallery.css"},
+				),"\n";
+		}
+		print $F start_center,"\n",
+			h1($title),
+			a({-href=>"../index.html"},"Index")," | ",
+			a({-href=>$bakref},"<<Prev")," | ",
+			a({-href=>$toggleref},$toggletext)," | ",
+			a({-href=>$fwdref},"Next>>"),
+			p,
+			img({-src=>$imgsrc}),"\n",
+			end_center,"\n",
+			end_html,"\n";
+		close($F);
+	}
+}
+
+sub startindex {
+	my $self = shift;
+	my $fn = $self->{-fullpath}.'/index.html';
+	my $IND;
+	unless (open($IND,'>'.$fn)) {
+		warn "cannot open $fn: $!";
+		return;
+	}
+	$self->{-IND} = $IND;
+
+	my $inc = $self->{-inc};
+	my $title = $self->{-title};
+	print $IND start_html(-title => $title,
+			-style=>{-src=>[$inc."gallery.css",
+					$inc."lightbox.css"]},
+			-script=>[{-code=>"var incPrefix='$inc';"},
+				{-src=>$inc."gallery.js"},
+				{-src=>$inc."lightbox.js"}]),
+		a({-href=>"../index.html"},"UP"),"\n",
+		start_center,"\n",
+		h1($title),"\n",
+		"\n";
+}
+
+sub endindex {
+	my $self = shift;
+	my $IND = $self->{-IND};
+
+	print $IND end_center,end_html,"\n";
+
+	close($IND) if ($IND);
+	undef $self->{-IND};
+}
+
+sub startsublist {
+	my $self = shift;
+	my $IND = $self->{-IND};
+
+	print $IND h2("Albums"),"\n",start_table,"\n";
+}
+
+sub sub_entry {
+	my $self = shift;
+	my $IND = $self->{-parent}->{-IND};
+	my $name = $self->{-base};
+	my $title = $self->{-title};
+
+	print $IND Tr(td(a({-href=>$name.'/index.html'},$name)),
+			td(a({-href=>$name.'/index.html'},$title))),"\n";
+}
+
+sub endsublist {
+	my $self = shift;
+	my $IND = $self->{-IND};
+
+	print $IND end_table,"\n",br({-clear=>'all'}),hr,"\n\n";
+}
+
+sub startimglist {
+	my $self = shift;
+	my $IND = $self->{-IND};
+
+	print $IND h2("Images"),"\n";
+}
+
+sub img_entry {
+	my $self = shift;
+	my $IND = $self->{-parent}->{-IND};
+	my $name = $self->{-base};
+
+	print $IND a({-href=>$name},$name),"\n";
+}
+
+sub endimglist {
+	my $self = shift;
+	my $IND = $self->{-IND};
+
+	print $IND br({-clear=>'all'}),hr,"\n\n";
+}
+
 ######################################################################
 =cut
 ######################################################################
@@ -265,7 +496,6 @@ sub processdir {
 
 # write HTML header
 
-	print start_html(-title => $title,
 			-style=>{-src=>[$inc."gallery.css",
 					$inc."lightbox.css"]},
 			-script=>[{-code=>"var incPrefix='$inc';"},