devol/wallabag
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix image downloading on null image path

Browse Source
This commit is contained in:
Simounet 2018-06-03 22:52:48 +02:00
parent e586d65b64
commit 3fbbe0d9f1
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Wallabag/CoreBundle/Helper/DownloadImages.php
View File

@ -85,6 +85,10 @@ class DownloadImages
*/ */
public function processSingleImage($entryId, $imagePath, $url, $relativePath = null) public function processSingleImage($entryId, $imagePath, $url, $relativePath = null)
{ {
if (null === $imagePath) {
return false;
}
if (null === $relativePath) { if (null === $relativePath) {
$relativePath = $this->getRelativePath($entryId); $relativePath = $this->getRelativePath($entryId);
} }

23
tests/Wallabag/CoreBundle/Helper/DownloadImagesTest.php
View File

@ -204,4 +204,27 @@ class DownloadImagesTest extends TestCase
$this->assertNotContains('http://piketty.blog.lemonde.fr/', $res, 'Image srcset attribute were not replaced'); $this->assertNotContains('http://piketty.blog.lemonde.fr/', $res, 'Image srcset attribute were not replaced');
} }
public function testProcessImageWithNullPath()
{
$client = new Client();
$mock = new Mock([
new Response(200, ['content-type' => null], Stream::factory(file_get_contents(__DIR__ . '/../fixtures/image-no-content-type.jpg'))),
]);
$client->getEmitter()->attach($mock);
$logHandler = new TestHandler();
$logger = new Logger('test', [$logHandler]);
$download = new DownloadImages($client, sys_get_temp_dir() . '/wallabag_test', 'http://wallabag.io/', $logger);
$res = $download->processSingleImage(
123,
null,
'https://framablog.org/2018/06/30/engagement-atypique/'
);
$this->assertFalse($res);
}
} }