Render the infobox on the client side.

[pr0n] / perl / Sesse / pr0n / Image.pm

diff --git a/perl/Sesse/pr0n/Image.pm b/perl/Sesse/pr0n/Image.pm
index 8671b570693e8504fca4c0d83aca04bd03c90e30..f37e7ac8f986a09ce750a1258ad899e2be017770 100644 (file)
--- a/perl/Sesse/pr0n/Image.pm
+++ b/perl/Sesse/pr0n/Image.pm
@@ -15,24 +15,20 @@ sub handler {
 
        # Find the event and file name (nobox/ is for compatibility with legacy URLs).
        my ($event,$filename,$xres,$yres,$dpr);
-       my $infobox = 0;
-       if ($r->path_info =~ m#^/([a-zA-Z0-9-]+)/original/((?:no)?box/)?([a-zA-Z0-9._()-]+)$#) {
+       if ($r->path_info =~ m#^/([a-zA-Z0-9-]+)/original/?([a-zA-Z0-9._()-]+)$#) {
                $event = $1;
-               $filename = $3;
-               $infobox = 1 if (defined($2) && $2 eq 'box/');
-       } elsif ($r->path_info =~ m#^/([a-zA-Z0-9-]+)/(\d+)x(\d+)(?:\@(\d+(?:\.\d+)?))?/((?:no)?box/)?([a-zA-Z0-9._()-]+)$#) {
+               $filename = $2;
+       } elsif ($r->path_info =~ m#^/([a-zA-Z0-9-]+)/(\d+)x(\d+)(?:\@(\d+(?:\.\d+)?))?/([a-zA-Z0-9._()-]+)$#) {
                $event = $1;
-               $filename = $6;
+               $filename = $5;
                $xres = $2;
                $yres = $3;
                $dpr = $4;
-               $infobox = 1 if (defined($5) && $5 eq 'box/');
-       } elsif ($r->path_info =~ m#^/([a-zA-Z0-9-]+)/((?:no)?box/)?([a-zA-Z0-9._()-]+)$#) {
+       } elsif ($r->path_info =~ m#^/([a-zA-Z0-9-]+)/([a-zA-Z0-9._()-]+)$#) {
                $event = $1;
-               $filename = $3;
+               $filename = $2;
                $xres = -1;
                $yres = -1;
-               $infobox = 1 if (defined($2) && $2 eq 'box/');
        }
        $dpr //= 1;
 
@@ -46,8 +42,8 @@ sub handler {
                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.
+       if (defined($xres) && defined($yres) && defined($ref->{'render_id'})) {
+               # We have a render, and we're not asked for the original.
                $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));
@@ -62,15 +58,11 @@ sub handler {
 
        # Scale if we need to do so
        my ($fname, $mime_type);
-       if ($infobox) {
-               ($fname, $mime_type) = Sesse::pr0n::Common::ensure_infobox_cached($r, $filename, $id, $dbwidth, $dbheight, $dpr, $xres, $yres);
-       } else {
-               my $accept = $r->header('Accept');
-               my $avif_ok = (defined($accept) && $accept =~ /(^|,)image\/avif($|,|;)/);
-               my $jxl_ok = (defined($accept) && $accept =~ /(^|,)image\/jxl($|,|;)/);
-               ($fname, $mime_type) = Sesse::pr0n::Common::ensure_cached($r, $avif_ok, $jxl_ok, $filename, $id, $dbwidth, $dbheight, $xres, $yres);
-               $res->header('Vary' => 'Accept');
-       }
+       my $accept = $r->header('Accept');
+       my $avif_ok = (defined($accept) && $accept =~ /(^|,)image\/avif($|,|;)/);
+       my $jxl_ok = (defined($accept) && $accept =~ /(^|,)image\/jxl($|,|;)/);
+       ($fname, $mime_type) = Sesse::pr0n::Common::ensure_cached($r, $avif_ok, $jxl_ok, $filename, $id, $dbwidth, $dbheight, $xres, $yres);
+       $res->header('Vary' => 'Accept');
 
        # Output the image to the user