X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FIndex.pm;h=db07bc816a1ee979fbe9d53220bb2289efbcf071;hp=62c6e253cebb7d6c649911ddb8260c3eebf43877;hb=4e9898a97f5c3c52d1277ed73cb4365b8644870a;hpb=a7a806651933d8731056dbf30d4f461a0f380dd4 diff --git a/perl/Sesse/pr0n/Index.pm b/perl/Sesse/pr0n/Index.pm index 62c6e25..db07bc8 100644 --- a/perl/Sesse/pr0n/Index.pm +++ b/perl/Sesse/pr0n/Index.pm @@ -11,23 +11,34 @@ sub handler { my $apr = Apache2::Request->new($r); my $dbh = Sesse::pr0n::Common::get_dbh(); - my ($event, $abspath, $evselect); + my ($event, $abspath, $datesort, $tag); if ($r->uri =~ /^\/\+all\/?/) { $event = '+all'; $abspath = 1; - $evselect = ''; + $tag = undef; + + # augh, this needs 8.3, so we'll have to fiddle around a bit instead + # $datesort = 'DESC NULLS LAST'; + $datesort = 'DESC'; + } elsif ($r->uri =~ /^\/\+tags\/([a-zA-Z0-9-]+)\/?$/) { + $tag = $1; + $event = "+tags/$tag"; + $abspath = 1; + + $datesort = 'DESC'; } else { # Find the event $r->uri =~ /^\/([a-zA-Z0-9-]+)\/?$/ or error($r, "Could not extract event"); $event = $1; $abspath = 0; - $evselect = 'event=' . $dbh->quote($event) . ' AND '; + $tag = undef; + $datesort = 'ASC'; } # Fix common error: pr0n.sesse.net/event -> pr0n.sesse.net/event/ - if ($r->uri !~ m#/$#) { - $r->headers_out->{'location'} = "/$event/"; + if ($r->uri !~ /\/$/) { + $r->headers_out->{'location'} = $r->uri . "/"; return Apache2::Const::REDIRECT; } @@ -52,10 +63,23 @@ sub handler { rot => 0, sel => 0, fullscreen => 0, + model => undef, + lens => undef, + author => undef ); + my $where; + if (defined($tag)) { + my $tq = $dbh->quote($tag); + $where = " AND id IN ( SELECT image FROM tags WHERE tag=$tq )"; + } elsif ($event eq '+all') { + $where = ''; + } else { + $where = ' AND event=' . $dbh->quote($event); + } + # Any NEF files => default to processing - my $ref = $dbh->selectrow_hashref("SELECT * FROM images WHERE $evselect vhost=? AND LOWER(filename) LIKE '%.nef' LIMIT 1", + my $ref = $dbh->selectrow_hashref("SELECT * FROM images WHERE vhost=? $where AND LOWER(filename) LIKE '%.nef' LIMIT 1", undef, $r->get_server_name) and $defsettings{'xres'} = $defsettings{'yres'} = undef; @@ -66,7 +90,7 @@ sub handler { my %settings = %defsettings; - for my $s qw(thumbxres thumbyres xres yres start num all infobox rot sel fullscreen) { + for my $s qw(thumbxres thumbyres xres yres start num all infobox rot sel fullscreen model lens author) { my $val = $apr->param($s); if (defined($val) && $val =~ /^(\d+)$/) { $settings{$s} = $val; @@ -74,6 +98,9 @@ sub handler { if (($s eq "num" || $s eq "xres" || $s eq "yres") && defined($val) && $val == -1) { $settings{$s} = $val; } + if ($s eq "model" || $s eq "lens" || $s eq "author") { + $settings{$s} = Sesse::pr0n::Common::pretty_unescape($val); + } } my $thumbxres = $settings{'thumbxres'}; @@ -86,6 +113,38 @@ sub handler { my $infobox = $settings{'infobox'} ? '' : 'nobox/'; my $rot = $settings{'rot'}; my $sel = $settings{'sel'}; + my $model = $settings{'model'}; + my $lens = $settings{'lens'}; + my $author = $settings{'author'}; + + # Construct SQL for this filter + if ($all == 0) { + $where .= ' AND selected=\'t\''; + } + if (defined($model) && defined($lens)) { + my $mq = $dbh->quote($model); + my $lq = $dbh->quote($lens); + + if ($model eq '') { + # no defined model + $where .= " AND id NOT IN ( SELECT image FROM exif_info WHERE key='Model' AND TRIM(value)<>'' )"; + } else { + $where .= " AND id IN ( SELECT image FROM exif_info WHERE key='Model' AND TRIM(value)=$mq )"; + } + + # This doesn't match 1:1 if there's both lens and lensspec, but it should be OK in practice + if ($lens eq '') { + # no defined lens + $where .= " AND id NOT IN ( SELECT image FROM exif_info WHERE (key='Lens' OR key='LensSpec') AND TRIM(value)<>'' )"; + } else { + $where .= " AND id IN ( SELECT image FROM exif_info WHERE (key='Lens' OR key='LensSpec') AND TRIM(value)=$lq )"; + } + } + if (defined($author)) { + my $aq = $dbh->quote($author); + + $where .= " AND takenby=$aq"; + } if (defined($num) && $num == -1) { $num = undef; @@ -93,7 +152,7 @@ sub handler { my ($date, $name); - if ($event eq '+all') { + if ($event eq '+all' || defined($tag)) { $ref = $dbh->selectrow_hashref("SELECT EXTRACT(EPOCH FROM MAX(last_update)) AS last_update FROM events WHERE vhost=?", undef, $r->get_server_name) or error($r, "Could not list events", 404, "File not found"); @@ -101,8 +160,8 @@ sub handler { $name = Sesse::pr0n::Templates::fetch_template($r, 'all-event-title'); $r->set_last_modified($ref->{'last_update'}); } else { - $ref = $dbh->selectrow_hashref("SELECT name,date,EXTRACT(EPOCH FROM last_update) AS last_update FROM events WHERE $evselect vhost=?", - undef, $r->get_server_name) + $ref = $dbh->selectrow_hashref("SELECT name,date,EXTRACT(EPOCH FROM last_update) AS last_update FROM events WHERE vhost=? AND event=?", + undef, $r->get_server_name, $event) or error($r, "Could not find event $event", 404, "File not found"); $date = HTML::Entities::encode_entities(Encode::decode_utf8($ref->{'date'})); @@ -116,14 +175,13 @@ sub handler { } # Count the number of selected images. - $ref = $dbh->selectrow_hashref("SELECT COUNT(*) AS num_selected FROM images WHERE $evselect vhost=? AND selected=\'t\'", undef, $r->get_server_name); + $ref = $dbh->selectrow_hashref("SELECT COUNT(*) AS num_selected FROM images WHERE vhost=? $where AND selected=\'t\'", undef, $r->get_server_name); my $num_selected = $ref->{'num_selected'}; # Find all images related to this event. - my $where = ($all == 0) ? ' AND selected=\'t\'' : ''; my $limit = (defined($start) && defined($num) && !$settings{'fullscreen'}) ? (" LIMIT $num OFFSET " . ($start-1)) : ""; - my $q = $dbh->prepare("SELECT *, (date - INTERVAL '6 hours')::date AS day FROM images WHERE $evselect vhost=? $where ORDER BY (date - INTERVAL '6 hours')::date,takenby,date,filename $limit") + my $q = $dbh->prepare("SELECT *, (date - INTERVAL '6 hours')::date AS day FROM images WHERE vhost=? $where ORDER BY COALESCE((date - INTERVAL '6 hours')::date, '1970-01-01') $datesort,takenby,date,filename $limit") or dberror($r, "prepare()"); $q->execute($r->get_server_name) or dberror($r, "image enumeration"); @@ -131,9 +189,23 @@ sub handler { # Print the page itself if ($settings{'fullscreen'}) { $r->content_type("text/html; charset=utf-8"); - Sesse::pr0n::Templates::print_template($r, "fullscreen-header", { title => "$name [$event]" }); + + if (defined($tag)) { + my $title = Sesse::pr0n::Templates::process_template($r, "tag-title", { tag => $tag }); + Sesse::pr0n::Templates::print_template($r, "fullscreen-header", { title => $title }); + } else { + Sesse::pr0n::Templates::print_template($r, "fullscreen-header", { title => "$name [$event]" }); + } + + my @files = (); while (my $ref = $q->fetchrow_hashref()) { - $r->print(" \"" . $infobox . $ref->{'filename'} . "\",\n"); + push @files, [ $ref->{'event'}, $ref->{'filename'} ]; + } + + for my $i (0..$#files) { + $r->print(" [ \"" . $files[$i]->[0] . "\", \"" . $files[$i]->[1] . "\" ]"); + $r->print(",") unless ($i == $#files); + $r->print("\n"); } my %settings_no_fullscreen = %settings; @@ -147,13 +219,18 @@ sub handler { Sesse::pr0n::Templates::print_template($r, "fullscreen-footer", { vhost => $r->get_server_name, - event => $event, start => $settings{'start'} - 1, returnurl => $returnurl, sel => $settings{'sel'}, + infobox => $infobox }); } else { - Sesse::pr0n::Common::header($r, "$name [$event]"); + if (defined($tag)) { + my $title = Sesse::pr0n::Templates::process_template($r, "tag-title", { tag => $tag }); + Sesse::pr0n::Common::header($r, $title); + } else { + Sesse::pr0n::Common::header($r, "$name [$event]"); + } if (defined($date)) { Sesse::pr0n::Templates::print_template($r, "date", { date => $date }); } @@ -168,20 +245,20 @@ sub handler { print_infobox($r, $event, \%settings, \%defsettings); print_selected($r, $event, \%settings, \%defsettings) if ($num_selected > 0); print_fullscreen($r, $event, \%settings, \%defsettings); - print_nextprev($r, $event, $evselect, \%settings, \%defsettings); + print_nextprev($r, $event, $where, \%settings, \%defsettings); - if ($event ne '+all') { + if (1 || $event ne '+all') { # 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 ( SELECT * FROM images WHERE $evselect vhost=? $where ORDER BY (date - INTERVAL '6 hours')::date,takenby,date,filename ) i + FROM ( SELECT * FROM images WHERE vhost=? $where ) 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 model.tag='Model' + LEFT JOIN ( SELECT * FROM exif_info WHERE key='Lens' ) lens ON i.id=lens.image + LEFT JOIN ( SELECT * FROM exif_info WHERE key='LensSpec') lens_spec ON i.id=lens_spec.image + WHERE model.key='Model' GROUP BY 1,2 ORDER BY 1,2") or die "Couldn't prepare to find equipment: $!"; @@ -210,12 +287,30 @@ sub handler { for my $e (@equipment) { my $eqspec = $e->{'model'}; $eqspec .= ', ' . $e->{'lens'} if (defined($e->{'lens'})); + $eqspec = HTML::Entities::encode_entities($eqspec); + + my %newsettings = %settings; + + my $action; + if (defined($model) && defined($lens)) { + chomp ($action = Sesse::pr0n::Templates::fetch_template($r, "unfilter")); + $newsettings{'model'} = undef; + $newsettings{'lens'} = undef; + $newsettings{'start'} = 1; + } else { + chomp ($action = Sesse::pr0n::Templates::fetch_template($r, "filter")); + $newsettings{'model'} = $e->{'model'}; + $newsettings{'lens'} = defined($e->{'lens'}) ? $e->{'lens'} : ''; + $newsettings{'start'} = 1; + } + + my $url = "/$event/" . Sesse::pr0n::Common::get_query_string(\%newsettings, \%defsettings); # 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 }); + Sesse::pr0n::Templates::print_template($r, "equipment-item-singular", { eqspec => $eqspec, filterurl => $url, action => $action }); } else { - Sesse::pr0n::Templates::print_template($r, "equipment-item", { eqspec => $eqspec, num => $e->{'num'} }); + Sesse::pr0n::Templates::print_template($r, "equipment-item", { eqspec => $eqspec, num => $e->{'num'}, filterurl => $url, action => $action }); } } Sesse::pr0n::Templates::print_template($r, "equipment-end"); @@ -230,43 +325,74 @@ sub handler { if ($rot == 1) { $r->print("
\n"); $r->print(" \n"); - - while (my $ref = $q->fetchrow_hashref()) { - my $imgsz = ""; - my $takenby = $ref->{'takenby'}; - if (defined($ref->{'day'})) { - $takenby .= ", " . $ref->{'day'}; - } + } - if ($takenby ne $lastupl) { - $lastupl = $takenby; - $r->print("

"); - Sesse::pr0n::Templates::print_template($r, "submittedby", { author => $lastupl }); - print_fullscreen_fromhere($r, $event, \%settings, \%defsettings, $img_num); - $r->print("

\n"); - } - if ($ref->{'width'} != -1 && $ref->{'height'} != -1) { - my $width = $ref->{'width'}; - my $height = $ref->{'height'}; - - ($width, $height) = Sesse::pr0n::Common::scale_aspect($width, $height, $thumbxres, $thumbyres); - $imgsz = " width=\"$width\" height=\"$height\""; - } + while (my $ref = $q->fetchrow_hashref()) { + my $imgsz = ""; + my $takenby = $ref->{'takenby'}; + my $day = ''; + if (defined($ref->{'day'})) { + $day = ", " . $ref->{'day'}; + } - my $filename = $ref->{'filename'}; - my $uri = $infobox . $filename; - if (defined($xres) && defined($yres) && $xres != -1) { - $uri = "${xres}x$yres/$infobox$filename"; - } elsif (defined($xres) && $xres == -1) { - $uri = "original/$infobox$filename"; + if ($takenby ne $lastupl) { + $r->print("

\n\n") if ($lastupl ne "" && $rot != 1); + $lastupl = $takenby; + + my %newsettings = %settings; + + my $action; + if (defined($author)) { + chomp ($action = Sesse::pr0n::Templates::fetch_template($r, "unfilter")); + $newsettings{'author'} = undef; + $newsettings{'start'} = 1; + } else { + chomp ($action = Sesse::pr0n::Templates::fetch_template($r, "filter")); + $newsettings{'author'} = $ref->{'takenby'}; + $newsettings{'start'} = 1; } - my $prefix = ""; - if ($abspath) { - $prefix = "/" . $ref->{'event'} . "/"; + my $url = "/$event/" . Sesse::pr0n::Common::get_query_string(\%newsettings, \%defsettings); + + $r->print("

"); + Sesse::pr0n::Templates::print_template($r, "submittedby", { author => $lastupl, action => $action, filterurl => $url, date => $day }); + print_fullscreen_fromhere($r, $event, \%settings, \%defsettings, $img_num); + $r->print("

\n"); + + if ($rot != 1) { + $r->print("

\n"); } + } + + if ($ref->{'width'} != -1 && $ref->{'height'} != -1) { + my $width = $ref->{'width'}; + my $height = $ref->{'height'}; + + ($width, $height) = Sesse::pr0n::Common::scale_aspect($width, $height, $thumbxres, $thumbyres); + $imgsz = " width=\"$width\" height=\"$height\""; + } - $r->print("

\"\"$imgsz\n"); + my $filename = $ref->{'filename'}; + my $uri = $infobox . $filename; + if (defined($xres) && defined($yres) && $xres != -1) { + $uri = "${xres}x$yres/$infobox$filename"; + } elsif (defined($xres) && $xres == -1) { + $uri = "original/$infobox$filename"; + } + + my $prefix = ""; + if ($abspath) { + $prefix = "/" . $ref->{'event'} . "/"; + } + + if ($rot == 1) { + $r->print("

"); + } else { + $r->print(" "); + } + $r->print("\"\"$imgsz\n"); + + if ($rot == 1) { $r->print(" 90 {'id'} . "-90\" />\n"); $r->print(" 180 {'id'} . "-270\" />\n"); $r->print("        " . "     Del {'id'} . "\" />

\n"); - - ++$img_num; } + + ++$img_num; + } + + if ($rot == 1) { $r->print(" \n"); $r->print("
\n"); } else { - while (my $ref = $q->fetchrow_hashref()) { - my $imgsz = ""; - my $takenby = $ref->{'takenby'}; - if (defined($ref->{'day'})) { - $takenby .= ", " . $ref->{'day'}; - } - - if ($takenby ne $lastupl) { - $r->print("

\n\n") if ($lastupl ne ""); - $lastupl = $takenby; - $r->print("

"); - Sesse::pr0n::Templates::print_template($r, "submittedby", { author => $lastupl }); - print_fullscreen_fromhere($r, $event, \%settings, \%defsettings, $img_num); - $r->print("

\n"); - $r->print("

\n"); - } - if ($ref->{'width'} != -1 && $ref->{'height'} != -1) { - my $width = $ref->{'width'}; - my $height = $ref->{'height'}; - - ($width, $height) = Sesse::pr0n::Common::scale_aspect($width, $height, $thumbxres, $thumbyres); - $imgsz = " width=\"$width\" height=\"$height\""; - } - - my $filename = $ref->{'filename'}; - my $uri = $infobox . $filename; - if (defined($xres) && defined($yres) && $xres != -1) { - $uri = "${xres}x$yres/$infobox$filename"; - } elsif (defined($xres) && $xres == -1) { - $uri = "original/$infobox$filename"; - } - - my $prefix = ""; - if ($abspath) { - $prefix = "/" . $ref->{'event'} . "/"; - } - - $r->print(" \"\"$imgsz\n"); - - ++$img_num; - } $r->print("

\n"); } - print_nextprev($r, $event, $evselect, \%settings, \%defsettings); + print_nextprev($r, $event, $where, \%settings, \%defsettings); Sesse::pr0n::Common::footer($r); } @@ -463,18 +551,16 @@ sub print_infobox { } sub print_nextprev { - my ($r, $event, $evselect, $settings, $defsettings) = @_; + my ($r, $event, $where, $settings, $defsettings) = @_; my $start = $settings->{'start'}; my $num = $settings->{'num'}; - my $all = $settings->{'all'}; my $dbh = Sesse::pr0n::Common::get_dbh(); - my $where = ($all == 0) ? ' AND selected=\'t\'' : ''; $num = undef if (defined($num) && $num == -1); return unless (defined($start) && defined($num)); # determine total number - my $ref = $dbh->selectrow_hashref("SELECT count(*) AS num_images FROM images WHERE $evselect vhost=? $where", + my $ref = $dbh->selectrow_hashref("SELECT count(*) AS num_images FROM images WHERE vhost=? $where", undef, $r->get_server_name) or dberror($r, "image enumeration"); my $num_images = $ref->{'num_images'}; @@ -580,9 +666,9 @@ sub print_fullscreen_fromhere { $newsettings{'fullscreen'} = 1; $newsettings{'start'} = $start; - $r->print("

"); + $r->print(" "); Sesse::pr0n::Common::print_link($r, $title, "/$event/", \%newsettings, $defsettings); - $r->print("

\n"); + $r->print("\n"); } 1;