add tooltips

[mkgallery.git] / mkgallery.pl

diff --git a/mkgallery.pl b/mkgallery.pl
index c61e22c293f2214b78c327c54be491595669c0f2..452d5da27f5520d55bc430cc09483595b2e1c524 100755 (executable)
--- a/mkgallery.pl
+++ b/mkgallery.pl
@@ -28,8 +28,8 @@ package FsObj;
 
 use strict;
 use Carp;
-use POSIX qw/getcwd/;
-use CGI qw/:html *table *center *div/;
+use POSIX qw/getcwd strftime/;
+use CGI qw/:html *table *Tr *center *div/;
 use Image::Info qw/image_info dim/;
 use Term::ReadLine;
 use Getopt::Long;
@@ -216,11 +216,49 @@ sub isimg {
                }
                return 0;
        }
+
+       tryapp12($info) unless ($info->{'ExifVersion'});
+
        $self->{-isimg} = 1;
        $self->{-info} = $info;
        return 1;
 }
 
+sub tryapp12 {
+       my $info = shift;       # this is not a method
+       my $app12;
+       # dirty hack to take care of Image::Info parser strangeness
+       foreach my $k(keys %$info) {
+               $app12=substr($k,6).$info->{$k} if ($k =~ /^App12-/);
+       }
+       return unless ($app12); # bad luck
+       my $seenfirstline=0;
+       foreach my $ln(split /[\r\n]+/,$app12) {
+               $ln =~ s/[[:^print:]\000]/ /g;
+               unless ($seenfirstline) {
+                       $seenfirstline=1;
+                       $info->{'Make'}=$ln;
+                       next;
+               }
+               my ($k,$v)=split /=/,$ln,2;
+               if ($k eq 'TimeDate') {
+                       $info->{'DateTime'} =
+                               strftime("%Y:%m:%d %H:%M:%S", localtime($v))
+                                                       unless ($v < 0);
+               } elsif ($k eq 'Shutter') {
+                       $info->{'ExposureTime'} = '1/'.int(1000000/$v+.5);
+               } elsif ($k eq 'Flash') {
+                       $info->{'Flash'} = $v?'Flash fired':'Flash did not fire';
+               } elsif ($k eq 'Type') {
+                       $info->{'Model'} = $v;
+               } elsif ($k eq 'Version') {
+                       $info->{'Software'} = $v;
+               } elsif ($k eq 'Fnumber') {
+                       $info->{'FNumber'} = $v;
+               }
+       }
+}
+
 sub initdir {
        my $self = shift;
        my $fullpath = $self->{-fullpath};
@@ -323,7 +361,7 @@ sub makeaux {
        # slideshow
        for my $refresh('static', 'slide') {
                my $fn = sprintf("%s/.html/%s-%s.html",$dn,$name,$refresh);
-               my $imgsrc = sprintf("../.%s/%s",$sizes[1],$name);
+               my $imgsrc = '../'.$self->{$sizes[1]};
                my $fwdref;
                my $bakref;
                if ($nref) {
@@ -365,13 +403,16 @@ sub makeaux {
                                ),"\n";
                }
                print $F start_center,"\n",
-                       h1($title),
-                       a({-href=>"../index.html"},"Index")," | ",
-                       a({-href=>$bakref},"&lt;&lt;Prev")," | ",
-                       a({-href=>$toggleref},$toggletext)," | ",
-                       a({-href=>$fwdref},"Next&gt;&gt;"),
-                       p,
-                       img({-src=>$imgsrc}),"\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",
                        end_center,"\n",
                        end_html,"\n";
                close($F);
@@ -488,13 +529,13 @@ sub img_entry {
                end_div,"\n";
 
        print $IND table({-class=>'slide'},Tr(td(
-               a({-href=>".html/$name-info.html",
+               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},"($w x $h)"),
+               a({-href=>$name,-title=>'Original Image'},"($w x $h)"),
                br))),"\n";
 }