X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FIndex.pm;h=1a631ebaea16f5e6746f2d77a1c22402ad1b665a;hp=df06bcee438f271002b2081bd6b491ee08ed6c44;hb=29d3bea6754640ffe4ed735caafa7f497623142d;hpb=ca8871b0a277f2175611515719251caaa39d64b5

diff --git a/perl/Sesse/pr0n/Index.pm b/perl/Sesse/pr0n/Index.pm
index df06bce..1a631eb 100644
--- a/perl/Sesse/pr0n/Index.pm
+++ b/perl/Sesse/pr0n/Index.pm
@@ -77,7 +77,7 @@ sub handler {
 	}
 	
 	# 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;
 	
@@ -88,15 +88,18 @@ sub handler {
 		
 	my %settings = %defsettings;
 
-	for my $s qw(thumbxres thumbyres xres yres start num all infobox rot sel fullscreen model lens author) {
+	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" || $s eq "author") {
+		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);
 		}
 	}
@@ -150,19 +153,19 @@ sub handler {
 	my ($date, $name);
 
 	if ($event eq '+all' || defined($tag)) {
-		$ref = $dbh->selectrow_hashref("SELECT EXTRACT(EPOCH FROM MAX(last_update)) AS last_update FROM events WHERE vhost=?",
+		$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");
 
-		$date = HTML::Entities::encode_entities(Encode::decode_utf8($ref->{'date'}));
-		$name = HTML::Entities::encode_entities(Encode::decode_utf8($ref->{'name'}));
+		$date = HTML::Entities::encode_entities($ref->{'date'});
+		$name = HTML::Entities::encode_entities($ref->{'name'});
 		$r->set_last_modified($ref->{'last_update'});
 	}
 		                
@@ -372,7 +375,7 @@ sub handler {
 
 			my $filename = $ref->{'filename'};
 			my $uri = $infobox . $filename;
-			if (defined($xres) && defined($yres) && $xres != -1) {
+			if (defined($xres) && defined($yres) && $xres != -1 && $xres != -2) {
 				$uri = "${xres}x$yres/$infobox$filename";
 			} elsif (defined($xres) && $xres == -1) {
 				$uri = "original/$infobox$filename";
@@ -476,10 +479,10 @@ sub print_thumbsize {
 }
 sub print_viewres {
 	my ($r, $event, $settings, $defsettings) = @_;
-	my @alternatives = qw(320x256 512x384 640x480 800x600 1024x768 1152x864 1280x960 1400x1050 1600x1200);
+	my @alternatives = qw(320x256 512x384 640x480 800x600 1024x768 1152x864 1280x960 1400x1050 1600x1200 1920x1440 2048x1536 2304x1728);
 	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 ];
+	push @alternatives, [ $unlimited, -2, -2 ];
 	push @alternatives, [ $original, -1, -1 ];
 
 	print_changes($r, $event, 'viewres', $settings, $defsettings,