X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FIndex.pm;h=0fbd82893b41051d8a944eecbf3228844a899e10;hp=39c5da43f97000fef1a96b401ebd3239efece9e5;hb=211db32f412b945988bae2a6014ff76017c42282;hpb=42d4fc8288f205794e964cacb04871ef04f01043 diff --git a/perl/Sesse/pr0n/Index.pm b/perl/Sesse/pr0n/Index.pm index 39c5da4..0fbd828 100644 --- a/perl/Sesse/pr0n/Index.pm +++ b/perl/Sesse/pr0n/Index.pm @@ -11,13 +11,20 @@ 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'; + } elsif ($r->uri =~ /^\/\+tags\/([a-zA-Z0-9-]+)\/?$/) { + $tag = $1; + $event = "+tags/$tag"; + $abspath = 1; + $datesort = 'DESC'; } else { # Find the event @@ -25,12 +32,13 @@ sub handler { or error($r, "Could not extract event"); $event = $1; $abspath = 0; + $tag = undef; $datesort = 'ASC'; } # 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,18 +57,22 @@ 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); @@ -78,7 +90,7 @@ 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; @@ -86,9 +98,8 @@ 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; + if ($s eq "model" || $s eq "lens" || $s eq "author") { + $settings{$s} = Sesse::pr0n::Common::pretty_unescape($val); } } @@ -104,6 +115,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 +127,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,7 +151,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"); @@ -172,9 +188,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 +214,37 @@ sub handler { my $returnurl = "http://" . $r->get_server_name . "/" . $event . "/" . Sesse::pr0n::Common::get_query_string(\%settings_no_fullscreen, \%defsettings); + + my %settings_bookmark = %settings; + $settings_bookmark{'start'} = $defsettings{'start'}; + my $bookmark_url_base = "http://" . $r->get_server_name . "/" . $event . "/" . + Sesse::pr0n::Common::get_query_string(\%settings_bookmark, \%defsettings); + + if ($bookmark_url_base =~ /\?/) { + $bookmark_url_base .= ';start='; + } else { + $bookmark_url_base .= '?start='; + } # *whistle* $returnurl =~ s/&/&/g; + $bookmark_url_base =~ s/&/&/g; Sesse::pr0n::Templates::print_template($r, "fullscreen-footer", { vhost => $r->get_server_name, start => $settings{'start'} - 1, returnurl => $returnurl, + bookmarkurlbase => $bookmark_url_base, 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 +264,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 +307,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 +336,76 @@ 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 $groupkey = $takenby . $day; + + if ($groupkey ne $lastupl) { + $r->print("

\n\n") if ($lastupl ne "" && $rot != 1); + $lastupl = $groupkey; - 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 %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 => $takenby, 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 (defined($ref->{'width'}) && defined($ref->{'height'})) { + 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"); } @@ -447,7 +491,7 @@ sub print_thumbsize { } sub print_viewres { my ($r, $event, $settings, $defsettings) = @_; - my @alternatives = qw(320x256 512x384 640x480 800x600 1024x768 1280x960); + my @alternatives = qw(320x256 512x384 640x480 800x600 1024x768 1280x960 1400x1050 1600x1200); chomp (my $unlimited = Sesse::pr0n::Templates::fetch_template($r, 'viewres-unlimited')); chomp (my $original = Sesse::pr0n::Templates::fetch_template($r, 'viewres-original')); push @alternatives, [ $unlimited, undef, undef ]; @@ -466,7 +510,7 @@ sub print_pagelimit { # Get choices chomp (my $unlimited = Sesse::pr0n::Templates::fetch_template($r, 'imgsperpage-unlimited')); - my @alternatives = qw(10 50 100 500); + my @alternatives = qw(10 50 100 250 500); push @alternatives, $unlimited; for my $num (@alternatives) { @@ -635,9 +679,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;