X-Git-Url: http://www.average.org/gitweb/?p=mkgallery.git;a=blobdiff_plain;f=mkgallery.pl;h=7a4b681a5aacb29f8be85d668c839e4bd4761122;hp=f672b6c3895234f6665d6da8a8eda1abb566bfa2;hb=135674817b47747d9a3c343376fc3dea6da229ac;hpb=a4459ef8c416655779d060838622932d26cded1b

diff --git a/mkgallery.pl b/mkgallery.pl
index f672b6c..7a4b681 100755
--- a/mkgallery.pl
+++ b/mkgallery.pl
@@ -29,30 +29,36 @@ package FsObj;
 use strict;
 use Carp;
 use POSIX qw/getcwd strftime/;
+use HTTP::Date;
 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';
+use UUID;
+#use encoding 'utf-8';
 binmode(STDOUT, ":utf8");
 
 my $haveimagick = eval { require Image::Magick; };
 { package Image::Magick; }	# to make perl compiler happy
 
-my $haverssxml = eval { require XML::RSS; };
-{ package XML::RSS; }		# to make perl compiler happy
+my $havefeed = eval { require XML::FeedPP; };
+{ package XML::FeedPP; }	# to make perl compiler happy
+
+my $havegeoloc = eval { require Image::ExifTool::Location; };
+{ package Image::ExifTool::Location; }	# to make perl compiler happy
 
 my @sizes = (160, 640, 1600);
+my $incdir = ".gallery2";
 
 ######################################################################
 
 my $incpath;
-my $rssobj;
+my $feedobj;
 my $debug = 0;
 my $asktitle = 0;
 my $noasktitle = 0;
-my $rssfile = "";
+my $feed = "";
 
 charset("utf-8");
 
@@ -61,33 +67,40 @@ unless (GetOptions(
 		'incpath'=>\$incpath,
 		'asktitle'=>\$asktitle,
 		'noasktitle'=>\$noasktitle,
-		'rssfile=s'=>\$rssfile,
+		'feed=s'=>\$feed,
 		'debug'=>\$debug)) {
 	&help;
 }
 
