Support JPEG XL, like AVIF.

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

diff --git a/perl/Sesse/pr0n/Image.pm b/perl/Sesse/pr0n/Image.pm
index 6a4f7a80e71a64f2653d1a2d5d596a04c065aa18..8671b570693e8504fca4c0d83aca04bd03c90e30 100644 (file)
--- a/perl/Sesse/pr0n/Image.pm
+++ b/perl/Sesse/pr0n/Image.pm
@@ -42,19 +42,37 @@ 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'};
 
+       my $res = Plack::Response->new(200);
+
        # 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 {
+               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
-       my $res = Plack::Response->new(200);
 
        if (!defined($mime_type)) {
                $mime_type = Sesse::pr0n::Common::get_mimetype_from_filename($filename);