use Wallabag\CoreBundle\Entity\Tag;
use Wallabag\CoreBundle\Tools\Utils;
use Wallabag\CoreBundle\Repository\TagRepository;
+use Symfony\Component\HttpFoundation\File\MimeType\MimeTypeExtensionGuesser;
/**
* This kind of proxy class take care of getting the content from an url
protected $tagger;
protected $logger;
protected $tagRepository;
+ protected $mimeGuesser;
+ protected $fetchingErrorMessage;
- public function __construct(Graby $graby, RuleBasedTagger $tagger, TagRepository $tagRepository, LoggerInterface $logger)
+ public function __construct(Graby $graby, RuleBasedTagger $tagger, TagRepository $tagRepository, LoggerInterface $logger, $fetchingErrorMessage)
{
$this->graby = $graby;
$this->tagger = $tagger;
$this->logger = $logger;
$this->tagRepository = $tagRepository;
+ $this->mimeGuesser = new MimeTypeExtensionGuesser();
+ $this->fetchingErrorMessage = $fetchingErrorMessage;
}
/**
{
// do we have to fetch the content or the provided one is ok?
if (empty($content) || false === $this->validateContent($content)) {
- $content = $this->graby->fetchContent($url);
+ $fetchedContent = $this->graby->fetchContent($url);
+
+ // 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
+ if (empty($content) || $fetchedContent['html'] !== $this->fetchingErrorMessage) {
+ $content = $fetchedContent;
+ }
}
$title = $content['title'];
$html = $content['html'];
if (false === $html) {
- $html = '<p>Unable to retrieve readable content.</p>';
+ $html = $this->fetchingErrorMessage;
if (isset($content['open_graph']['og_description'])) {
$html .= '<p><i>But we found a short description: </i></p>';
$entry->setUrl($content['url'] ?: $url);
$entry->setTitle($title);
$entry->setContent($html);
+ $entry->setHttpStatus(isset($content['status']) ? $content['status'] : '');
- $entry->setLanguage($content['language']);
- $entry->setMimetype($content['content_type']);
+ $entry->setLanguage(isset($content['language']) ? $content['language'] : '');
+ $entry->setMimetype(isset($content['content_type']) ? $content['content_type'] : '');
$entry->setReadingTime(Utils::getReadingTime($html));
$domainName = parse_url($entry->getUrl(), PHP_URL_HOST);
$entry->setPreviewPicture($content['open_graph']['og_image']);
}
+ // if content is an image define as a preview too
+ if (isset($content['content_type']) && in_array($this->mimeGuesser->guess($content['content_type']), ['jpeg', 'jpg', 'gif', 'png'], true)) {
+ $entry->setPreviewPicture($content['url']);
+ }
+
try {
$this->tagger->tag($entry);
} catch (\Exception $e) {