mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-12-16 04:36:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5687 from wallabag/feature/download-webp

Browse source
This commit is contained in:
Jérémy Benoist 2022-03-21 22:17:04 +01:00 committed by GitHub
commit b7ed531c31
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/Wallabag/CoreBundle/Helper/DownloadImages.php
View file

@ -188,6 +188,10 @@ class DownloadImages
imagesavealpha($im, true); imagesavealpha($im, true);
imagepng($im, $localPath, ceil(self::REGENERATE_PICTURES_QUALITY / 100 * 9)); imagepng($im, $localPath, ceil(self::REGENERATE_PICTURES_QUALITY / 100 * 9));
$this->logger->debug('DownloadImages: Re-creating png'); $this->logger->debug('DownloadImages: Re-creating png');
break;
case 'webp':
imagewebp($im, $localPath, self::REGENERATE_PICTURES_QUALITY);
$this->logger->debug('DownloadImages: Re-creating webp');
} }
imagedestroy($im); imagedestroy($im);
@ -333,6 +337,7 @@ class DownloadImages
'jpeg' => "\xFF\xD8\xFF", 'jpeg' => "\xFF\xD8\xFF",
'gif' => 'GIF', 'gif' => 'GIF',
'png' => "\x89\x50\x4e\x47\x0d\x0a", 'png' => "\x89\x50\x4e\x47\x0d\x0a",
'webp' => "\x52\x49\x46\x46",
]; ];
$bytes = substr((string) $res->getBody(), 0, 8); $bytes = substr((string) $res->getBody(), 0, 8);
@ -346,7 +351,7 @@ class DownloadImages
$this->logger->debug('DownloadImages: Checking extension (alternative)', ['ext' => $ext]); $this->logger->debug('DownloadImages: Checking extension (alternative)', ['ext' => $ext]);
} }
if (!\in_array($ext, ['jpeg', 'jpg', 'gif', 'png'], true)) { if (!\in_array($ext, ['jpeg', 'jpg', 'gif', 'png', 'webp'], true)) {
$this->logger->error('DownloadImages: Processed image with not allowed extension. Skipping: ' . $imagePath); $this->logger->error('DownloadImages: Processed image with not allowed extension. Skipping: ' . $imagePath);
return false; return false;

1
tests/Wallabag/CoreBundle/Helper/DownloadImagesTest.php
View file

@ -65,6 +65,7 @@ class DownloadImagesTest extends TestCase
['image/jpeg', 'jpeg'], ['image/jpeg', 'jpeg'],
['image/png', 'png'], ['image/png', 'png'],
['image/gif', 'gif'], ['image/gif', 'gif'],
['image/webp', 'webp'],
]; ];
} }