namespace Wallabag\CoreBundle\Helper;
+use Http\Client\Common\HttpMethodsClient;
+use Http\Client\Common\Plugin\ErrorPlugin;
+use Http\Client\Common\PluginClient;
+use Http\Client\HttpClient;
+use Http\Discovery\MessageFactoryDiscovery;
+use Http\Message\MessageFactory;
+use Psr\Http\Message\ResponseInterface;
use Psr\Log\LoggerInterface;
use Symfony\Component\DomCrawler\Crawler;
-use GuzzleHttp\Client;
-use GuzzleHttp\Message\Response;
-use Symfony\Component\HttpFoundation\File\MimeType\MimeTypeExtensionGuesser;
use Symfony\Component\Finder\Finder;
+use Symfony\Component\HttpFoundation\File\MimeType\MimeTypeExtensionGuesser;
class DownloadImages
{
private $mimeGuesser;
private $wallabagUrl;
- public function __construct(Client $client, $baseFolder, $wallabagUrl, LoggerInterface $logger)
+ public function __construct(HttpClient $client, $baseFolder, $wallabagUrl, LoggerInterface $logger, MessageFactory $messageFactory = null)
{
- $this->client = $client;
+ $this->client = new HttpMethodsClient(new PluginClient($client, [new ErrorPlugin()]), $messageFactory ?: MessageFactoryDiscovery::find());
$this->baseFolder = $baseFolder;
$this->wallabagUrl = rtrim($wallabagUrl, '/');
$this->logger = $logger;
}
/**
- * Setup base folder where all images are going to be saved.
+ * Process the html and extract images URLs from it.
+ *
+ * @param string $html
+ *
+ * @return string[]
*/
- private function setFolder()
+ public static function extractImagesUrlsFromHtml($html)
{
- // if folder doesn't exist, attempt to create one and store the folder name in property $folder
- if (!file_exists($this->baseFolder)) {
- mkdir($this->baseFolder, 0755, true);
- }
+ $crawler = new Crawler($html);
+ $imagesCrawler = $crawler
+ ->filterXpath('//img');
+ $imagesUrls = $imagesCrawler
+ ->extract(['src']);
+ $imagesSrcsetUrls = self::getSrcsetUrls($imagesCrawler);
+
+ return array_unique(array_merge($imagesUrls, $imagesSrcsetUrls));
}
/**
*/
public function processHtml($entryId, $html, $url)
{
- $crawler = new Crawler($html);
- $result = $crawler
- ->filterXpath('//img')
- ->extract(['src']);
+ $imagesUrls = self::extractImagesUrlsFromHtml($html);
$relativePath = $this->getRelativePath($entryId);
// download and save the image to the folder
- foreach ($result as $image) {
+ foreach ($imagesUrls as $image) {
$imagePath = $this->processSingleImage($entryId, $image, $url, $relativePath);
if (false === $imagePath) {
*/
public function processSingleImage($entryId, $imagePath, $url, $relativePath = null)
{
+ if (null === $imagePath) {
+ return false;
+ }
+
if (null === $relativePath) {
$relativePath = $this->getRelativePath($entryId);
}
- $this->logger->debug('DownloadImages: working on image: '.$imagePath);
+ $this->logger->debug('DownloadImages: working on image: ' . $imagePath);
- $folderPath = $this->baseFolder.'/'.$relativePath;
+ $folderPath = $this->baseFolder . '/' . $relativePath;
// build image path
$absolutePath = $this->getAbsoluteLink($url, $imagePath);
}
$hashImage = hash('crc32', $absolutePath);
- $localPath = $folderPath.'/'.$hashImage.'.'.$ext;
+ $localPath = $folderPath . '/' . $hashImage . '.' . $ext;
try {
- $im = imagecreatefromstring($res->getBody());
+ $im = imagecreatefromstring((string) $res->getBody());
} catch (\Exception $e) {
$im = false;
}
switch ($ext) {
case 'gif':
- imagegif($im, $localPath);
+ // use Imagick if available to keep GIF animation
+ if (class_exists('\\Imagick')) {
+ try {
+ $imagick = new \Imagick();
+ $imagick->readImageBlob($res->getBody());
+ $imagick->setImageFormat('gif');
+ $imagick->writeImages($localPath, true);
+ } catch (\Exception $e) {
+ // if Imagick fail, fallback to the default solution
+ imagegif($im, $localPath);
+ }
+ } else {
+ imagegif($im, $localPath);
+ }
+
$this->logger->debug('DownloadImages: Re-creating gif');
break;
case 'jpeg':
imagedestroy($im);
- return $this->wallabagUrl.'/assets/images/'.$relativePath.'/'.$hashImage.'.'.$ext;
+ return $this->wallabagUrl . '/assets/images/' . $relativePath . '/' . $hashImage . '.' . $ext;
}
/**
public function removeImages($entryId)
{
$relativePath = $this->getRelativePath($entryId);
- $folderPath = $this->baseFolder.'/'.$relativePath;
+ $folderPath = $this->baseFolder . '/' . $relativePath;
$finder = new Finder();
$finder
@rmdir($folderPath);
}
+ /**
+ * Get images urls from the srcset image attribute.
+ *
+ * @param Crawler $imagesCrawler
+ *
+ * @return array An array of urls
+ */
+ private static function getSrcsetUrls(Crawler $imagesCrawler)
+ {
+ $urls = [];
+ $iterator = $imagesCrawler
+ ->getIterator();
+ while ($iterator->valid()) {
+ $srcsetAttribute = $iterator->current()->getAttribute('srcset');
+ if ('' !== $srcsetAttribute) {
+ // Couldn't start with " OR ' OR a white space
+ // Could be one or more white space
+ // Must be one or more digits followed by w OR x
+ $pattern = "/(?:[^\"'\s]+\s*(?:\d+[wx])+)/";
+ preg_match_all($pattern, $srcsetAttribute, $matches);
+ $srcset = \call_user_func_array('array_merge', $matches);
+ $srcsetUrls = array_map(function ($src) {
+ return trim(explode(' ', $src, 2)[0]);
+ }, $srcset);
+ $urls = array_merge($srcsetUrls, $urls);
+ }
+ $iterator->next();
+ }
+
+ return $urls;
+ }
+
+ /**
+ * Setup base folder where all images are going to be saved.
+ */
+ private function setFolder()
+ {
+ // if folder doesn't exist, attempt to create one and store the folder name in property $folder
+ if (!file_exists($this->baseFolder)) {
+ mkdir($this->baseFolder, 0755, true);
+ }
+ }
+
/**
* Generate the folder where we are going to save images based on the entry url.
*
private function getRelativePath($entryId)
{
$hashId = hash('crc32', $entryId);
- $relativePath = $hashId[0].'/'.$hashId[1].'/'.$hashId;
- $folderPath = $this->baseFolder.'/'.$relativePath;
+ $relativePath = $hashId[0] . '/' . $hashId[1] . '/' . $hashId;
+ $folderPath = $this->baseFolder . '/' . $relativePath;
if (!file_exists($folderPath)) {
mkdir($folderPath, 0777, true);
/**
* Retrieve and validate the extension from the response of the url of the image.
*
- * @param Response $res Guzzle Response
+ * @param ResponseInterface $res Http Response
* @param string $imagePath Path from the src image from the content (used for log only)
*
* @return string|false Extension name or false if validation failed
*/
- private function getExtensionFromResponse(Response $res, $imagePath)
+ private function getExtensionFromResponse(ResponseInterface $res, $imagePath)
{
- $ext = $this->mimeGuesser->guess($res->getHeader('content-type'));
+ $ext = $this->mimeGuesser->guess(current($res->getHeader('content-type')));
$this->logger->debug('DownloadImages: Checking extension', ['ext' => $ext, 'header' => $res->getHeader('content-type')]);
// ok header doesn't have the extension, try a different way
$this->logger->debug('DownloadImages: Checking extension (alternative)', ['ext' => $ext]);
}
- if (!in_array($ext, ['jpeg', 'jpg', 'gif', 'png'], true)) {
- $this->logger->error('DownloadImages: Processed image with not allowed extension. Skipping: '.$imagePath);
+ if (!\in_array($ext, ['jpeg', 'jpg', 'gif', 'png'], true)) {
+ $this->logger->error('DownloadImages: Processed image with not allowed extension. Skipping: ' . $imagePath);
return false;
}
projects / github / wallabag / wallabag.git / blobdiff