X-Git-Url: http://www.average.org/gitweb/?p=mkgallery.git;a=blobdiff_plain;f=mkgallery.pl;h=6b3febe6c8a3adfd40aa75859d6b4a4cd8875f7d;hp=452d5da27f5520d55bc430cc09483595b2e1c524;hb=b9bad7137ebc39fc083b04b3a17db5555f6b6f22;hpb=b2efb46c666138f42ddbe261a8188eaf43e689da

diff --git a/mkgallery.pl b/mkgallery.pl
index 452d5da..6b3febe 100755
--- a/mkgallery.pl
+++ b/mkgallery.pl
@@ -1,12 +1,12 @@
 #!/usr/bin/perl
 
-# $Id$
+my $version='$Id$';
 
 # Recursively create image gallery index and slideshow wrappings.
-# Makes use of (slightly modified) "lightbox" Javascript/CSS as published
-# at http://www.huddletogether.com/projects/lightbox/
+# Makes use of modified "slideshow" javascript by Samuel Birch
+# http://www.phatfusion.net/slideshow/
 
-# Copyright (c) 2006 Eugene G. Crosser
+# Copyright (c) 2006-2008 Eugene G. Crosser
 
 #  This software is provided 'as-is', without any express or implied
 #  warranty.  In no event will the authors be held liable for any damages
@@ -29,28 +29,69 @@ package FsObj;
 use strict;
 use Carp;
 use POSIX qw/getcwd strftime/;
-use CGI qw/:html *table *Tr *center *div/;
+use CGI qw/:html *table *Tr *td *center *div *Link/;
 use Image::Info qw/image_info dim/;
 use Term::ReadLine;
 use Getopt::Long;
+use Encode;
+use encoding 'utf-8';
+binmode(STDOUT, ":utf8");
 
-use Image::Magick;
+my $haveimagick = eval { require Image::Magick; };
+{ package Image::Magick; }	# to make perl compiler happy
 
-my @sizes = (160, 640);
+my $haverssxml = eval { require XML::RSS; };
+{ package XML::RSS; }		# to make perl compiler happy
+
+my @sizes = (160, 640, 1600);
 
 ######################################################################
 
+my $incpath;
+my $rssobj;
 my $debug = 0;
 my $asktitle = 0;
 my $noasktitle = 0;
+my $rssfile = "";
+
+charset("utf-8");
 
-GetOptions('asktitle'=>\$asktitle,
+unless (GetOptions(
+		'help'=>\&help,
+		'incpath'=>\$incpath,
+		'asktitle'=>\$asktitle,
 		'noasktitle'=>\$noasktitle,
-		'debug'=>\$debug);
+		'rssfile=s'=>\$rssfile,
+		'debug'=>\$debug)) {
+	&help;
+}
+
+if ($rssfile && ! $haverssxml) {
+	print STDERR "You need to get XML::RSS from CPAN to use --rssfile\n";
+	exit 1;
+}
 
 my $term = new Term::ReadLine "Edit Title";
 
 FsObj->new(getcwd)->iterate;
+if ($rssobj) { $rssobj->{'rss'}->save($rssobj->{'file'}); }
+
+sub help {
+
+	print STDERR <<__END__;
+usage: $0 [options]
+ --help:        print help message and exit
+ --incpath:     do not try to find .gallery2 diretory upstream, use
+                specified path (absolute or relavive).  Use with causion.
+ --debug:       print a lot of debugging info to stdout as you run
+ --asktitle:    ask to edit album titles even if there are ".title" files
+ --noasktitle:  don't ask to enter album titles even where ".title"
+                files are absent.  Use partial directory names as titles.
+ --rssfile=...:	build RSS feed for newly added "albums", give name of rss file
+__END__
+
+	exit 1;
+}
 
 sub new {
 	my $this = shift;
@@ -67,6 +108,7 @@ sub new {
 				-base=>$name,
 				-fullpath=>$fullpath,
 				-inc=>'../'.$parent->{-inc},
+				-rss=>'../'.$parent->{-rss},
 			};
 	} else {
 		$class = $this;
@@ -75,6 +117,7 @@ sub new {
 				-root=>$root,
 				-fullpath=>$root,
 				-inc=>getinc($root),
+				-rss=>getrss($root),
 			};
 	}
 	bless $self, $class;
