*
* @ApiDoc(
* parameters={
- * {"name"="archive", "dataType"="boolean", "required"=false, "format"="true or false, all entries by default", "description"="filter by archived status."},
- * {"name"="star", "dataType"="boolean", "required"=false, "format"="true or false, all entries by default", "description"="filter by starred status."},
+ * {"name"="archive", "dataType"="integer", "required"=false, "format"="1 or 0, all entries by default", "description"="filter by archived status."},
+ * {"name"="starred", "dataType"="integer", "required"=false, "format"="1 or 0, all entries by default", "description"="filter by starred status."},
* {"name"="sort", "dataType"="string", "required"=false, "format"="'created' or 'updated', default 'created'", "description"="sort entries by date."},
* {"name"="order", "dataType"="string", "required"=false, "format"="'asc' or 'desc', default 'desc'", "description"="order of sort."},
* {"name"="page", "dataType"="integer", "required"=false, "format"="default '1'", "description"="what page you want."},
* {"name"="perPage", "dataType"="integer", "required"=false, "format"="default'30'", "description"="results per page."},
- * {"name"="tags", "dataType"="string", "required"=false, "format"="api%2Crest", "description"="a list of tags url encoded. Will returns entries that matches ALL tags."},
+ * {"name"="tags", "dataType"="string", "required"=false, "format"="api,rest", "description"="a list of tags url encoded. Will returns entries that matches ALL tags."},
+ * {"name"="since", "dataType"="integer", "required"=false, "format"="default '0'", "description"="The timestamp since when you want entries updated."},
* }
* )
*
{
$this->validateAuthentication();
- $isArchived = $request->query->get('archive');
- $isStarred = $request->query->get('star');
+ $isArchived = (null === $request->query->get('archive')) ? null : (bool) $request->query->get('archive');
+ $isStarred = (null === $request->query->get('starred')) ? null : (bool) $request->query->get('starred');
$sort = $request->query->get('sort', 'created');
$order = $request->query->get('order', 'desc');
$page = (int) $request->query->get('page', 1);
$perPage = (int) $request->query->get('perPage', 30);
+ $since = $request->query->get('since', 0);
+ $tags = $request->query->get('tags', '');
$pager = $this->getDoctrine()
->getRepository('WallabagCoreBundle:Entry')
- ->findEntries($this->getUser()->getId(), $isArchived, $isStarred, $sort, $order);
+ ->findEntries($this->getUser()->getId(), $isArchived, $isStarred, $sort, $order, $since, $tags);
$pager->setCurrentPage($page);
$pager->setMaxPerPage($perPage);
* {"name"="url", "dataType"="string", "required"=true, "format"="http://www.test.com/article.html", "description"="Url for the entry."},
* {"name"="title", "dataType"="string", "required"=false, "description"="Optional, we'll get the title from the page."},
* {"name"="tags", "dataType"="string", "required"=false, "format"="tag1,tag2,tag3", "description"="a comma-separated list of tags."},
+ * {"name"="starred", "dataType"="integer", "required"=false, "format"="1 or 0", "description"="entry already starred"},
+ * {"name"="archive", "dataType"="integer", "required"=false, "format"="1 or 0", "description"="entry already archived"},
* }
* )
*
$this->validateAuthentication();
$url = $request->request->get('url');
+ $title = $request->request->get('title');
+ $isArchived = $request->request->get('archive');
+ $isStarred = $request->request->get('starred');
- $entry = $this->get('wallabag_core.content_proxy')->updateEntry(
- new Entry($this->getUser()),
- $url
- );
+ $entry = $this->get('wallabag_core.entry_repository')->findByUrlAndUserId($url, $this->getUser()->getId());
+
+ if (false === $entry) {
+ $entry = $this->get('wallabag_core.content_proxy')->updateEntry(
+ new Entry($this->getUser()),
+ $url
+ );
+ }
+
+ if (!is_null($title)) {
+ $entry->setTitle($title);
+ }
$tags = $request->request->get('tags', '');
if (!empty($tags)) {
$this->get('wallabag_core.content_proxy')->assignTagsToEntry($entry, $tags);
}
+ if (!is_null($isStarred)) {
+ $entry->setStarred((bool) $isStarred);
+ }
+
+ if (!is_null($isArchived)) {
+ $entry->setArchived((bool) $isArchived);
+ }
+
$em = $this->getDoctrine()->getManager();
$em->persist($entry);
+
$em->flush();
$json = $this->get('serializer')->serialize($entry, 'json');
* parameters={
* {"name"="title", "dataType"="string", "required"=false},
* {"name"="tags", "dataType"="string", "required"=false, "format"="tag1,tag2,tag3", "description"="a comma-separated list of tags."},
- * {"name"="archive", "dataType"="boolean", "required"=false, "format"="true or false", "description"="archived the entry."},
- * {"name"="star", "dataType"="boolean", "required"=false, "format"="true or false", "description"="starred the entry."},
+ * {"name"="archive", "dataType"="integer", "required"=false, "format"="1 or 0", "description"="archived the entry."},
+ * {"name"="starred", "dataType"="integer", "required"=false, "format"="1 or 0", "description"="starred the entry."},
* }
* )
*
$title = $request->request->get('title');
$isArchived = $request->request->get('archive');
- $isStarred = $request->request->get('star');
+ $isStarred = $request->request->get('starred');
if (!is_null($title)) {
$entry->setTitle($title);
}
if (!is_null($isArchived)) {
- $entry->setArchived($isArchived);
+ $entry->setArchived((bool) $isArchived);
}
if (!is_null($isStarred)) {
- $entry->setStarred($isStarred);
+ $entry->setStarred((bool) $isStarred);
}
$tags = $request->request->get('tags', '');
return $this->renderJsonResponse($json);
}
+ /**
+ * Permanently remove one tag from **every** entry.
+ *
+ * @ApiDoc(
+ * requirements={
+ * {"name"="tag", "dataType"="string", "requirement"="\w+", "description"="The tag as a string"}
+ * }
+ * )
+ *
+ * @return Response
+ */
+ public function deleteTagLabelAction(Request $request)
+ {
+ $this->validateAuthentication();
+ $label = $request->query->get('tag', '');
+
+ $tag = $this->getDoctrine()->getRepository('WallabagCoreBundle:Tag')->findOneByLabel($label);
+ $this->getDoctrine()
+ ->getRepository('WallabagCoreBundle:Entry')
+ ->removeTag($this->getUser()->getId(), $tag);
+
+ $json = $this->get('serializer')->serialize($tag, 'json');
+
+ return $this->renderJsonResponse($json);
+ }
+
+ /**
+ * Permanently remove some tags from **every** entry.
+ *
+ * @ApiDoc(
+ * requirements={
+ * {"name"="tags", "dataType"="string", "required"=true, "format"="tag1,tag2", "description"="The tags as strings"}
+ * }
+ * )
+ *
+ * @return Response
+ */
+ public function deleteTagsLabelAction(Request $request)
+ {
+ $this->validateAuthentication();
+
+ $tagsLabels = $request->query->get('tags', '');
+
+ $tags = array();
+
+ foreach (explode(',', $tagsLabels) as $tagLabel) {
+ $tagEntity = $this->getDoctrine()->getRepository('WallabagCoreBundle:Tag')->findOneByLabel($tagLabel);
+ $tags[] = $tagEntity;
+ }
+
+ $this->getDoctrine()
+ ->getRepository('WallabagCoreBundle:Entry')
+ ->removeTags($this->getUser()->getId(), $tags);
+
+ $json = $this->get('serializer')->serialize($tags, 'json');
+
+ return $this->renderJsonResponse($json);
+ }
+
+ /**
+ * Retrieve version number.
+ *
+ * @ApiDoc()
+ *
+ * @return Response
+ */
+ public function getVersionAction()
+ {
+ $version = $this->container->getParameter('wallabag_core.version');
+
+ $json = $this->get('serializer')->serialize($version, 'json');
+
+ return $this->renderJsonResponse($json);
+ }
+
/**
* Validate that the first id is equal to the second one.
* If not, throw exception. It means a user try to access information from an other user.
*/
private function renderJsonResponse($json)
{
- return new Response($json, 200, array('application/json'));
+ return new Response($json, 200, ['application/json']);
}
}
projects / github / wallabag / wallabag.git / blobdiff