X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FImage.pm;h=f12a15891792ed1ba0e195e815c4c157df2d1b29;hp=6a4f7a80e71a64f2653d1a2d5d596a04c065aa18;hb=6cd0332e10bb468ef5506be63b8a47f7c7e12fd9;hpb=c53dd5ce79ebfdcf01c3847149611ebafcebdd69

diff --git a/perl/Sesse/pr0n/Image.pm b/perl/Sesse/pr0n/Image.pm
index 6a4f7a8..f12a158 100644
--- a/perl/Sesse/pr0n/Image.pm
+++ b/perl/Sesse/pr0n/Image.pm
@@ -42,16 +42,29 @@ sub handler {
 	#} else {
 	
 	# Look it up in the database
-	my $ref = $dbh->selectrow_hashref('SELECT id,width,height FROM images WHERE event=? AND vhost=? AND filename=?',
+	my $ref = $dbh->selectrow_hashref('SELECT id,render_id,width,height FROM images WHERE event=? AND vhost=? AND filename=?',
 		undef, $event, Sesse::pr0n::Common::get_server_name($r), $filename);
 	return error($r, "Could not find $event/$filename", 404, "File not found") unless (defined($ref));
 
+	if (defined($xres) && defined($yres) && defined($ref->{'render_id'}) && !$infobox) {
+		# We have a render, we're not asked for the original, and we do not have infobox.
+		$ref = $dbh->selectrow_hashref('SELECT id,filename,width,height FROM images WHERE id=?', 
+			undef, $ref->{'render_id'});
+		return error($r, "Could not find render of $event/$filename", 404, "File not found") unless (defined($ref));
+		$filename = $ref->{'filename'};
+	}
+
 	$id = $ref->{'id'};
 	$dbwidth = $ref->{'width'};
 	$dbheight = $ref->{'height'};
 
 	# Scale if we need to do so
-	my ($fname, $mime_type) = Sesse::pr0n::Common::ensure_cached($r, $filename, $id, $dbwidth, $dbheight, $infobox, $dpr, $xres, $yres);
+	my ($fname, $mime_type);
+	if ($infobox) {
+		($fname, $mime_type) = Sesse::pr0n::Common::ensure_infobox_cached($r, $filename, $id, $dbwidth, $dbheight, $dpr, $xres, $yres);
+	} else {
+		($fname, $mime_type) = Sesse::pr0n::Common::ensure_cached($r, $filename, $id, $dbwidth, $dbheight, $xres, $yres);
+	}
 
 	# Output the image to the user
 	my $res = Plack::Response->new(200);