oss/wallabag
oss/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-09-15 18:57:05 +00:00
Code Wiki Activity

Use httplug

Browse source
This commit is contained in:
adev 2017-10-24 22:55:40 +02:00 • committed by Jeremy Benoist
parent 92a6683562
commit bf9ace0643
No known key found for this signature in database
GPG key ID: BCA73962457ACC3C
10 changed files with 329 additions and 373 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/Wallabag/CoreBundle/Helper/DownloadImages.php
View file

@ -2,8 +2,13 @@
namespace Wallabag\CoreBundle\Helper;
use GuzzleHttp\Client;
use GuzzleHttp\Message\Response;
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 Symfony\Component\Finder\Finder;
@ -19,9 +24,9 @@ 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;
@ -135,7 +140,7 @@ class DownloadImages
$localPath = $folderPath . '/' . $hashImage . '.' . $ext;
try {
$im = imagecreatefromstring($res->getBody());
$im = imagecreatefromstring((string) $res->getBody());
} catch (\Exception $e) {
$im = false;
}
@ -306,14 +311,14 @@ class DownloadImages
/**
* 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

59
src/Wallabag/CoreBundle/Helper/HttpClientFactory.php
View file

@ -2,16 +2,18 @@
namespace Wallabag\CoreBundle\Helper;
use Graby\Ring\Client\SafeCurlHandler;
use GuzzleHttp\Client;
use GuzzleHttp\Client as GuzzleClient;
use GuzzleHttp\Cookie\CookieJar;
use GuzzleHttp\Event\SubscriberInterface;
use Http\Adapter\Guzzle5\Client as GuzzleAdapter;
use Psr\Log\LoggerInterface;
use Http\Client\HttpClient;
use Http\HttplugBundle\ClientFactory\ClientFactory;
/**
* Builds and configures the Guzzle HTTP client.
* Builds and configures the HTTP client.
*/
class HttpClientFactory
class HttpClientFactory implements ClientFactory
{
/** @var [\GuzzleHttp\Event\SubscriberInterface] */
private $subscribers = [];
@ -36,29 +38,6 @@ class HttpClientFactory
$this->logger = $logger;
}
/**
* @return \GuzzleHttp\Client|null
*/
public function buildHttpClient()
{
$this->logger->log('debug', 'Restricted access config enabled?', ['enabled' => (int) $this->restrictedAccess]);
if (0 === (int) $this->restrictedAccess) {
return;
}
// we clear the cookie to avoid websites who use cookies for analytics
$this->cookieJar->clear();
// need to set the (shared) cookie jar
$client = new Client(['handler' => new SafeCurlHandler(), 'defaults' => ['cookies' => $this->cookieJar]]);
foreach ($this->subscribers as $subscriber) {
$client->getEmitter()->attach($subscriber);
}
return $client;
}
/**
* Adds a subscriber to the HTTP client.
*
@ -68,4 +47,30 @@ class HttpClientFactory
{
$this->subscribers[] = $subscriber;
}
/**
* Input an array of configuration to be able to create a HttpClient.
*
* @param array $config
*
* @return HttpClient
*/
public function createClient(array $config = [])
{
$this->logger->log('debug', 'Restricted access config enabled?', ['enabled' => (int) $this->restrictedAccess]);
if (0 === (int) $this->restrictedAccess) {
return new GuzzleAdapter(new GuzzleClient());
}
// we clear the cookie to avoid websites who use cookies for analytics
$this->cookieJar->clear();
// need to set the (shared) cookie jar
$guzzle = new GuzzleClient(['defaults' => ['cookies' => $this->cookieJar]]);
foreach ($this->subscribers as $subscriber) {
$guzzle->getEmitter()->attach($subscriber);
}
return new GuzzleAdapter($guzzle);
}
}