Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pass SVG images through Slim::Web::ImageProxy without resizing #1181

Open
wants to merge 1 commit into
base: public/9.0
Choose a base branch
from
Open

Pass SVG images through Slim::Web::ImageProxy without resizing #1181

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion Slim/Web/ImageProxy.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ original artwork is of considerable size, where the bandwidth to download the im
=cut

use strict;
use File::Slurp qw(read_file);
use File::stat qw(stat);
use HTTP::Status qw(
RC_MOVED_PERMANENTLY
);
Expand Down Expand Up @@ -308,7 +310,7 @@ sub _resizeFromFile {
my $cachekey = $item->{cachekey};

# no need to resize data if we've got it from an external image proxy
if ( ($spec =~ /^\.(?:png|jpe?g)/i || $item->{pre_shrunk}) && $http && $http->headers->content_type =~ /image\/(png|jpe?g)/ ) {
if ( ($spec =~ /^\.(?:png|jpe?g|svg)/i || $item->{pre_shrunk}) && $http && $http->headers->content_type =~ /image\/(png|jpe?g|svg)/ ) {
main::DEBUGLOG && $log->debug("No resizing required - already resized remotely, or original size requested");

my $ct = $1;
Expand All @@ -325,6 +327,22 @@ sub _resizeFromFile {

$callback && $callback->( $client, $params, $fullpath, @$args );
}
elsif ( $spec =~ /^\.svg/i and ($http ? $http->headers->content_type =~ /image\/svg\+xml/ : 1) ) {
main::DEBUGLOG && $log->debug("No resizing required - scalable vector graphics");

my $mtime = stat($fullpath)->mtime;
my $data = read_file($fullpath, {'binmode' => ':raw'});
$cache->set( $cachekey, {
content_type => 'svg',
mtime => $mtime,
original_path => $fullpath,
data_ref => \$data,
} );

_setHeaders($args->[1], 'image/svg+xml');

$callback && $callback->( $client, $params, \$data, @$args );
}
else {
Slim::Utils::ImageResizer->resize($fullpath, $cachekey, $spec, sub {
my ($body, $format) = @_;
Expand Down Expand Up @@ -364,6 +382,7 @@ sub _setHeaders {

my $ct = $format =~ /image/ ? $format : "image/$format";
$ct =~ s/jpg/jpeg/;
$ct .= '+xml' if $ct eq 'image/svg';

$response->content_type($ct);
$response->header( 'Cache-Control' => 'max-age=' . ONE_YEAR );
Expand Down