X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FIndex.pm;h=22d233b1d26276cfe0e3ae94eb408a13af79b21b;hb=060aaacf0d15a03ed7287cf81169f630a1a1f95b;hp=39c5da43f97000fef1a96b401ebd3239efece9e5;hpb=42d4fc8288f205794e964cacb04871ef04f01043;p=pr0n diff --git a/perl/Sesse/pr0n/Index.pm b/perl/Sesse/pr0n/Index.pm index 39c5da4..22d233b 100644 --- a/perl/Sesse/pr0n/Index.pm +++ b/perl/Sesse/pr0n/Index.pm @@ -11,26 +11,32 @@ sub handler { my $apr = Apache2::Request->new($r); my $dbh = Sesse::pr0n::Common::get_dbh(); - my ($event, $abspath, $datesort); + my ($event, $abspath, $datesort, $tag); if ($r->uri =~ /^\/\+all\/?/) { $event = '+all'; $abspath = 1; + $tag = undef; - # augh, this needs 8.3, so we'll have to fiddle around a bit instead - # $datesort = 'DESC NULLS LAST'; - $datesort = 'DESC'; + $datesort = 'DESC NULLS LAST'; + } elsif ($r->uri =~ /^\/\+tags\/([a-zA-Z0-9-]+)\/?$/) { + $tag = $1; + $event = "+tags/$tag"; + $abspath = 1; + + $datesort = 'DESC NULLS LAST'; } else { # Find the event $r->uri =~ /^\/([a-zA-Z0-9-]+)\/?$/ or error($r, "Could not extract event"); $event = $1; $abspath = 0; - $datesort = 'ASC'; + $tag = undef; + $datesort = 'ASC NULLS LAST'; } # Fix common error: pr0n.sesse.net/event -> pr0n.sesse.net/event/ if ($r->uri !~ /\/$/) { - $r->headers_out->{'location'} = "/$event/"; + $r->headers_out->{'location'} = $r->uri . "/"; return Apache2::Const::REDIRECT; } @@ -49,25 +55,29 @@ sub handler { xres => -1, yres => -1, start => 1, - num => 100, + num => 250, all => 1, infobox => 1, rot => 0, sel => 0, fullscreen => 0, model => undef, - lens => undef + lens => undef, + author => undef ); my $where; - if ($event eq '+all') { + 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 vhost=? $where AND LOWER(filename) LIKE '%.nef' LIMIT 1", + my $ref = $dbh->selectrow_hashref("SELECT * FROM images WHERE vhost=? $where AND ( LOWER(filename) LIKE '%.nef' OR LOWER(filename) LIKE '%.cr2' ) LIMIT 1", undef, $r->get_server_name) and $defsettings{'xres'} = $defsettings{'yres'} = undef; @@ -78,18 +88,20 @@ sub handler { my %settings = %defsettings; - for my $s qw(thumbxres thumbyres xres yres start num all infobox rot sel fullscreen model lens) { + 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; } - if (($s eq "num" || $s eq "xres" || $s eq "yres") && defined($val) && $val == -1) { + if ($s eq "num" && defined($val) && $val == -1) { $settings{$s} = $val; } - if ($s eq "model" || $s eq "lens") { - $val =~ s/_/ /g; + if (($s eq "xres" || $s eq "yres") && defined($val) && ($val == -1 || $val == -2)) { $settings{$s} = $val; } + if (($s eq "model" || $s eq "lens" || $s eq "author") && defined($val)) { + $settings{$s} = Sesse::pr0n::Common::pretty_unescape($val); + } } my $thumbxres = $settings{'thumbxres'}; @@ -104,6 +116,7 @@ sub handler { my $sel = $settings{'sel'}; my $model = $settings{'model'}; my $lens = $settings{'lens'}; + my $author = $settings{'author'}; # Construct SQL for this filter if ($all == 0) { @@ -115,19 +128,23 @@ sub handler { if ($model eq '') { # no defined model - $where .= " AND id NOT IN ( SELECT image FROM exif_info WHERE key='Model' AND TRIM(value)<>'' )"; + $where .= " AND model IS NULL"; } else { - $where .= " AND id IN ( SELECT image FROM exif_info WHERE key='Model' AND TRIM(value)=$mq )"; + $where .= " AND model=$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)<>'' )"; + $where .= " AND lens IS NULL"; } else { - $where .= " AND id IN ( SELECT image FROM exif_info WHERE (key='Lens' OR key='LensSpec') AND TRIM(value)=$lq )"; + $where .= " AND lens=$lq"; } } + if (defined($author)) { + my $aq = $dbh->quote($author); + + $where .= " AND takenby=$aq"; + } if (defined($num) && $num == -1) { $num = undef; @@ -135,15 +152,15 @@ sub handler { my ($date, $name); - if ($event eq '+all') { - $ref = $dbh->selectrow_hashref("SELECT EXTRACT(EPOCH FROM MAX(last_update)) AS last_update FROM events WHERE vhost=?", + if ($event eq '+all' || defined($tag)) { + $ref = $dbh->selectrow_hashref("SELECT EXTRACT(EPOCH FROM MAX(last_update)) AS last_update FROM last_picture_cache WHERE vhost=?", undef, $r->get_server_name) or error($r, "Could not list events", 404, "File not found"); $date = undef; $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=? AND event=?", + $ref = $dbh->selectrow_hashref("SELECT name,date,EXTRACT(EPOCH FROM last_update) AS last_update FROM events NATURAL JOIN last_picture_cache WHERE vhost=? AND event=?", undef, $r->get_server_name, $event) or error($r, "Could not find event $event", 404, "File not found"); @@ -164,7 +181,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 COALESCE((date - INTERVAL '6 hours')::date, '1970-01-01') $datesort,takenby,date,filename $limit") + my $q = $dbh->prepare("SELECT *, (date - INTERVAL '6 hours')::date AS day FROM images WHERE vhost=? $where ORDER BY (date - INTERVAL '6 hours')::date $datesort,takenby,date,filename $limit") or dberror($r, "prepare()"); $q->execute($r->get_server_name) or dberror($r, "image enumeration"); @@ -172,9 +189,25 @@ 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(" [ \"" . $ref->{'event'} . "\", \"" . $ref->{'filename'} . "\" ],\n"); + my $width = defined($ref->{'width'}) ? $ref->{'width'} : -1; + my $height = defined($ref->{'height'}) ? $ref->{'height'} : -1; + push @files, [ $ref->{'event'}, $ref->{'filename'}, $width, $height ]; + } + + for my $i (0..$#files) { + my $line = sprintf " [ \"%s\", \"%s\", %d, %d ]", @{$files[$i]}; + $line .= "," unless ($i == $#files); + $r->print($line . "\n"); } my %settings_no_fullscreen = %settings; @@ -182,19 +215,24 @@ sub handler { my $returnurl = "http://" . $r->get_server_name . "/" . $event . "/" . Sesse::pr0n::Common::get_query_string(\%settings_no_fullscreen, \%defsettings); - + # *whistle* $returnurl =~ s/&/&/g; Sesse::pr0n::Templates::print_template($r, "fullscreen-footer", { vhost => $r->get_server_name, - start => $settings{'start'} - 1, returnurl => $returnurl, + start => $settings{'start'} - 1, 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 }); } @@ -214,15 +252,12 @@ sub handler { 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, + SELECT + model, + lens, COUNT(*) AS num - 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 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' + FROM images + WHERE vhost=? $where GROUP BY 1,2 ORDER BY 1,2") or die "Couldn't prepare to find equipment: $!"; @@ -260,10 +295,12 @@ sub handler { 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); @@ -287,43 +324,76 @@ sub handler { if ($rot == 1) { $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("\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(" \n");
-
- ++$img_num;
- }
$r->print("
"); + $r->print(" "); Sesse::pr0n::Common::print_link($r, $title, "/$event/", \%newsettings, $defsettings); - $r->print("
\n"); + $r->print("\n"); } 1;