fix #8 + upd API

add access_token to entries_exists

README.rst

@@ -27,7 +27,7 @@ to get the project, from your virtualenv, do :
 
 .. code:: python
 
-    git clone https://github.com/foxmask/wallabag-api/
+    git clone https://github.com/push-things/wallabag_api/
 
 
 or
@@ -110,7 +110,7 @@ Creating a post :
 
 this will give you something like this :
 
-.. image:: https://github.com/foxmask/wallabag_api/blob/master/wallabag.png
+.. image:: https://github.com/push-things/wallabag_api/blob/master/wallabag.png
 
 
 Testing :
@@ -124,7 +124,7 @@ Then create a client API like explain here http://doc.wallabag.org/en/v2/develop
 
 this will give you something like this
 
-.. image:: https://github.com/foxmask/wallabag_api/blob/master/wallabag_api_key.png
+.. image:: https://github.com/push-things/wallabag_api/blob/master/wallabag_api_key.png
 
 Then replace the client_id / client_secret / login / pass to wallabag_test.py and run
 

setup.py

@@ -2,19 +2,21 @@ from setuptools import setup, find_packages
 from wallabag_api import __version__ as version
 
 desc = 'Wallabag API to add every pages you want to your Wallabag account'
+long_desc = 'Wallabag is a "read it later" service, and that Wallabag API allow you to save web pages ' \
+            'to your own account'
 install_requires = [
-    'aiohttp==2.2.5',
+    'aiohttp',
 ]
 
 setup(
     name='wallabag_api',
     version=version,
     description=desc,
+    long_description=long_desc,
     author='FoxMaSk',
-    author_email='foxmask@trigger-happy.eu',
-    url='https://github.com/foxmask/wallabag_api',
-    download_url="https://github.com/foxmask/wallabag_api/archive/"
-                 "wallabag_api-" + version + ".zip",
+    author_email='foxmaskhome@gmail.com',
+    url='https://github.com/push-things/wallabag_api',
+    download_url="https://github.com/push-things/wallabag_api/archive/wallabag_api-" + version + ".zip",
     packages=find_packages(),
     classifiers=[
         'Development Status :: 5 - Production/Stable',

wallabag_api/__init__.py

@@ -1,2 +1,2 @@
-VERSION = (1, 2, 0)  # PEP 386
+VERSION = (1, 2, 3)  # PEP 386
 __version__ = ".".join([str(x) for x in VERSION])

wallabag_api/wallabag.py

@@ -33,8 +33,8 @@ class Wallabag(object):
                  client_id='',
                  client_secret='',
                  extension='json',
-                 user_agent="WallabagPython/1.3 "
-                            "+https://github.com/foxmask/wallabag-api",
+                 user_agent="WallabagPython/1.2.2 "
+                            " +https://github.com/push-things/wallabag-api",
                  aio_sess=None):
         """
         init variable
@@ -97,10 +97,13 @@ class Wallabag(object):
         :param responses: the json response
         :return the json data without 'root' node
         """
-        if responses.status != 200:
-            raise HttpProcessingError(code=responses.status,
-                                      message=await responses.json())
         json_data = {}
+        if responses.status != 200:
+            err_msg = HttpProcessingError(code=responses.status,
+                                          message=await responses.json())
+            logging.error("Wallabag: aiohttp error {err_msg}".format(
+                err_msg=err_msg))
+        else:
             try:
                 json_data = responses.json()
             except ClientResponseError as e:
@@ -147,8 +150,6 @@ class Wallabag(object):
         """
         # default values
         params = dict({'access_token': self.token,
-                       'archive': 0,
-                       'star': 0,
                        'delete': 0,
                        'sort': 'created',
                        'order': 'desc',
@@ -157,23 +158,14 @@ class Wallabag(object):
                        'tags': '',
                        'since': 0})
 
-        params['archive'] = self.__get_attr(what='archive',
-                                            type_attr=int,
-                                            value_attr=(0, 1),
-                                            **params)
-        params['star'] = self.__get_attr(what='star',
-                                         type_attr=int,
-                                         value_attr=(0, 1),
-                                         **params)
-        params['delete'] = self.__get_attr(what='delete',
-                                           type_attr=int,
-                                           value_attr=(0, 1),
-                                           **params)
-        params['order'] = self.__get_attr(what='order',
-                                          type_attr=str,
-                                          value_attr=('asc', 'desc'),
-                                          **params)
-
+        if 'archive' in kwargs and int(kwargs['archive']) in (0, 1):
+            params['archive'] = int(kwargs['archive'])
+        if 'star' in kwargs and int(kwargs['star']) in (0, 1):
+            params['star'] = int(kwargs['star'])
+        if 'delete' in kwargs and int(kwargs['delete']) in (0, 1):
+            params['delete'] = int(kwargs['delete'])
+        if 'order' in kwargs and kwargs['order'] in ('asc', 'desc'):
+            params['order'] = kwargs['order']
         if 'page' in kwargs and isinstance(kwargs['page'], int):
             params['page'] = kwargs['page']
         if 'perPage' in kwargs and isinstance(kwargs['perPage'], int):
@@ -187,7 +179,8 @@ class Wallabag(object):
 
         return await self.query(path, "get", **params)
 
-    async def post_entries(self, url, title='', tags='', starred=0, archive=0):
+    async def post_entries(self, url, title='', tags='', starred=0, archive=0, content='', language='', published_at='',
+                           authors='', public=1, original_url=''):
         """
         POST /api/entries.{_format}
 
@@ -198,12 +191,20 @@ class Wallabag(object):
         :param tags: tag1,tag2,tag3 a comma-separated list of tags.
         :param starred entry already starred
         :param archive entry already archived
+        :param content additionnal html content
+        :param language
+        :param published_at
+        :param authors
+        :param public
+        :param original_url
         :return result
         """
         params = {'access_token': self.token, 'url': url, 'title': title,
-                  'tags': tags, 'starred': starred, 'archive': archive}
-        if len(tags) > 0 and ',' in tags:
-            params['tags'] = tags.split(',')
+                  'tags': tags, 'starred': starred, 'archive': archive,
+                  'content': content, 'language': language, 'published_at': published_at,
+                  'authors': authors, 'public': public, 'original_url': original_url}
+        if len(tags) > 0 and isinstance(tags, list):
+            params['tags'] = ', '.join(tags)
         path = '/api/entries.{ext}'.format(ext=self.format)
         return await self.query(path, "post", **params)
 
@@ -329,7 +330,8 @@ class Wallabag(object):
 
         :return result
         """
-        params = {'url': url,
+        params = {'access_token': self.token,
+                  'url': url,
                   'urls': urls}
 
         path = '/api/entries/exists.{ext}'.format(ext=self.format)

wallabag_api/wallabag_test.py

@@ -1,4 +1,5 @@
 # coding: utf-8
+import datetime
 import unittest
 from wallabag import Wallabag
 
@@ -33,17 +34,23 @@ class TestWallabag(unittest.TestCase):
 
     def create_entry(self):
         title = 'foobar title'
-        url = 'https://smcomm.trigger-happy.eu/'
+        url = 'https://somwhere.over.the.raibow.com/'
         tags = ['foo', 'bar']
         starred = 0
         archive = 0
-        data = self.w.post_entries(url, title, tags, starred, archive)
+        content = '<p>Additional content</p>'
+        language = 'FR'
+        published_at = datetime.datetime.now()
+        authors = 'John Doe'
+        public = 0
+        original_url = 'http://localhost'
+        data = self.w.post_entries(url, title, tags, starred, archive, content, language, published_at, authors,
+                                   public, original_url)
+
         return data
 
     def test_get_entries(self):
-        params = {'archive': 0,
-                  'star': 0,
-                  'delete': 0,
+        params = {'delete': 0,
                   'sort': 'created',
                   'order': 'desc',
                   'page': 1,
@@ -109,5 +116,6 @@ class TestWallabag(unittest.TestCase):
         self.assertTrue(resp, True)
     """
 
+
 if __name__ == '__main__':
     unittest.main()