mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-11-27 03:21:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2614 from wallabag/api-reload

Browse source 
Add ability to reload entry from API
This commit is contained in:
Nicolas Lœuillet 2016-11-22 09:39:43 +01:00 committed by GitHub
commit ba838dae5a
2 changed files with 85 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/Wallabag/ApiBundle/Controller/EntryRestController.php
View file

@ -285,6 +285,51 @@ class EntryRestController extends WallabagRestController
return (new JsonResponse())->setJson($json);
}
/**
* Reload an entry.
* A response with HTTP Status 400 will be return if we weren't able to update the content (because it hasn't changed or we got an error).
*
* @ApiDoc(
* requirements={
* {"name"="entry", "dataType"="integer", "requirement"="\w+", "description"="The entry ID"}
* }
* )
*
* @return JsonResponse
*/
public function patchEntriesReloadAction(Entry $entry)
{
$this->validateAuthentication();
$this->validateUserAccess($entry->getUser()->getId());
try {
$entry = $this->get('wallabag_core.content_proxy')->updateEntry($entry, $entry->getUrl());
} catch (\Exception $e) {
$this->get('logger')->error('Error while saving an entry', [
'exception' => $e,
'entry' => $entry,
]);
return new JsonResponse(['error' => 'Error while trying to fetch content'], 400);
}
// if refreshing entry failed, don't save it
if ($this->getParameter('wallabag_core.fetching_error_message') === $entry->getContent()) {
return new JsonResponse(['error' => 'Error while trying to extract content'], 400);
}
$em = $this->getDoctrine()->getManager();
$em->persist($entry);
$em->flush();
// entry saved, dispatch event about it!
$this->get('event_dispatcher')->dispatch(EntrySavedEvent::NAME, new EntrySavedEvent($entry));
$json = $this->get('serializer')->serialize($entry, 'json');
return (new JsonResponse())->setJson($json);
}
/**
* Delete **permanently** an entry.
*

40
tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php
View file

@ -678,4 +678,44 @@ class EntryRestControllerTest extends WallabagApiTestCase
$this->assertEquals(403, $this->client->getResponse()->getStatusCode());
}
public function testReloadEntryErrorWhileFetching()
{
$entry = $this->client->getContainer()->get('doctrine.orm.entity_manager')
->getRepository('WallabagCoreBundle:Entry')
->findByUrlAndUserId('http://0.0.0.0/entry4', 1);
if (!$entry) {
$this->markTestSkipped('No content found in db.');
}
$this->client->request('PATCH', '/api/entries/'.$entry->getId().'/reload.json');
$this->assertEquals(400, $this->client->getResponse()->getStatusCode());
$this->assertContains('Error while trying to extract content', $this->client->getResponse()->getContent());
$this->assertEquals('application/json', $this->client->getResponse()->headers->get('Content-Type'));
}
public function testReloadEntry()
{
$this->client->request('POST', '/api/entries.json', [
'url' => 'http://www.lemonde.fr/pixels/article/2015/03/28/plongee-dans-l-univers-d-ingress-le-jeu-de-google-aux-frontieres-du-reel_4601155_4408996.html',
'archive' => '1',
'tags' => 'google, apple',
]);
$json = json_decode($this->client->getResponse()->getContent(), true);
$this->setUp();
$this->client->request('PATCH', '/api/entries/'.$json['id'].'/reload.json');
$this->assertEquals(200, $this->client->getResponse()->getStatusCode());
$content = json_decode($this->client->getResponse()->getContent(), true);
$this->assertNotEmpty($content['title']);
$this->assertEquals('application/json', $this->client->getResponse()->headers->get('Content-Type'));
}
}