typos fixed, todo trimmed

[mkgallery.git] / mkgallery.pl

diff --git a/mkgallery.pl b/mkgallery.pl
index bf37ddef5288f395523339c867223b09f58d97b5..bd20c8ca02ee6a46da2b56d0aaf70e52facb4e2b 100755 (executable)
--- a/mkgallery.pl
+++ b/mkgallery.pl
@@ -29,12 +29,13 @@ 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 encoding 'utf-8';
 binmode(STDOUT, ":utf8");
 
 my $haveimagick = eval { require Image::Magick; };
@@ -43,6 +44,9 @@ my $haveimagick = eval { require Image::Magick; };
 my $haverssxml = eval { require XML::RSS; };
 { package XML::RSS; }          # 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";
 
@@ -116,7 +120,6 @@ sub new {
                $class = $this;
                my $root=shift;
                $self = {
-                               -depth=>0,
                                -root=>$root,
                                -fullpath=>$root,
                        };
@@ -158,6 +161,7 @@ sub initpaths {
                                        $pos=index($inc,'/',$pos+1)) {
                        $dp++;
                }
+               $self->{-depth} = $dp;
                for ($pos=length($fullpath);$dp>0 && $pos>0;
                                        $pos=rindex($fullpath,'/',$pos-1)) {
                        $dp--;
@@ -173,14 +177,16 @@ sub initpaths {
                $self->{-inc} = 'NO-.INCLUDE-IN-PATH/'; # won't work anyway
                $self->{-rss} = '';
                $self->{-relpath} = '';
+               $self->{-depth} = 0;
        }
 }
 
 sub initrss {
        my $self=shift;         # this is not a method but we cheat
        my $fullpath=$self->{-fullpath};
+       my $toppath=$self->{-toppath};
        my $inc=$self->{-inc}.$incdir.'/';
-       my $conffile=$self->{-toppath}.'/'.$incdir.'/rss.conf';
+       my $conffile=$toppath.'/'.$incdir.'/rss.conf';
        my $CONF;
 
        if ($rssfile) {
@@ -218,9 +224,16 @@ sub initrss {
                }
                $rssobj->{'rss'}->save($rssobj->{'file'});
        } else {
-               my $link="";
-               for (my $pos=index($rssfile,'/');$pos>=0;
-                                       $pos=index($rssfile,'/',$pos+1)) {
+               my $link;
+               my $p1;
+               my $p2;
+               for ($p1=0,$p2=length($toppath);
+                               substr($rssfile,$p1,3) eq '../' && $p2>0;
+                               $p1+=3,$p2=rindex($toppath,'/',$p2-1)) {;}
+               $link=substr($toppath,$p2);
+               $link =~ s%^/%%;
+               $link .= '/' if ($link);
+               while (($p1=index($rssfile,'/',$p1+1)) >= 0) {
                        $link = '../'.$link;
                }
                
@@ -356,6 +369,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") &&
@@ -589,6 +612,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",
@@ -672,6 +696,9 @@ sub startindex {
                );
                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",
        }
@@ -696,6 +723,10 @@ 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";
 
@@ -712,6 +743,7 @@ sub endindex {
                        title           => $self->{-title},
                        link            => $rsslink,
                        description     => $rsstitle,
+                       pubDate         => time2str(time),
                );
        }
 }
@@ -766,20 +798,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'};