mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-09-28 14:22:02 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3176 from wallabag/fix-image-download

Browse source 
Replace images with & in url
This commit is contained in:
Nicolas Lœuillet 2017-06-02 09:12:11 +02:00 committed by GitHub
commit 14b8a7c950
2 changed files with 28 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -54,7 +54,7 @@ class DownloadImages
$crawler = new Crawler($html);
$result = $crawler
->filterXpath('//img')
->extract(array('src'));
->extract(['src']);
$relativePath = $this->getRelativePath($entryId);
@ -66,6 +66,11 @@ class DownloadImages
continue;
}
// if image contains "&" and we can't find it in the html it might be because it's encoded as &
if (false !== stripos($image, '&') && false === stripos($html, $image)) {
$image = str_replace('&', '&', $image);
}
$html = str_replace($image, $imagePath, $html);
}
@ -114,7 +119,7 @@ class DownloadImages
$ext = $this->mimeGuesser->guess($res->getHeader('content-type'));
$this->logger->debug('DownloadImages: Checking extension', ['ext' => $ext, 'header' => $res->getHeader('content-type')]);
if (!in_array($ext, ['jpeg', 'jpg', 'gif', 'png'], 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;
}

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

@ -12,7 +12,24 @@ use GuzzleHttp\Stream\Stream;
class DownloadImagesTest extends \PHPUnit_Framework_TestCase
{
public function testProcessHtml()
public function dataForSuccessImage()
{
return [
'imgur' => [
'<div><img src="http://i.imgur.com/T9qgcHc.jpg" /></div>',
'http://imgur.com/gallery/WxtWY',
],
'image with &' => [
'<div><img src="https://i2.wp.com/www.tvaddons.ag/wp-content/uploads/2017/01/Screen-Shot-2017-01-07-at-10.17.40-PM.jpg?w=640&amp;ssl=1" /></div>',
'https://www.tvaddons.ag/realdebrid-kodi-jarvis/',
],
];
}
/**
* @dataProvider dataForSuccessImage
*/
public function testProcessHtml($html, $url)
{
$client = new Client();
@ -27,9 +44,10 @@ class DownloadImagesTest extends \PHPUnit_Framework_TestCase
$download = new DownloadImages($client, sys_get_temp_dir().'/wallabag_test', 'http://wallabag.io/', $logger);
$res = $download->processHtml(123, '<div><img src="http://i.imgur.com/T9qgcHc.jpg" /></div>', 'http://imgur.com/gallery/WxtWY');
$res = $download->processHtml(123, $html, $url);
$this->assertContains('http://wallabag.io/assets/images/9/b/9b0ead26/c638b4c2.png', $res);
// this the base path of all image (since it's calculated using the entry id: 123)
$this->assertContains('http://wallabag.io/assets/images/9/b/9b0ead26/', $res);
}
public function testProcessHtmlWithBadImage()