From 9e5fdb1c50ff93b5e38e78016c8c10df461a24af Mon Sep 17 00:00:00 2001 From: FoxMaSk Date: Sun, 27 May 2018 11:20:02 +0200 Subject: [PATCH] update of API fixed #9 post_entries content parameter --- README.rst | 6 +++--- setup.py | 2 +- wallabag_api/__init__.py | 2 +- wallabag_api/wallabag.py | 13 +++++++++++-- wallabag_api/wallabag_test.py | 12 ++++++++++-- 5 files changed, 26 insertions(+), 9 deletions(-) diff --git a/README.rst b/README.rst index f75bbc5..061523c 100644 --- a/README.rst +++ b/README.rst @@ -16,7 +16,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 @@ -57,7 +57,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 @@ -70,7 +70,7 @@ Then create a client API like explain here http://doc.wallabag.org/en/v2/develop this will give you somthing 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 diff --git a/setup.py b/setup.py index 9c98be9..44cb1fe 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,7 @@ setup( long_desc='Wallabag is a "read it later" service, and that Wallabag API allow you to save web pages ' 'to your own account', author='FoxMaSk', - author_email='foxmask@trigger-happy.eu', + 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(), diff --git a/wallabag_api/__init__.py b/wallabag_api/__init__.py index fd9c1bb..95d26d0 100644 --- a/wallabag_api/__init__.py +++ b/wallabag_api/__init__.py @@ -1,2 +1,2 @@ -VERSION = (1, 1, 3) # PEP 386 +VERSION = (1, 1, 4) # PEP 386 __version__ = ".".join([str(x) for x in VERSION]) diff --git a/wallabag_api/wallabag.py b/wallabag_api/wallabag.py index 051c50a..a175367 100644 --- a/wallabag_api/wallabag.py +++ b/wallabag_api/wallabag.py @@ -157,7 +157,8 @@ class Wallabag(object): return self.query(path, "get", **params) - def post_entries(self, url, title='', tags='', starred=0, archive=0): + def post_entries(self, url, title='', tags='', starred=0, archive=0, content='', language='', published_at='', + authors='', public=1, original_url=''): """ POST /api/entries.{_format} @@ -168,10 +169,18 @@ 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} + '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) diff --git a/wallabag_api/wallabag_test.py b/wallabag_api/wallabag_test.py index 17707ca..c97cabf 100644 --- a/wallabag_api/wallabag_test.py +++ b/wallabag_api/wallabag_test.py @@ -1,4 +1,5 @@ # coding: utf-8 +import datetime import unittest from wallabag import Wallabag @@ -31,11 +32,18 @@ class TestWallabag(unittest.TestCase): def create_entry(self): title = 'foobar title' - url = 'https://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 = '

Additional content

' + 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):