X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FIndex.pm;h=b8825bdb748fd0e6ddd01902737d52546d4e89a5;hp=f28245cb0fdb609af5c087f88f2db052e43d56b2;hb=927b8258de3030178d59304b9b45648930482d49;hpb=4027d980629cd7b6fa9f7999c66fba098fd3de4c diff --git a/perl/Sesse/pr0n/Index.pm b/perl/Sesse/pr0n/Index.pm index f28245c..b8825bd 100644 --- a/perl/Sesse/pr0n/Index.pm +++ b/perl/Sesse/pr0n/Index.pm @@ -11,16 +11,21 @@ sub handler { my $apr = Apache2::Request->new($r); my $dbh = Sesse::pr0n::Common::get_dbh(); - my ($event, $abspath); + my ($event, $abspath, $datesort); if ($r->uri =~ /^\/\+all\/?/) { $event = '+all'; $abspath = 1; + + # augh, this needs 8.3, so we'll have to fiddle around a bit instead + # $datesort = 'DESC NULLS LAST'; + $datesort = 'DESC'; } else { # Find the event $r->uri =~ /^\/([a-zA-Z0-9-]+)\/?$/ or error($r, "Could not extract event"); $event = $1; $abspath = 0; + $datesort = 'ASC'; } # Fix common error: pr0n.sesse.net/event -> pr0n.sesse.net/event/ @@ -50,9 +55,10 @@ sub handler { rot => 0, sel => 0, fullscreen => 0, + model => undef, + lens => undef ); - # Construct SQL for this filter my $where; if ($event eq '+all') { $where = ''; @@ -72,7 +78,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) { my $val = $apr->param($s); if (defined($val) && $val =~ /^(\d+)$/) { $settings{$s} = $val; @@ -80,6 +86,10 @@ 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") { + $val =~ s/_/ /g; + $settings{$s} = $val; + } } my $thumbxres = $settings{'thumbxres'}; @@ -92,10 +102,32 @@ sub handler { my $infobox = $settings{'infobox'} ? '' : 'nobox/'; my $rot = $settings{'rot'}; my $sel = $settings{'sel'}; - + my $model = $settings{'model'}; + my $lens = $settings{'lens'}; + + # 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 tag='Model' AND TRIM(value)<>'' )"; + } else { + $where .= " AND id IN ( SELECT image FROM exif_info WHERE tag='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 (tag='Lens' OR tag='LensSpec') AND TRIM(value)<>'' )"; + } else { + $where .= " AND id IN ( SELECT image FROM exif_info WHERE (tag='Lens' OR tag='LensSpec') AND TRIM(value)=$lq )"; + } + } if (defined($num) && $num == -1) { $num = undef; @@ -111,8 +143,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 vhost=? $where", - 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'})); @@ -132,7 +164,7 @@ sub handler { # Find all images related to this event. 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 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"); @@ -142,7 +174,7 @@ sub handler { $r->content_type("text/html; charset=utf-8"); Sesse::pr0n::Templates::print_template($r, "fullscreen-header", { title => "$name [$event]" }); while (my $ref = $q->fetchrow_hashref()) { - $r->print(" \"" . $infobox . $ref->{'filename'} . "\",\n"); + $r->print(" [ \"" . $ref->{'event'} . "\", \"" . $ref->{'filename'} . "\" ],\n"); } my %settings_no_fullscreen = %settings; @@ -156,10 +188,10 @@ 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]"); @@ -179,7 +211,7 @@ sub handler { print_fullscreen($r, $event, \%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 @@ -219,12 +251,28 @@ 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 = %defsettings; + + my $action; + if (defined($model) && defined($lens)) { + chomp ($action = Sesse::pr0n::Templates::fetch_template($r, "unfilter")); + $newsettings{'model'} = undef; + $newsettings{'lens'} = undef; + } else { + chomp ($action = Sesse::pr0n::Templates::fetch_template($r, "filter")); + $newsettings{'model'} = $e->{'model'}; + $newsettings{'lens'} = defined($e->{'lens'}) ? $e->{'lens'} : ''; + } + + 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");