tilderadio
/
AzuraCast
mirror of https://github.com/AzuraCast/AzuraCast.git
4
0
Fork 0
Code Issues Releases Wiki Activity

Revert back to JPG/PNG as default, but keep support for webp in custom assets.

This commit is contained in:
Buster Neece 2022-11-23 06:42:25 -06:00
parent fe4849521f
commit b6dc8e3e49
No known key found for this signature in database
GPG Key ID: F1D2E64A0005E80E
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Assets/AlbumArtCustomAsset.php
View File

@ -12,14 +12,15 @@ final class AlbumArtCustomAsset extends AbstractMultiPatternCustomAsset
protected function getPatterns(): array
{
return [
'default' => 'album_art%s.webp',
'image/jpeg' => 'album_art%s.jpg',
'default' => 'album_art%s.jpg',
'image/png' => 'album_art%s.png',
'image/webp' => 'album_art%s.webp',
];
}
protected function getDefaultUrl(): string
{
return $this->environment->getAssetUrl() . '/img/generic_song.webp';
return $this->environment->getAssetUrl() . '/img/generic_song.jpg';
}
public function upload(Image $image): void
@ -31,11 +32,10 @@ final class AlbumArtCustomAsset extends AbstractMultiPatternCustomAsset
$this->delete();
$pattern = $this->getPattern();
$patterns = $this->getPatterns();
$mimeType = $newImage->mime();
$quality = ('image/png' === $mimeType) ? 100 : 90;
$newImage->save($this->getPathForPattern($pattern), $quality);
$pattern = $patterns[$mimeType] ?? $patterns['default'];
$newImage->save($this->getPathForPattern($pattern), 90);
}
}

13
src/Assets/BackgroundCustomAsset.php
View File

@ -12,15 +12,15 @@ final class BackgroundCustomAsset extends AbstractMultiPatternCustomAsset
protected function getPatterns(): array
{
return [
'default' => 'background%s.webp',
'image/jpeg' => 'background%s.jpg',
'default' => 'background%s.jpg',
'image/png' => 'background%s.png',
'image/webp' => 'background%s.webp',
];
}
protected function getDefaultUrl(): string
{
return $this->environment->getAssetUrl() . '/img/hexbg.webp';
return $this->environment->getAssetUrl() . '/img/hexbg.png';
}
public function upload(Image $image): void
@ -32,11 +32,10 @@ final class BackgroundCustomAsset extends AbstractMultiPatternCustomAsset
$this->delete();
$pattern = $this->getPattern();
$patterns = $this->getPatterns();
$mimeType = $newImage->mime();
$quality = ('image/png' === $mimeType) ? 100 : 90;
$newImage->save($this->getPathForPattern($pattern), $quality);
$pattern = $patterns[$mimeType] ?? $patterns['default'];
$newImage->save($this->getPathForPattern($pattern), 90);
}
}