@@ -91,7 +134,11 @@ sub getinc {
 	my $fullpath=shift;	# this is not a method
 	my $depth=20;		# arbitrary max depth
 
-	my $inc=".include";
+	if ($incpath) {
+		return $incpath."/.gallery2";
+	}
+
+	my $inc=".gallery2";
 	while ( ! -d $fullpath."/".$inc ) {
 		$inc = "../".$inc;
 		last unless ($depth-- > 0);
@@ -103,11 +150,40 @@ sub getinc {
 	}
 }
 
+sub getrss {
+	my $fullpath=shift;	# this is not a method
+	my $depth=20;		# arbitrary max depth
+
+	return "" unless $rssfile;
+
+	my $rss=$rssfile;
+	while ( ! -f $fullpath."/".$rss ) {
+		$rss = "../".$rss;
+		last unless ($depth-- > 0);
+	}
+	if ($depth > 0) {
+		$rssobj->{'file'} = $rss;
+		$rssobj->{'rss'} = new XML::RSS (version=>2);
+		$rssobj->{'rss'}->parsefile($rss);
+		my $itemstodel = @{$rssobj->{'rss'}->{'items'}} - 15;
+		while ($itemstodel-- > 0) {
+			pop(@{$rssobj->{'rss'}->{'items'}})
+		}
+		$rssobj->{'rss'}->save($rssobj->{'file'});
+		return $rss;
+	} else {
+		print STDERR "There is no $rssfile in this or parent ".
+			"directories, you must create one with mkgalrss.pl\n";
+		exit 1;
+	}
+}
+
 sub iterate {
 	my $self = shift;
 	my $fullpath .= $self->{-fullpath};
 	print "iterate in dir $fullpath\n" if ($debug);
 
+	my $youngest=0;
 	my @rdirlist;
 	my @rimglist;
 	my $D;
@@ -118,6 +194,8 @@ sub iterate {
 	while (my $de = readdir($D)) {
 		next if ($de =~ /^\./);
 		my $child = $self->new($de);
+		my @stat = stat($child->{-fullpath});
+		$youngest = $stat[9] if ($youngest < $stat[9]);
 		if ($child->isdir) {
 			push(@rdirlist,$child);
 		} elsif ($child->isimg) {
@@ -169,6 +247,12 @@ sub iterate {
 		$img->makeaux;
 	}
 
+# no need to go beyond this point if the directory timestamp did not
+# change since we built index.html file last time.
+
+	my @istat = stat($self->{-fullpath}.'/index.html');
+	return unless ($youngest > $istat[9]);
+
 # 5. start building index.html for the directory
 
 	$self->startindex;
@@ -311,9 +395,12 @@ sub makescaled {
 		my $nfn = $dn.'/'.$nref;
 		my $factor=$size/$max;
 		if ($factor >= 1) {
-			$self->{$size} = $name;	# unscaled version will do
+			$self->{$size}->{'url'} = $name; # unscaled version
+			$self->{$size}->{'dim'} = [$w, $h];
 		} else {
-			$self->{$size} = $nref;
+			$self->{$size}->{'url'} = $nref;
+			$self->{$size}->{'dim'} = [int($w*$factor+.5),
+							int($h*$factor+.5)];
 			if (isnewer($fn,$nfn)) {
 				doscaling($fn,$nfn,$factor,$w,$h);
 			}
@@ -331,19 +418,23 @@ sub isnewer {
 
 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";
+
+	my $err=1;
+	if ($haveimagick) {
+		my $im = new Image::Magick;
+		print "doscaling $src -> $dest by $factor\n" if ($debug);
+		if ($err = $im->Read($src)) {
+			warn "ImageMagick: read \"$src\": $err";
+		} else {
+			$im->Scale(width=>$w*$factor,height=>$h*$factor);
+			$err=$im->Write($dest);
+			warn "ImageMagick: write \"$dest\": $err" if ($err);
+		}
+		undef $im;
+	}
+	if ($err) {	# fallback to command-line tools
 		system("djpeg \"$src\" | pnmscale \"$factor\" | cjpeg >\"$dest\"");
 	}
-	undef $im;
 }
 
 sub makeaux {
@@ -356,105 +447,144 @@ sub makeaux {
 	my $title = $self->{-info}->{'Comment'};
 	$title = $name unless ($title);
 
-	print "slide: \"$pref\"->\"$name\"->\"$nref\"\n" if ($debug);
+	print "slide: \"$title\": \"$pref\"->\"$name\"->\"$nref\"\n" if ($debug);
 
 	# slideshow
 	for my $refresh('static', 'slide') {
 		my $fn = sprintf("%s/.html/%s-%s.html",$dn,$name,$refresh);
-		my $imgsrc = '../'.$self->{$sizes[1]};
-		my $fwdref;
-		my $bakref;
-		if ($nref) {
-			$fwdref = sprintf("%s-%s.html",$nref,$refresh);
-		} else {
-			$fwdref = '../index.html';
-		}
-		if ($pref) {
-			$bakref = sprintf("%s-%s.html",$pref,$refresh);
-		} else {
-			$bakref = '../index.html';
-		}
-		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-&gt;';
-		}
-		my $F;
-		unless (open($F,'>'.$fn)) {
-			warn "cannot open \"$fn\": $!";
-			next;
-		}
-		if ($refresh eq 'slide') {
-			print $F start_html(-title=>$title,
+		if (isnewer($self->{-fullpath},$fn)) {
+			my $imgsrc = '../'.$self->{$sizes[1]}->{'url'};
+			my $fwdref;
+			my $bakref;
+			if ($nref) {
+				$fwdref = sprintf("%s-%s.html",$nref,$refresh);
+			} else {
+				$fwdref = '../index.html';
+			}
+			if ($pref) {
+				$bakref = sprintf("%s-%s.html",$pref,$refresh);
+			} else {
+				$bakref = '../index.html';
+			}
+			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-&gt;';
+			}
+			my $F;
+			unless (open($F,'>'.$fn)) {
+				warn "cannot open \"$fn\": $!";
+				next;
+			}
+			binmode($F, ":utf8");
+			if ($refresh eq 'slide') {
+				print $F start_html(
+					-encoding=>"utf-8",
+					-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,
+					),"\n",
+					comment("Created by ".$version),"\n";
+						
+			} else {
+				print $F start_html(-title=>$title,
+					-encoding=>"utf-8",
 					-bgcolor=>"#808080",
 					-style=>{-src=>$inc."gallery.css"},
-				),"\n";
+					),"\n",
+					comment("Created by ".$version),"\n";
+			}
+			print $F start_table({-class=>'navi'}),start_Tr,"\n",
+				td(a({-href=>"../index.html"},"Index")),"\n",
+				td(a({-href=>$bakref},"&lt;&lt;Prev")),"\n",
+				td(a({-href=>$toggleref},$toggletext)),"\n",
+				td(a({-href=>$fwdref},"Next&gt;&gt;")),"\n",
+				td({-class=>'title'},$title),"\n",
+				end_Tr,
+				end_table,"\n",
+				center(table({-class=>'picframe'},
+					Tr(td(img({-src=>$imgsrc}))))),"\n",
+				end_html,"\n";
+			close($F);
 		}
-		print $F start_center,"\n",
+	}
+
+	# info html
+	my $fn = sprintf("%s/.html/%s-info.html",$dn,$name);
+	if (isnewer($self->{-fullpath},$fn)) {
+		my $F;
+		unless (open($F,'>'.$fn)) {
+			warn "cannot open \"$fn\": $!";
+			return;
+		}
+		my $imgsrc = sprintf("../.%s/%s",$sizes[0],$name);
+		print $F start_html(-title=>$title,
+				-encoding=>"utf-8",
+				-style=>{-src=>$inc."gallery.css"},
+				-script=>[
+					{-src=>$inc."mootools.js"},
+					{-src=>$inc."urlparser.js"},
+					{-src=>$inc."infopage.js"},
+				]),"\n",
+			comment("Created by ".$version),"\n",
+			start_center,"\n",
 			h1($title),"\n",
-			start_table({-class=>'navi'}),start_Tr,"\n",
-			td(a({-href=>"../index.html"},"Index")),"\n",
-			td(a({-href=>$bakref},"&lt;&lt;Prev")),"\n",
-			td(a({-href=>$toggleref},$toggletext)),"\n",
-			td(a({-href=>$fwdref},"Next&gt;&gt;")),"\n",
-			end_Tr,
-			end_table,"\n",
-			table({-class=>'picframe'},
-				Tr(td(img({-src=>$imgsrc})))),"\n",
+			table({-class=>'ipage'},
+				Tr(td(img({-src=>$imgsrc})),
+					td($self->infotable))),
+			a({-href=>'../index.html',-class=>'conceal'},
+				'Index'),"\n",
 			end_center,"\n",
 			end_html,"\n";
 		close($F);
 	}
-	my $fn = sprintf("%s/.html/%s-info.html",$dn,$name);
-	my $F;
-	unless (open($F,'>'.$fn)) {
-		warn "cannot open \"$fn\": $!";
-		return;
-	}
-
-	# info html
-	my $imgsrc = sprintf("../.%s/%s",$sizes[0],$name);
-	print $F start_html(-title=>$title,
-				-style=>{-src=>$inc."gallery.css"},),"\n",
-		start_center,"\n",
-		h1($title),"\n",
-		table({-class=>'ipage'},Tr(td(img({-src=>$imgsrc})),td($self->infotable))),
-		a({-href=>'../index.html'},'Index'),"\n",
-		end_center,"\n",
-		end_html,"\n";
-	close($F);
 }
 
 sub startindex {
 	my $self = shift;
 	my $fn = $self->{-fullpath}.'/index.html';
+	my $block = $self->{-fullpath}.'/.noindex';
+	$fn = '/dev/null' if ( -f $block );
 	my $IND;
 	unless (open($IND,'>'.$fn)) {
 		warn "cannot open $fn: $!";
 		return;
 	}
+	binmode($IND, ":utf8");
 	$self->{-IND} = $IND;
 
 	my $inc = $self->{-inc};
 	my $title = $self->{-title};
+	my $rsslink="";
+	if ($self->{-rss}) {
+		$rsslink=Link({-rel=>'alternate',
+				-type=>'application/rss+xml',
+				-title=>'RSS',
+				-href=>$self->{-rss}});
+	}
 	print $IND start_html(-title => $title,
-			-style=>{-src=>[$inc."gallery.css",
-					$inc."lightbox.css"]},
-			-script=>[{-code=>"var incPrefix='$inc';"},
+			-encoding=>"utf-8",
+			-head=>$rsslink,
+			-style=>{-src=>$inc."gallery.css"},
+			-script=>[
+				{-src=>$inc."mootools.js"},
+				{-src=>$inc."overlay.js"},
+				{-src=>$inc."urlparser.js"},
+				{-src=>$inc."multibox.js"},
+				{-src=>$inc."showwin.js"},
+				{-src=>$inc."controls.js"},
+				{-src=>$inc."show.js"},
 				{-src=>$inc."gallery.js"},
-				{-src=>$inc."lightbox.js"}]),
+			]),"\n",
+		comment("Created by ".$version),"\n",
+		start_div({-class => 'indexContainer',
+				-id => 'indexContainer'}),
 		a({-href=>"../index.html"},"UP"),"\n",
 		start_center,"\n",
 		h1($title),"\n",
@@ -465,10 +595,22 @@ sub endindex {
 	my $self = shift;
 	my $IND = $self->{-IND};
 
-	print $IND end_center,end_html,"\n";
+	print $IND end_center,end_div,end_html,"\n";
 
 	close($IND) if ($IND);
 	undef $self->{-IND};
+	if ($rssobj) {
+		my $rsstitle=sprintf "%s [%d images, %d subalbums]",
+				$self->{-title},
+				$self->{-numofimgs},
+				$self->{-numofsubs};
+		my $rsslink=$rssobj->{'rss'}->channel('link')."index.html";
+		$rssobj->{'rss'}->add_item(
+			title		=> $self->{-title},
+			link		=> $rsslink,
+			description	=> $rsstitle,
+		);
+	}
 }
 
 sub startsublist {
@@ -484,6 +626,7 @@ sub sub_entry {
 	my $name = $self->{-base};
 	my $title = $self->{-title};
 
+	$self->{-parent}->{-numofsubs}++;
 	print $IND Tr(td(a({-href=>$name.'/index.html'},$name)),
 			td(a({-href=>$name.'/index.html'},$title))),"\n";
 }
@@ -501,9 +644,9 @@ sub startimglist {
 	my $first = $self->{-firstimg}->{-base};
 	my $slideref = sprintf(".html/%s-slide.html",$first);
 
-	print $IND h2("Images"),"\n",
-		a({-href=>$slideref},'Slideshow'),
-		"\n";
+	print $IND h2("Images ",
+		a({-href=>$slideref,-class=>'showStart',-id=>$first},
+			'&gt; slideshow')),"\n";
 }
 
 sub img_entry {
@@ -512,31 +655,40 @@ sub img_entry {
 	my $name = $self->{-base};
 	my $title = $self->{-info}->{'Comment'};
 	$title = $name unless ($title);
-	my $thumb = $self->{$sizes[0]};
-	my $medium = $self->{$sizes[1]};
+	my $thumb = $self->{$sizes[0]}->{'url'};
 	my $info = $self->{-info};
 	my ($w, $h) = dim($info);
 
-	print $IND start_div({-class=>'ibox',-id=>$name,
-				-OnClick=>"HideIbox('$name');"}),"\n",
-		start_div({-class=>'iboxtitle'}),
-		span({-style=>'float: left;'},b("Info for $name")),
-		span({-style=>'float: right;'},
-			a({-href=>"#",-OnClick=>"HideIbox('$name');"},"Close")),
-		br({-clear=>'all'}),"\n",
-		end_div,"\n",
-		$self->infotable,
-		end_div,"\n";
-
-	print $IND table({-class=>'slide'},Tr(td(
-		a({-href=>".html/$name-info.html",-title=>'Image Info',
-			-onClick=>"return showIbox('$name');"},$title),
-		br,
-		a({-href=>$medium,-rel=>"lightbox",-title=>$title},
-			img({-src=>$thumb})),
-		br,
-		a({-href=>$name,-title=>'Original Image'},"($w x $h)"),
-		br))),"\n";
+	my $i=0+$self->{-parent}->{-numofimgs};
+	$self->{-parent}->{-numofimgs}++;
+
+	print $IND a({-name=>$name}),"\n",
+		start_table({-class=>'slide'}),start_Tr,start_td,"\n",
+		div({-class=>'slidetitle',-id=>$name},
+			"\n ",a({-href=>".html/$name-info.html",
+				-title=>'Image Info: '.$name,
+				-class=>'infoBox'},
+				$title),"\n"),"\n",
+		div({-class=>'slideimage',-id=>$name},
+			"\n ",a({-href=>".html/$name-static.html",
+				-title=>$title,
+				-class=>'showImage',
+				-id=>$name},
+				img({-src=>$thumb})),"\n"),"\n",
+		start_div({-class=>'varimages',-id=>$name,-title=>$title}),"\n";
+	foreach my $sz(@sizes) {
+		my $src=$self->{$sz}->{'url'};
+		my $w=$self->{$sz}->{'dim'}->[0];
+		my $h=$self->{$sz}->{'dim'}->[1];
+		print $IND "  ",a({-href=>$src,
+			-class=>"conceal",
+			-title=>"Reduced to ".$w."x".$h},
+			$w."x".$h)," \n";
+	}
+	print $IND "  ",a({-href=>$name,
+				-title=>'Original'},$w."x".$h),
+		"\n",end_div,"\n",
+		end_td,end_Tr,end_table,"\n";
 }
 
 sub endimglist {