X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FImage.pm;h=372a9b19e5756a2ca85bd44949c5c2e2b623c7e0;hp=7f3e3c09825a015f9295c40f2541c2c53dea60a6;hb=bf395f582ddf4acd911cdeecca86b24fbc0e833f;hpb=4e9898a97f5c3c52d1277ed73cb4365b8644870a

diff --git a/perl/Sesse/pr0n/Image.pm b/perl/Sesse/pr0n/Image.pm
index 7f3e3c0..372a9b1 100644
--- a/perl/Sesse/pr0n/Image.pm
+++ b/perl/Sesse/pr0n/Image.pm
@@ -14,24 +14,30 @@ sub handler {
 #	}
 
 	# Find the event and file name
-	my ($event,$filename,$xres,$yres);
-	my $infobox = 1;
-	if ($r->uri =~ m#^/([a-zA-Z0-9-]+)/original/(nobox/)?([a-zA-Z0-9._-]+)$#) {
+	my ($event,$filename,$xres,$yres,$dpr);
+	my $infobox = 'both';
+	if ($r->uri =~ m#^/([a-zA-Z0-9-]+)/original/((?:no)?box/)?([a-zA-Z0-9._()-]+)$#) {
 		$event = $1;
 		$filename = $3;
-	} elsif ($r->uri =~ m#^/([a-zA-Z0-9-]+)/(\d+)x(\d+)/(nobox/)?([a-zA-Z0-9._-]+)$#) {
+		$infobox = 'nobox' if (defined($2) && $2 eq 'nobox/');
+		$infobox = 'box' if (defined($2) && $2 eq 'box/');
+	} elsif ($r->uri =~ m#^/([a-zA-Z0-9-]+)/(\d+)x(\d+)(?:\@(\d+(?:\.\d+)?))?/((?:no)?box/)?([a-zA-Z0-9._()-]+)$#) {
 		$event = $1;
-		$filename = $5;
+		$filename = $6;
 		$xres = $2;
 		$yres = $3;
-		$infobox = 0 if (defined($4));
-	} elsif ($r->uri =~ m#^/([a-zA-Z0-9-]+)/(nobox/)?([a-zA-Z0-9._-]+)$#) {
+		$dpr = $4;
+		$infobox = 'nobox' if (defined($5) && $5 eq 'nobox/');
+		$infobox = 'box' if (defined($5) && $5 eq 'box/');
+	} elsif ($r->uri =~ m#^/([a-zA-Z0-9-]+)/((?:no)?box/)?([a-zA-Z0-9._()-]+)$#) {
 		$event = $1;
 		$filename = $3;
 		$xres = -1;
 		$yres = -1;
-		$infobox = 0 if (defined($2));
+		$infobox = 'nobox' if (defined($2) && $2 eq 'nobox/');
+		$infobox = 'box' if (defined($2) && $2 eq 'box/');
 	}
+	$dpr //= 1;
 
 	my ($id, $dbwidth, $dbheight);
 	#if ($event eq 'single' && $filename =~ /^(\d+)\.jpeg$/) {
@@ -47,19 +53,11 @@ sub handler {
 	$dbwidth = $ref->{'width'};
 	$dbheight = $ref->{'height'};
 
-	#}
-		
-	$dbwidth = -1 unless defined($dbwidth);
-	$dbheight = -1 unless defined($dbheight);
-
 	# Scale if we need to do so
-	my ($fname,$thumbnail) = Sesse::pr0n::Common::ensure_cached($r, $filename, $id, $dbwidth, $dbheight, $infobox, $xres, $yres);
+	my ($fname, $mime_type) = Sesse::pr0n::Common::ensure_cached($r, $filename, $id, $dbwidth, $dbheight, $infobox, $dpr, $xres, $yres);
 
 	# Output the image to the user
-	my $mime_type;
-	if ($thumbnail) {
-		$mime_type = "image/jpeg";
-	} else {
+	if (!defined($mime_type)) {
 		$mime_type = Sesse::pr0n::Common::get_mimetype_from_filename($filename);
 	}
 	$r->content_type($mime_type);