pierre/wallabag
1
0
Fork 0
forked from wallabag/wallabag
Code Issues Pull Requests Packages Projects Releases 1 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
10 changed files with 329 additions and 373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
src/Wallabag/ImportBundle/Import/PocketImport.php
View File

@ -2,13 +2,22 @@
namespace Wallabag\ImportBundle\Import;
use GuzzleHttp\Client;
use GuzzleHttp\Exception\RequestException;
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 Http\Client\Exception\RequestException;
use Wallabag\CoreBundle\Entity\Entry;
use Psr\Http\Message\ResponseInterface;
class PocketImport extends AbstractImport
{
const NB_ELEMENTS = 5000;
/**
* @var HttpMethodsClient
*/
private $client;
private $accessToken;
@ -55,24 +64,18 @@ class PocketImport extends AbstractImport
*/
public function getRequestToken($redirectUri)
{
$request = $this->client->createRequest('POST', 'https://getpocket.com/v3/oauth/request',
[
'body' => json_encode([
'consumer_key' => $this->user->getConfig()->getPocketConsumerKey(),
'redirect_uri' => $redirectUri,
]),
]
);
try {
$response = $this->client->send($request);
$response = $this->client->post('https://getpocket.com/v3/oauth/request', [], json_encode([
'consumer_key' => $this->user->getConfig()->getPocketConsumerKey(),
'redirect_uri' => $redirectUri,
]));
} catch (RequestException $e) {
$this->logger->error(sprintf('PocketImport: Failed to request token: %s', $e->getMessage()), ['exception' => $e]);
return false;
}
return $response->json()['code'];
return $this->jsonDecode($response)['code'];
}
/**
@ -85,24 +88,19 @@ class PocketImport extends AbstractImport
*/
public function authorize($code)
{
$request = $this->client->createRequest('POST', 'https://getpocket.com/v3/oauth/authorize',
[
'body' => json_encode([
'consumer_key' => $this->user->getConfig()->getPocketConsumerKey(),
'code' => $code,
]),
]
);
try {
$response = $this->client->send($request);
$response = $this->client->post('https://getpocket.com/v3/oauth/authorize', [], json_encode([
'consumer_key' => $this->user->getConfig()->getPocketConsumerKey(),
'code' => $code,
]));
} catch (RequestException $e) {
$this->logger->error(sprintf('PocketImport: Failed to authorize client: %s', $e->getMessage()), ['exception' => $e]);
return false;
}
$this->accessToken = $response->json()['access_token'];
$this->accessToken = $this->jsonDecode($response)['access_token'];
return true;
}
@ -114,29 +112,23 @@ class PocketImport extends AbstractImport
{
static $run = 0;
$request = $this->client->createRequest('POST', 'https://getpocket.com/v3/get',
[
'body' => json_encode([
'consumer_key' => $this->user->getConfig()->getPocketConsumerKey(),
'access_token' => $this->accessToken,
'detailType' => 'complete',
'state' => 'all',
'sort' => 'newest',
'count' => self::NB_ELEMENTS,
'offset' => $offset,
]),
]
);
try {
$response = $this->client->send($request);
$response = $this->client->post('https://getpocket.com/v3/get', [], json_encode([
'consumer_key' => $this->user->getConfig()->getPocketConsumerKey(),
'access_token' => $this->accessToken,
'detailType' => 'complete',
'state' => 'all',
'sort' => 'newest',
'count' => self::NB_ELEMENTS,
'offset' => $offset,
]));
} catch (RequestException $e) {
$this->logger->error(sprintf('PocketImport: Failed to import: %s', $e->getMessage()), ['exception' => $e]);
return false;
}
$entries = $response->json();
$entries = $this->jsonDecode($response);
if ($this->producer) {
$this->parseEntriesForProducer($entries['list']);
@ -159,13 +151,14 @@ class PocketImport extends AbstractImport
}
/**
* Set the Guzzle client.
* Set the Http client.
*
* @param Client $client
* @param HttpClient $client
* @param MessageFactory|null $messageFactory
*/
public function setClient(Client $client)
public function setClient(HttpClient $client, MessageFactory $messageFactory = null)
{
$this->client = $client;
$this->client = new HttpMethodsClient(new PluginClient($client, [new ErrorPlugin()]), $messageFactory ?: MessageFactoryDiscovery::find());
}
/**
@ -252,4 +245,15 @@ class PocketImport extends AbstractImport
return $importedEntry;
}
protected function jsonDecode(ResponseInterface $response)
{
$data = \json_decode((string) $response->getBody(), true);
if (JSON_ERROR_NONE !== json_last_error()) {
throw new \InvalidArgumentException('Unable to parse JSON data: ' . json_last_error_msg());
}
return $data;
}
}