X-Git-Url: http://www.average.org/gitweb/?p=mkgallery.git;a=blobdiff_plain;f=mkgallery.pl;h=53b9c9ad809ae91fb57afe18164b2403b4b39668;hp=bef05ccb7cc6397cfd019822abdf86528b91811f;hb=c6bfb2dbe01ce301c05578fda92c3b97dad62faf;hpb=f9c7ba99a004db4c3390a107f7260f1c4350b3c0

diff --git a/mkgallery.pl b/mkgallery.pl
index bef05cc..53b9c9a 100755
--- a/mkgallery.pl
+++ b/mkgallery.pl
@@ -32,13 +32,24 @@ 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 $debug=0;
+my @sizes = (160, 640);
 
 ######################################################################
 
+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 {
@@ -48,15 +59,11 @@ sub new {
 	if (ref($this)) {
 		$class = ref($this);
 		my $parent = $this;
-		my $path = $parent->{-path};
 		my $name = shift;
-		$path .= '/' if ($path);
-		$path .= $name;
 		my $fullpath = $parent->{-fullpath}.'/'.$name;
 		$self = {
 				-parent=>$parent,
 				-root=>$parent->{-root},
-				-path=>$path,
 				-base=>$name,
 				-fullpath=>$fullpath,
 				-inc=>'../'.$parent->{-inc},
@@ -90,9 +97,9 @@ sub getinc {
 		last unless ($depth-- > 0);
 	}
 	if ($depth > 0) {
-		return $inc.'/';	# prefix with trailing slash
+		return $inc.'/';		# prefix with trailing slash
 	} else {
-		return 'NO-.INCLUDE-IN-PATH/'; # won't work anyway
+		return 'NO-.INCLUDE-IN-PATH/';	# won't work anyway
 	}
 }
 
@@ -118,32 +125,67 @@ sub iterate {
 		}
 	}
 	closedir($D);
-	my @sdirlist = sort {$a->{-base} cmp $b->{-base}} @rdirlist;
+	my @dirlist = sort {$a->{-base} cmp $b->{-base}} @rdirlist;
 	undef @rdirlist; # inplace sorting would be handy here
-	my @simglist = sort {$a->{-base} cmp $b->{-base}} @rimglist;
+	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(@sdirlist) {
-		print "Dir: $dir->{-fullpath}\n" if ($debug);
+	foreach my $dir(@dirlist) {
 		$dir->iterate;
 	}
 
-# 3. start building directory index.html
-# 4. iterate through subdirectories to build subalbums list
-# 5. iterate through images to build cross-links
+# 3. iterate through images to build cross-links,
+#    create scaled versions and aux htmls
+
+	my $previmg = undef;
+	foreach my $img(@imglist) {
+		if ($previmg) {
+			$previmg->{-nextimg} = $img;
+			$img->{-previmg} = $previmg;
+		}
+		$previmg=$img;
+
+		$img->makescaled;
+		$img->makeaux;
+	}
+
+# 4. start building index.html for the directory
 
-	foreach my $img(@simglist) {
-		print "Img: $img->{-fullpath}\n" if ($debug);
+	$self->startindex;
+
+# 5. iterate through subdirectories to build subalbums list
+
+	if (@dirlist) {
+		$self->startsublist;
+		foreach my $dir(@dirlist) {
+			$dir->sub_entry;
+		}
+		$self->endsublist;
 	}
 
-# 6. iterate through images to build thumb list and aux html files
+# 6. 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;
+	}
+
+# 7. comlplete building index.html for the directory
+
+	$self->endindex;
 }
 
 sub isdir {
@@ -171,7 +213,141 @@ sub isimg {
 sub initdir {
 	my $self = shift;
 	my $fullpath = $self->{-fullpath};
-	# do stuff
+	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);
+}
+
+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 $nfn = $dn.'/.'.$size.'/'.$name;
+		my $factor=$size/$max;
+	}
+}
+
+sub makeaux {
+	my $self = shift;
+	my $fn = $self->{-fullpath};
+	my $name = $self->{-base};
+	my $dn = $self->{-parent}->{-fullpath};
+}
+
+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";
 }
 
 ######################################################################
@@ -223,7 +399,6 @@ sub processdir {
 
 # write HTML header
 
-	print start_html(-title => $title,
 			-style=>{-src=>[$inc."gallery.css",
 					$inc."lightbox.css"]},
 			-script=>[{-code=>"var incPrefix='$inc';"},