oss/wallabag
oss/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-08-01 17:38:38 +00:00
Code Wiki Activity

Fix some tests

Browse source
This commit is contained in:
Jeremy Benoist 2019-02-07 17:56:05 +01:00
parent a91a3150fb
commit b6c1e1bacc
No known key found for this signature in database
GPG key ID: BCA73962457ACC3C
2 changed files with 24 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/Wallabag/CoreBundle/Helper/ContentProxy.php
View file

@ -54,7 +54,11 @@ class ContentProxy
if ((empty($content) || false === $this->validateContent($content)) && false === $disableContentUpdate) {
$fetchedContent = $this->graby->fetchContent($url);
$fetchedContent['title'] = $this->sanitizeContentTitle($fetchedContent['title'], $fetchedContent['content_type']);
$fetchedContent['title'] = $this->sanitizeContentTitle(
$fetchedContent['title'],
isset($fetchedContent['headers']['content-type']) ? $fetchedContent['headers']['content-type'] : ''
);
// when content is imported, we have information in $content
// in case fetching content goes bad, we'll keep the imported information instead of overriding them
@ -188,8 +192,8 @@ class ContentProxy
/**
* Try to sanitize the title of the fetched content from wrong character encodings and invalid UTF-8 character.
*
* @param $title
* @param $contentType
* @param string $title
* @param string $contentType
*
* @return string
*/
@ -293,12 +297,15 @@ class ContentProxy
}
// if content is an image, define it as a preview too
if (!empty($content['headers']['content_type']) && \in_array($this->mimeGuesser->guess($content['headers']['content_type']), ['jpeg', 'jpg', 'gif', 'png'], true)) {
if (!empty($content['headers']['content-type']) && \in_array($this->mimeGuesser->guess($content['headers']['content-type']), ['jpeg', 'jpg', 'gif', 'png'], true)) {
$previewPictureUrl = $content['url'];
$entry->setMimetype($content['headers']['content-type']);
} elseif (empty($previewPictureUrl)) {
$this->logger->debug('Extracting images from content to provide a default preview picture');
$imagesUrls = DownloadImages::extractImagesUrlsFromHtml($content['html']);
$this->logger->debug(\count($imagesUrls) . ' pictures found');
if (!empty($imagesUrls)) {
$previewPictureUrl = $imagesUrls[0];
}
@ -308,10 +315,6 @@ class ContentProxy
$this->updatePreviewPicture($entry, $previewPictureUrl);
}
if (!empty($content['headers']['content-type'])) {
$entry->setMimetype($content['headers']['content-type']);
}
try {
$this->tagger->tag($entry);
} catch (\Exception $e) {