X-Git-Url: http://www.average.org/gitweb/?p=mkgallery.git;a=blobdiff_plain;f=mkgallery.pl;h=7f54b01786aa1ebef323bf1fe7b0ed652d492a82;hp=85c648ec5352cd24958f7b7dfe2de561a28e64b0;hb=d104afdbde8eba624eebe78225833016121f7b22;hpb=5284b11e03a2cf04522adf94e187619620191a78

diff --git a/mkgallery.pl b/mkgallery.pl
index 85c648e..7f54b01 100755
--- a/mkgallery.pl
+++ b/mkgallery.pl
@@ -24,19 +24,203 @@
 #     misrepresented as being the original software.
 #  3. This notice may not be removed or altered from any source distribution.
 
+package FsObj;
+
 use strict;
 use Carp;
 use POSIX qw/getcwd/;
 use CGI qw/:html *table *center *div/;
 use Image::Info qw/image_info dim/;
+use Term::ReadLine;
+use Getopt::Long;
+
 use Image::Magick;
 
-my $ask=1;
-my $startdir=getcwd;
+my @sizes = (160, 640);
 
 ######################################################################
 
-&processdir($startdir);
+my $debug = 0;
+my $asktitle = 0;
+my $noasktitle = 0;
+
+GetOptions('asktitle'=>\$asktitle,
+		'noasktitle'=>\$noasktitle,
+		'debug'=>\$debug);
+
+my $term = new Term::ReadLine "Edit Title";
+
+FsObj->new(getcwd)->iterate;
+
+sub new {
+	my $this = shift;
+	my $class;
+	my $self;
+	if (ref($this)) {
+		$class = ref($this);
+		my $parent = $this;
+		my $name = shift;
+		my $fullpath = $parent->{-fullpath}.'/'.$name;
+		$self = {
+				-parent=>$parent,
+				-root=>$parent->{-root},
+				-base=>$name,
+				-fullpath=>$fullpath,
+				-inc=>'../'.$parent->{-inc},
+			};
+	} else {
+		$class = $this;
+		my $root=shift;
+		$self = {
+				-root=>$root,
+				-fullpath=>$root,
+				-inc=>getinc($root),
+			};
+	}
+	bless $self, $class;
+	if ($debug) {
+		print "new $class:\n";
+		foreach my $k(keys %$self) {
+			print "\t$k\t=\t$self->{$k}\n";
+		}
+	}
+	return $self;
+}
+
+sub getinc {
+	my $fullpath=shift;	# this is not a method
+	my $depth=20;		# arbitrary max depth
+
+	my $inc=".include";
+	while ( ! -d $fullpath."/".$inc ) {
+		$inc = "../".$inc;
+		last unless ($depth-- > 0);
+	}
+	if ($depth > 0) {
+		return $inc.'/';		# prefix with trailing slash
+	} else {
+		return 'NO-.INCLUDE-IN-PATH/';	# won't work anyway
+	}
+}
+
+sub iterate {
+	my $self = shift;
+	my $fullpath .= $self->{-fullpath};
+	print "iterate in dir $fullpath\n" if ($debug);
+
+	my @rdirlist;
+	my @rimglist;
+	my $D;
+	unless (opendir($D,$fullpath)) {
+		warn "cannot opendir $fullpath: $!";
+		return;
+	}
+	while (my $de = readdir($D)) {
+		next if ($de =~ /^\./);
+		my $child = $self->new($de);
+		if ($child->isdir) {
+			push(@rdirlist,$child);
+		} elsif ($child->isimg) {
+			push(@rimglist,$child);
+		}
+	}
+	closedir($D);
+	my @dirlist = sort {$a->{-base} cmp $b->{-base}} @rdirlist;
+	undef @rdirlist; # inplace sorting would be handy here
+	my @imglist = sort {$a->{-base} cmp $b->{-base}} @rimglist;
+	undef @rimglist; # optimize away unsorted versions
+
+# 1. first of all, fill title for this directory and create hidden subdirs
+
+	$self->initdir;
+
+# 2. iterate through 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
+
+	foreach my $img(@imglist) {
+		print "Img: $img->{-fullpath}\n" if ($debug);
+	}
+
+# 6. iterate through images to build thumb list and aux html files
+# 7. comlplete building index.html for the directory
+
+}
+
+sub isdir {
+	my $self = shift;
+	return ( -d $self->{-fullpath} );
+}
+
+sub isimg {
+	my $self = shift;
+	my $fullpath = $self->{-fullpath};
+	return 0 unless ( -f $fullpath );
+	my $info = image_info($fullpath);
+	if (my $error = $info->{error}) {
+		if (($error !~ "Unrecognized file format") &&
+		    ($error !~ "Can't read head")) {
+			warn "File \"$fullpath\": $error\n";
+		}
+		return 0;
+	}
+	$self->{-isimg} = 1;
+	$self->{-info} = $info;
+	return 1;
+}
+
+sub initdir {
+	my $self = shift;
+	my $fullpath = $self->{-fullpath};
+	for my $subdir(@sizes, 'html') {
+		my $tdir=sprintf "%s/.%s",$self->{-fullpath},$subdir;
+		mkdir($tdir,0755) unless ( -d $tdir );
+	}
+	$self->edittitle;
+}
+
+sub edittitle {
+	my $self = shift;
+	my $fullpath = $self->{-fullpath};
+	my $title;
+	my $T;
+	if (open($T,'<'.$fullpath.'/.title')) {
+		$title = <$T>;
+		$title =~ s/[\r\n]*$//;
+		close($T);
+	}
+	if ($asktitle || (!$title && !$noasktitle)) {
+		my $prompt = $self->{-base};
+		$prompt = '/' unless ($prompt);
+		my $OUT = $term->OUT || \*STDOUT;
+		print $OUT "Enter title for $fullpath\n";
+		$title = $term->readline($prompt.' >',$title);
+		$term->addhistory($title) if ($title);
+		if (open($T,'>'.$fullpath.'/.title')) {
+			print $T $title,"\n";
+			close($T);
+		}
+	}
+	unless ($title) {
+		$title=substr($fullpath,length($self->{-root}))
+	}
+	$self->{-title}=$title;
+	print "title in $fullpath is $title\n" if ($debug);
+}
+
+######################################################################
+=cut
+######################################################################
+
+&processdir(getcwd);
 
 sub processdir {
 	my ($start,$dir)=@_;
@@ -87,7 +271,7 @@ sub processdir {
 			-script=>[{-code=>"var incPrefix='$inc';"},
 				{-src=>$inc."gallery.js"},
 				{-src=>$inc."lightbox.js"}]),"\n";
-	print a({-href=>"../"},"UP");
+	print a({-href=>"../index.html"},"UP");
 	print start_center,"\n";
 	print h1($title),"\n";
 
@@ -134,6 +318,7 @@ sub processdir {
 # write HTML footer
 
 	print br({-clear=>"all"}),"\n";
+	print a({-href=>".html/".$piclist[0]."-slide.html"},"Slideshow");
 	print hr,"\n" if ($haspics);
 	print end_center,"\n";
 	print end_html,"\n";
@@ -223,8 +408,8 @@ sub subalbum {
 	my ($base,$title)=@_;
 
 	print Tr({-bgcolor=>"#c0c0c0"},
-		td(a({-href=>$base."/"},$base)),
-		td(a({-href=>$base."/"},$title))),"\n";
+		td(a({-href=>$base."/index.html"},$base)),
+		td(a({-href=>$base."/index.html"},$title))),"\n";
 }
 
 sub processfile {
@@ -288,12 +473,21 @@ sub mkauxfile {
 	if ($pbase) {
 		$pref=sprintf("%s-%s.html",$pbase,$refresh);
 	} else {
-		$pref="../";
+		$pref="../index.html";
 	}
 	if ($nbase) {
 		$nref=sprintf("%s-%s.html",$nbase,$refresh);
 	} else {
-		$nref="../";
+		$nref="../index.html";
+	}
+	my $toggle;
+	my $toggleref;
+	if ($refresh eq 'slide') {
+		$toggle='Stop!';
+		$toggleref=sprintf("%s-static.html",$base);
+	} else {
+		$toggle='Play-&gt;';
+		$toggleref=sprintf("%s-slide.html",$base);
 	}
 
 	my $tdir=sprintf "%s/%s/.html",$start,$dir;
@@ -307,12 +501,22 @@ sub mkauxfile {
 	$title=$base unless ($title);
 	if ($refresh eq 'slide') {
 		print start_html(-title=>$title,
+				-bgcolor=>"#808080",
 			-head=>meta({-http_equiv=>'Refresh',
 				-content=>"3; url=$nref"})),"\n";
 	} else {
-		print start_html(-title=>$title),"\n";
+		print start_html(-title=>$title,
+				-bgcolor=>"#808080"),"\n";
 	}
-	print img({-src=>"../.640/".$base});
+	print start_center,"\n";
+	print h1($title);
+	print a({-href=>"../index.html"},"Index")," | ";
+	print a({-href=>$pref},"&lt;&lt;Prev")," | ";
+	print a({-href=>$toggleref},$toggle)," | ";
+	print a({-href=>$nref},"Next&gt;&gt;");
+	print p;
+	print img({-src=>"../.640/".$base}),"\n";
+	print end_center,"\n";
 	print end_html,"\n";
 	close(STDOUT);
 }