Merge pull request #14 from ngosang/fixstar

Fix starred parameter and remove delete parameter
This commit is contained in:
FoxMaSk
2018-06-03 15:41:39 +02:00
committed by GitHub

View File

@@ -137,8 +137,7 @@ class Wallabag(object):
:param kwargs: can contain one of the following filters :param kwargs: can contain one of the following filters
archive: '0' or '1', default '0' filter by archived status. archive: '0' or '1', default '0' filter by archived status.
star: '0' or '1', default '0' filter by starred status. starred: '0' or '1', default '0' filter by starred status.
delete: '0' or '1', default '0' filter by deleted status.
sort: 'created' or 'updated', default 'created' sort: 'created' or 'updated', default 'created'
order: 'asc' or 'desc', default 'desc' order: 'asc' or 'desc', default 'desc'
page: int default 1 what page you want page: int default 1 what page you want
@@ -150,7 +149,6 @@ class Wallabag(object):
""" """
# default values # default values
params = dict({'access_token': self.token, params = dict({'access_token': self.token,
'delete': 0,
'sort': 'created', 'sort': 'created',
'order': 'desc', 'order': 'desc',
'page': 1, 'page': 1,
@@ -160,10 +158,8 @@ class Wallabag(object):
if 'archive' in kwargs and int(kwargs['archive']) in (0, 1): if 'archive' in kwargs and int(kwargs['archive']) in (0, 1):
params['archive'] = int(kwargs['archive']) params['archive'] = int(kwargs['archive'])
if 'star' in kwargs and int(kwargs['star']) in (0, 1): if 'starred' in kwargs and int(kwargs['starred']) in (0, 1):
params['star'] = int(kwargs['star']) params['starred'] = int(kwargs['starred'])
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'): if 'order' in kwargs and kwargs['order'] in ('asc', 'desc'):
params['order'] = kwargs['order'] params['order'] = kwargs['order']
if 'page' in kwargs and isinstance(kwargs['page'], int): if 'page' in kwargs and isinstance(kwargs['page'], int):
@@ -233,18 +229,14 @@ class Wallabag(object):
title: string title: string
tags: a list of tags tag1,tag2,tag3 tags: a list of tags tag1,tag2,tag3
archive: '0' or '1', default '0' archived the entry. archive: '0' or '1', default '0' archived the entry.
star: '0' or '1', default '0' starred the entry starred: '0' or '1', default '0' starred the entry
delete: '0' or '1', default '0' flag as deleted.
In case that you don't want to *really* remove it.. In case that you don't want to *really* remove it..
:return data related to the ext :return data related to the ext
""" """
# default values # default values
params = {'access_token': self.token, params = {'access_token': self.token,
'title': '', 'title': '',
'archive': 0, 'tags': []}
'tags': [],
'star': 0,
'delete': 0}
if 'title' in kwargs: if 'title' in kwargs:
params['title'] = kwargs['title'] params['title'] = kwargs['title']
@@ -255,11 +247,7 @@ class Wallabag(object):
type_attr=int, type_attr=int,
value_attr=(0, 1), value_attr=(0, 1),
**kwargs) **kwargs)
params['star'] = self.__get_attr(what='star', params['starred'] = self.__get_attr(what='starred',
type_attr=int,
value_attr=(0, 1),
**kwargs)
params['delete'] = self.__get_attr(what='delete',
type_attr=int, type_attr=int,
value_attr=(0, 1), value_attr=(0, 1),
**kwargs) **kwargs)