Add a "fullscreen from here" button.

[pr0n] / perl / Sesse / pr0n / Index.pm

diff --git a/perl/Sesse/pr0n/Index.pm b/perl/Sesse/pr0n/Index.pm
index ca02b75003ed4bb54f04d801978ed1e7da8072f1..a00cadf8e23dba933ab70d1869f2ee81a2350353 100644 (file)
--- a/perl/Sesse/pr0n/Index.pm
+++ b/perl/Sesse/pr0n/Index.pm
@@ -152,15 +152,67 @@ sub handler {
                print_nextprev($r, $event, \%settings, \%defsettings);
                print_selected($r, $event, \%settings, \%defsettings) if ($num_selected > 0);
                print_fullscreen($r, $event, \%settings, \%defsettings);
+               
+               # Find the equipment used
+               my $eq = $dbh->prepare('
+                       SELECT 
+                               TRIM(model.value) AS model,
+                               coalesce(TRIM(lens_spec.value), TRIM(lens.value)) AS lens,
+                               COUNT(*) AS num
+                       FROM images i
+                               LEFT JOIN exif_info model ON i.id=model.image
+                               LEFT JOIN ( SELECT * FROM exif_info WHERE tag=\'Lens\' ) lens ON i.id=lens.image
+                               LEFT JOIN ( SELECT * FROM exif_info WHERE tag=\'LensSpec\') lens_spec ON i.id=lens_spec.image
+                       WHERE event=? AND model.tag=\'Model\'
+                       GROUP BY 1,2
+                       ORDER BY 1,2')
+                       or die "Couldn't prepare to find equipment: $!";
+               $eq->execute($event)
+                       or die "Couldn't find equipment: $!";
+
+               my @equipment = ();
+               my %cameras_seen = ();
+               while (my $ref = $eq->fetchrow_hashref) {
+                       if (!defined($ref->{'lens'}) && exists($cameras_seen{$ref->{'model'}})) {
+                               #
+                               # Some compact cameras seem to add lens info sometimes and not at other
+                               # times; if we have seen a camera with at least one specific lens earlier,
+                               # just combine entries without a lens with the previous one.
+                               #
+                               $equipment[$#equipment]->{'num'} += $ref->{'num'};
+                               next;
+                       }
+                       push @equipment, $ref;
+                       $cameras_seen{$ref->{'model'}} = 1;
+               }
+               $eq->finish;
+
+               if (scalar @equipment > 0) {
+                       Sesse::pr0n::Templates::print_template($r, "equipment-start");
+                       for my $e (@equipment) {
+                               my $eqspec = $e->{'model'};
+                               $eqspec .= ', ' . $e->{'lens'} if (defined($e->{'lens'}));
+
+                               # This isn't correct for all languages. Fix if we ever need to care. :-)
+                               if ($e->{'num'} == 1) {
+                                       Sesse::pr0n::Templates::print_template($r, "equipment-item-singular", { eqspec => $eqspec });
+                               } else {
+                                       Sesse::pr0n::Templates::print_template($r, "equipment-item", { eqspec => $eqspec, num => $e->{'num'} });
+                               }
+                       }
+                       Sesse::pr0n::Templates::print_template($r, "equipment-end");
+               }
+
 
                my $toclose = 0;
                my $lastupl = "";
+               my $img_num = $start;
                
                # Print out all thumbnails
                if ($rot == 1) {
                        $r->print("    <form method=\"post\" action=\"/rotate\">\n");
                        $r->print("      <input type=\"hidden\" name=\"event\" value=\"$event\" />\n");
-               
+       
                        while (my $ref = $q->fetchrow_hashref()) {
                                my $imgsz = "";
                                my $takenby = $ref->{'takenby'};
@@ -171,6 +223,7 @@ sub handler {
                                if ($takenby ne $lastupl) {
                                        $lastupl = $takenby;
                                        Sesse::pr0n::Templates::print_template($r, "submittedby", { author => $lastupl });
+                                       print_fullscreen_fromhere($r, $event, \%settings, \%defsettings, $img_num);
                                }
                                if ($ref->{'width'} != -1 && $ref->{'height'} != -1) {
                                        my $width = $ref->{'width'};
@@ -197,13 +250,15 @@ sub handler {
                                        $ref->{'id'} . "-270\" />\n");
                                $r->print("      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" .
                                        "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Del <input type=\"checkbox\" name=\"del-" . $ref->{'id'} . "\" /></p>\n");
+                       
+                               ++$img_num;
                        }
                        $r->print("      <input type=\"submit\" value=\"Rotate\" />\n");
                        $r->print("    </form>\n");
                } elsif ($sel == 1) {
                        $r->print("    <form method=\"post\" action=\"/select\">\n");
                        $r->print("      <input type=\"hidden\" name=\"event\" value=\"$event\" />\n");
-               
+                       
                        while (my $ref = $q->fetchrow_hashref()) {
                                my $imgsz = "";
                                my $takenby = $ref->{'takenby'};
@@ -214,6 +269,7 @@ sub handler {
                                if ($takenby ne $lastupl) {
                                        $lastupl = $takenby;
                                        Sesse::pr0n::Templates::print_template($r, "submittedby", { author => $lastupl });
+                                       print_fullscreen_fromhere($r, $event, \%settings, \%defsettings, $img_num);
                                }
                                if ($ref->{'width'} != -1 && $ref->{'height'} != -1) {
                                        my $width = $ref->{'width'};
@@ -236,6 +292,8 @@ sub handler {
                                $r->print("    <p><a href=\"$uri\"><img src=\"${thumbxres}x${thumbyres}/$filename\" alt=\"\"$imgsz /></a>\n");
                                $r->print("      <input type=\"checkbox\" name=\"sel-" .
                                        $ref->{'id'} . "\"$selected /></p>\n");
+
+                               ++$img_num;
                        }
                        $r->print("      <input type=\"submit\" value=\"Select\" />\n");
                        $r->print("    </form>\n");
@@ -251,6 +309,7 @@ sub handler {
                                        $r->print("    </p>\n\n") if ($lastupl ne "");
                                        $lastupl = $takenby;
                                        Sesse::pr0n::Templates::print_template($r, "submittedby", { author => $lastupl });
+                                       print_fullscreen_fromhere($r, $event, \%settings, \%defsettings, $img_num);
                                        $r->print("    <p>\n");
                                }
                                if ($ref->{'width'} != -1 && $ref->{'height'} != -1) {
@@ -270,6 +329,8 @@ sub handler {
                                }
                                
                                $r->print("      <a href=\"$uri\"><img src=\"${thumbxres}x${thumbyres}/$filename\" alt=\"\"$imgsz /></a>\n");
+                               
+                               ++$img_num;
                        }
                        $r->print("    </p>\n");
                }
@@ -517,6 +578,20 @@ sub print_fullscreen {
        Sesse::pr0n::Common::print_link($r, $title, "/$event/", \%newsettings, $defsettings);
        $r->print("</p>\n");
 }
+
+sub print_fullscreen_fromhere {
+       my ($r, $event, $settings, $defsettings, $start) = @_;
+
+       chomp (my $title = Sesse::pr0n::Templates::fetch_template($r, 'fullscreen-fromhere'));
+
+       my %newsettings = %$settings;
+       $newsettings{'fullscreen'} = 1;
+       $newsettings{'start'} = $start;
+
+        $r->print("    <p class=\"fsfromhere\">");
+       Sesse::pr0n::Common::print_link($r, $title, "/$event/", \%newsettings, $defsettings);
+       $r->print("</p>\n");
+}
        
 1;