-if ($rssfile && ! $haverssxml) {
-	print STDERR "You need to get XML::RSS from CPAN to use --rssfile\n";
+if ($feed && !$havefeed) {
+	print STDERR "You need to install XML::FeedPP to use --feed\n";
 	exit 1;
 }
 
 my $term = new Term::ReadLine "Edit Title";
 
 FsObj->new(getcwd)->iterate;
-if ($rssobj) { $rssobj->{'rss'}->save($rssobj->{'file'}); }
+if ($feedobj) {
+	$feedobj->{-feed}->pubDate(time);
+	$feedobj->{-feed}->to_file($feedobj->{-savepath});
+}
 
 sub help {
 
 	print STDERR <<__END__;
 usage: $0 [options]
  --help:        print help message and exit
- --incpath:     do not try to find .gallery2 diretory upstream, use
+ --incpath:     do not try to find .gallery2 directory 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
+ --feed=...:	build Atom feed for newly added "albums",
+		enter filename, base URL, and optionally PuSH hub url,
+		separated by commas. (Note: PuSH obviously does not work
+		"out of the box" for static tree! You need a separate
+		"watcher" script to do the publishing for you.)
 __END__
 
 	exit 1;
@@ -108,18 +121,17 @@ sub new {
 				-depth=>$parent->{-depth}+1,
 				-base=>$name,
 				-fullpath=>$parent->{-fullpath}.'/'.$name,
-				-relpath=>$parent->{-relpath}.'/'.$name,
+				-relpath=>$parent->{-relpath}.$name.'/',
 				-inc=>'../'.$parent->{-inc},
 			};
 	} else {
 		$class = $this;
 		my $root=shift;
 		$self = {
-				-depth=>0,
 				-root=>$root,
 				-fullpath=>$root,
 			};
-		# fill in -inc, -rss, -relpath
+		# fill in -inc, -feed, -relpath
 		initpaths($self); # we are not blessed yet, so cheat.
 	}
 	bless $self, $class;
@@ -137,68 +149,97 @@ sub initpaths {
 	my $depth=20;		# arbitrary max depth
 	my $fullpath=$self->{-fullpath};
 	my $inc;
-	my $rss;
 	my $relpath;
 
 	if ($incpath) {
-		$inc = $incpath."/.gallery2";
+		$inc = $incpath;
+		$inc .= '/' unless ($inc =~ m%/$%);
 	} else {
-		$inc=".gallery2";
-		while ( ! -d $fullpath."/".$inc ) {
+		$inc="";
+		while ( ! -d $fullpath."/".$inc."/".$incdir ) {
 			$inc = "../".$inc;
 			last unless ($depth-- > 0);
 		}
 	}
 	if ($depth > 0) {
-		$self->{-inc} = $inc.'/';
+		$self->{-inc} = $inc;
 		my $dp=0;
 		my $pos;
 		for ($pos=index($inc,'/');$pos>=0;
 					$pos=index($inc,'/',$pos+1)) {
 			$dp++;
 		}
-		for ($pos=length($fullpath);$dp-->0 && $pos>0;
-					$pos=rindex($fullpath,'/',$pos-1)) {;}
+		$self->{-depth} = $dp;
+		for ($pos=length($fullpath);$dp>0 && $pos>0;
+					$pos=rindex($fullpath,'/',$pos-1)) {
+			$dp--;
+		}
 		my $relpath = substr($fullpath,$pos);
 		$relpath =~ s%^/%%;
+		$relpath .= '/' if ($relpath);
 		$self->{-relpath} = $relpath;
 		$self->{-toppath} = substr($fullpath,0,$pos);
-		initrss($self);
+		#print "rel=$relpath, top=$self->{-toppath}, inc=$inc\n";
+		initfeed($self);
 	} else {
 		$self->{-inc} = 'NO-.INCLUDE-IN-PATH/';	# won't work anyway
-		$self->{-rss} = '';
+		$self->{-feed} = '';
 		$self->{-relpath} = '';
+		$self->{-depth} = 0;
 	}
 }
 
-sub initrss {
+sub initfeed {
 	my $self=shift;		# this is not a method but we cheat
 	my $fullpath=$self->{-fullpath};
-	my $depth=20;
+	my $toppath=$self->{-toppath};
+	my $inc=$self->{-inc}.$incdir.'/';
+	my $conffile=$toppath.'/'.$incdir.'/feed.conf';
+	my $CONF;
+
+	if (! $incpath) {
+		if ($feed) {
+			if (open($CONF,">".$conffile)) {
+				print $CONF $feed,"\n";
+				close($CONF);
+			} else {
+				print STDERR "could not open $conffile: $!\n";
+			}
+		} else {
+			if (open($CONF,$conffile)) {
+				$feed=<$CONF>;
+				close($CONF);
+				chop $feed;
+			}
+		}
+	}
 
-	return;
-	return "" unless $rssfile;
+	return unless ($feed);
 
-	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;
+	my ($feedfile, $feedbase, $feedhub) = split(',', $feed);
+	$feedbase .= '/' unless ($feedbase =~ /\/$/);
+	print "($feedfile, $feedbase, $feedhub)\n";
+
+	$feedobj->{-savepath} = $self->{-toppath}.'/'.$feedfile;
+	$feedobj->{-file} = $feedfile;
+	$feedobj->{-base} = $feedbase;
+	$feedobj->{-hub} = $feedhub;
+	if ( -f $feedobj->{-file} ) {
+		$feedobj->{-feed} = XML::FeedPP::Atom::Atom10->new(
+							$feedobj->{-file});
+		$feedobj->{-feed}->limit_item(15);
 	} else {
-		print STDERR "There is no $rssfile in this or parent ".
-			"directories, you must create one with mkgalrss.pl\n";
-		exit 1;
-	}
+		$feedobj->{-feed} = XML::FeedPP::Atom::Atom10->new;
+		$feedobj->{-feed}->title("Gallery");
+		$feedobj->{-feed}->description("generated by ".
+			"<a href=\"http://www.average.org/mkgallery/\">".
+			"mkgallery</a>");
+		$feedobj->{-feed}->link($feedbase);
+		#$feedobj->{-feed}->copyright("");
+		#$feedobj->{-feed}->language("en");
+		#$feedobj->{-feed}->image($url, $tit, $link, $desc, $w, $h);
+	}
+	$self->{-feed} = $feedobj->{-feed};
 }
 
 sub iterate {
@@ -315,6 +356,16 @@ sub isimg {
 	my $self = shift;
 	my $fullpath = $self->{-fullpath};
 	return 0 unless ( -f $fullpath );
+
+	if ($havegeoloc) {
+		my $exif = new Image::ExifTool;
+		$exif->ExtractInfo($fullpath);
+		my ($la,$lo) = $exif->GetLocation();
+		if ($la && $lo) {
+			$self->{-geoloc} = [$la,$lo];
+		}
+	}
+
 	my $info = image_info($fullpath);
 	if (my $error = $info->{error}) {
 		if (($error !~ "Unrecognized file format") &&
@@ -382,6 +433,7 @@ sub edittitle {
 	my $title;
 	my $T;
 	if (open($T,'<'.$fullpath.'/.title')) {
+		binmode($T, ":utf8");
 		$title = <$T>;
 		$title =~ s/[\r\n]*$//;
 		close($T);
@@ -466,7 +518,7 @@ sub makeaux {
 	my $dn = $self->{-parent}->{-fullpath};
 	my $pref = $self->{-previmg}->{-base};
 	my $nref = $self->{-nextimg}->{-base};
-	my $inc = $self->{-inc};
+	my $inc = $self->{-inc}.$incdir.'/';
 	my $title = $self->{-info}->{'Comment'};
 	$title = $name unless ($title);
 
@@ -548,6 +600,7 @@ sub makeaux {
 			warn "cannot open \"$fn\": $!";
 			return;
 		}
+		binmode($F, ":utf8");
 		my $imgsrc = sprintf("../.%s/%s",$sizes[0],$name);
 		print $F start_html(-title=>$title,
 				-encoding=>"utf-8",
@@ -586,18 +639,18 @@ sub startindex {
 	binmode($IND, ":utf8");
 	$self->{-IND} = $IND;
 
-	my $inc = $self->{-inc};
+	my $inc = $self->{-inc}.$incdir.'/';
 	my $title = $self->{-title};
-	my $rsslink="";
-	if ($self->{-rss}) {
-		$rsslink=Link({-rel=>'alternate',
-				-type=>'application/rss+xml',
-				-title=>'RSS',
-				-href=>$self->{-rss}});
+	my $feedlink="";
+	if ($feedobj) {
+		$feedlink=Link({-rel=>'alternate',
+				-type=>'application/atom+xml',
+				-title=>'Gallery Feed',
+				-href=>$feedobj->{-base}.$feedobj->{-file}});
 	}
 	print $IND start_html(-title => $title,
 			-encoding=>"utf-8",
-			-head=>$rsslink,
+			-head=>$feedlink,
 			-style=>[
 				{-src=>$inc."gallery.css"},
 				{-src=>$inc."custom.css"},
@@ -617,7 +670,7 @@ sub startindex {
 				-id => 'indexContainer'}),
 		"\n";
 	my $EVL;
-	if (open($EVL,$inc.'header.pl')) {
+	if (open($EVL,$self->{-toppath}.'/'.$incdir.'/header.pl')) {
 		my $prm;
 		while (<$EVL>) {
 			$prm .= $_;
@@ -627,10 +680,14 @@ sub startindex {
 			-version	=> $version,
 			-depth		=> $self->{-depth},
 			-title		=> $title,
+			-path		=> $self->{-fullpath},
 			-breadcrumbs	=> "breadcrumbs unimplemented",
 		);
 		print $IND eval $prm,"\n";
 	} else {
+		print STDERR "could not open ",
+			$self->{-toppath}.'/'.$incdir.'/header.pl',
+			" ($!), reverting to default header";
 		print $IND a({-href=>"../index.html"},"UP"),"\n",
 			h1({-class=>'title'},$title),"\n",
 	}
@@ -642,7 +699,7 @@ sub endindex {
 
 	print $IND end_div;
 	my $EVL;
-	if (open($EVL,$self->{-inc}.'footer.pl')) {
+	if (open($EVL,$self->{-toppath}.'/'.$incdir.'/footer.pl')) {
 		my $prm;
 		while (<$EVL>) {
 			$prm .= $_;
@@ -655,21 +712,32 @@ sub endindex {
 			-breadcrumbs	=> "breadcrumbs unimplemented",
 		);
 		print $IND eval $prm,"\n";
+	} else {
+		print STDERR "could not open ",
+			$self->{-toppath}.'/'.$incdir.'/footer.pl',
+			" ($!), reverting to default empty footer";
 	}
 	print $IND end_html,"\n";
 
 	close($IND) if ($IND);
 	undef $self->{-IND};
-	if ($rssobj) {
-		my $rsstitle=sprintf "%s [%d images, %d subalbums]",
+	if ($feedobj) {
+		my $feedtitle=sprintf "%s [%d images, %d subalbums]",
 				$self->{-title},
 				$self->{-numofimgs},
 				$self->{-numofsubs};
-		my $rsslink=$rssobj->{'rss'}->channel('link')."index.html";
-		$rssobj->{'rss'}->add_item(
+		my $feedlink=$feedobj->{-feed}->link.
+			$self->{-relpath}."index.html";
+		my $uu;
+		my $us;
+		UUID::generate($uu);
+		UUID::unparse($uu, $us);
+		$feedobj->{-feed}->add_item(
 			title		=> $self->{-title},
-			link		=> $rsslink,
-			description	=> $rsstitle,
+			link		=> $feedlink,
+			description	=> $feedtitle,
+			pubDate		=> time,
+			guid		=> $us,
 		);
 	}
 }
@@ -724,20 +792,28 @@ sub img_entry {
 	$self->{-parent}->{-numofimgs}++;
 
 	print $IND a({-name=>$name}),"\n",
-		start_table({-class=>'slide'}),start_Tr,start_td,"\n",
-		div({-class=>'slidetitle'},
+		start_table({-class=>'slide'}),start_Tr,start_td,"\n";
+	print $IND div({-class=>'slidetitle'},
 			"\n ",a({-href=>".html/$name-info.html",
 				-title=>'Image Info: '.$name,
 				-class=>'infoBox'},
 				$title),"\n"),"\n",
-		div({-class=>'slideimage'},
-			"\n ",a({-href=>".html/$name-static.html",
+		start_div({-class=>'slideimage'});
+	if ($self->{-geoloc}) {
+		my ($la,$lo) = @{$self->{-geoloc}};
+		print $IND a({-href=>"http://maps.google.com/".
+						"?q=$la,$lo&ll=$la,$lo",
+				-title=>"$la,$lo",
+				-class=>'geoloc'},
+				div({-class=>'geoloc'},"")),"\n";
+	}
+	print $IND a({-href=>".html/$name-static.html",
 				-title=>$title,
 				-class=>'showImage',
 				-rel=>'i'.$name},
 				img({-src=>$thumb,
 				     -class=>'thumbnail',
-				     -alt=>$title})),"\n"),"\n",
+				     -alt=>$title})),"\n",end_div,
 		start_div({-class=>'varimages',-id=>'i'.$name,-title=>$title}),"\n";
 	foreach my $sz(@sizes) {
 		my $src=$self->{$sz}->{'url'};