use Graby\Graby;
use Psr\Log\LoggerInterface;
-use Wallabag\CoreBundle\Entity\Entry;
-use Wallabag\CoreBundle\Tools\Utils;
use Symfony\Component\HttpFoundation\File\MimeType\MimeTypeExtensionGuesser;
-use Symfony\Component\Validator\Constraints\Language as LanguageConstraint;
+use Symfony\Component\Validator\Constraints\Locale as LocaleConstraint;
use Symfony\Component\Validator\Constraints\Url as UrlConstraint;
use Symfony\Component\Validator\Validator\ValidatorInterface;
+use Wallabag\CoreBundle\Entity\Entry;
+use Wallabag\CoreBundle\Tools\Utils;
/**
* This kind of proxy class take care of getting the content from an url
*/
private function stockEntry(Entry $entry, array $content)
{
- $title = $content['title'];
- if (!$title && !empty($content['open_graph']['og_title'])) {
- $title = $content['open_graph']['og_title'];
+ $entry->setUrl($content['url']);
+
+ $domainName = parse_url($entry->getUrl(), PHP_URL_HOST);
+ if (false !== $domainName) {
+ $entry->setDomainName($domainName);
+ }
+
+ if (!empty($content['title'])) {
+ $entry->setTitle($content['title']);
+ } elseif (!empty($content['open_graph']['og_title'])) {
+ $entry->setTitle($content['open_graph']['og_title']);
}
$html = $content['html'];
}
}
- $entry->setUrl($content['url']);
- $entry->setTitle($title);
$entry->setContent($html);
- $entry->setHttpStatus(isset($content['status']) ? $content['status'] : '');
-
- if (!empty($content['date'])) {
- $date = $content['date'];
-
- // is it a timestamp?
- if (filter_var($date, FILTER_VALIDATE_INT) !== false) {
- $date = '@'.$content['date'];
- }
+ $entry->setReadingTime(Utils::getReadingTime($html));
- try {
- $entry->setPublishedAt(new \DateTime($date));
- } catch (\Exception $e) {
- $this->logger->warning('Error while defining date', ['e' => $e, 'url' => $content['url'], 'date' => $content['date']]);
- }
+ if (!empty($content['status'])) {
+ $entry->setHttpStatus($content['status']);
}
if (!empty($content['authors']) && is_array($content['authors'])) {
$entry->setHeaders($content['all_headers']);
}
- $this->validateAndSetLanguage(
- $entry,
- isset($content['language']) ? $content['language'] : ''
- );
+ if (!empty($content['date'])) {
+ $this->updatePublishedAt($entry, $content['date']);
+ }
- $this->validateAndSetPreviewPicture(
- $entry,
- isset($content['open_graph']['og_image']) ? $content['open_graph']['og_image'] : ''
- );
+ if (!empty($content['language'])) {
+ $this->updateLanguage($entry, $content['language']);
+ }
+
+ if (!empty($content['open_graph']['og_image'])) {
+ $this->updatePreviewPicture($entry, $content['open_graph']['og_image']);
+ }
// if content is an image, define it as a preview too
if (!empty($content['content_type']) && in_array($this->mimeGuesser->guess($content['content_type']), ['jpeg', 'jpg', 'gif', 'png'], true)) {
);
}
- $entry->setMimetype(isset($content['content_type']) ? $content['content_type'] : '');
- $entry->setReadingTime(Utils::getReadingTime($html));
-
- $domainName = parse_url($entry->getUrl(), PHP_URL_HOST);
- if (false !== $domainName) {
- $entry->setDomainName($domainName);
+ if (!empty($content['content_type'])) {
+ $entry->setMimetype($content['content_type']);
}
try {
* Use a Symfony validator to ensure the language is well formatted.
*
* @param Entry $entry
- * @param string $value Language to validate
+ * @param string $value Language to validate and save
*/
- private function validateAndSetLanguage($entry, $value)
+ public function updateLanguage(Entry $entry, $value)
{
+ // some lang are defined as fr-FR, es-ES.
+ // replacing - by _ might increase language support
+ $value = str_replace('-', '_', $value);
+
$errors = $this->validator->validate(
$value,
- (new LanguageConstraint())
+ (new LocaleConstraint())
);
if (0 === count($errors)) {
return;
}
- $this->logger->warning('Language validation failed. '.(string) $errors);
+ $this->logger->warning('Language validation failed. ' . (string) $errors);
}
/**
* Use a Symfony validator to ensure the preview picture is a real url.
*
* @param Entry $entry
- * @param string $value URL to validate
+ * @param string $value URL to validate and save
*/
- private function validateAndSetPreviewPicture($entry, $value)
+ public function updatePreviewPicture(Entry $entry, $value)
{
$errors = $this->validator->validate(
$value,
return;
}
- $this->logger->warning('PreviewPicture validation failed. '.(string) $errors);
+ $this->logger->warning('PreviewPicture validation failed. ' . (string) $errors);
+ }
+
+ /**
+ * Update date.
+ *
+ * @param Entry $entry
+ * @param string $value Date to validate and save
+ */
+ public function updatePublishedAt(Entry $entry, $value)
+ {
+ $date = $value;
+
+ // is it a timestamp?
+ if (filter_var($date, FILTER_VALIDATE_INT) !== false) {
+ $date = '@'.$value;
+ }
+
+ try {
+ $entry->setPublishedAt(new \DateTime($date));
+ } catch (\Exception $e) {
+ $this->logger->warning('Error while defining date', ['e' => $e, 'url' => $entry->getUrl(), 'date' => $value]);
+ }
}
}