Add more functions to client

- subscription list
- get stream contents

Author: einverne

.gitignore

@@ -62,3 +62,4 @@ ENV/
 
 # Spyder project settings
 .spyderproject
+.idea/*

inoreader/client.py

@@ -14,6 +14,7 @@
 from .consts import BASE_URL, LOGIN_URL
 from .exception import NotLoginError, APIError
 from .article import Article
+from .subscription import Subscription
 
 
 class InoreaderClient(object):
@@ -97,6 +98,44 @@ def get_tags(self):
         tags.sort(key=itemgetter('name'))
         return tags
 
+    def get_subscription_list(self):
+        if not self.auth_token:
+            raise NotLoginError
+
+        url = urljoin(BASE_URL, 'subscription/list')
+        resp = self.session.get(url)
+        if resp.status_code != 200:
+            raise APIError(resp.text)
+
+        for item in resp.json()['subscriptions']:
+            yield Subscription.from_json(item)
+
+    def get_stream_contents(self, stream_id):
+        c = ''
+        while True:
+            articles, c = self.__get_stream_contents(stream_id, c)
+            for a in articles:
+                yield Article.from_json(a)
+            if c is None:
+                break
+
+    def __get_stream_contents(self, stream_id, continuation=''):
+        if not self.auth_token:
+            raise NotLoginError
+
+        url = urljoin(BASE_URL, 'stream/contents/' + quote_plus(stream_id))
+        params = {
+            'n': 50, # default 20, max 1000
+            'r': '',
+            'c': continuation,
+            'output': 'json'
+        }
+        resp = self.session.post(url, params=params)
+        if resp.status_code != 200:
+            raise APIError(resp.text)
+
+        return resp.json()['items'], resp.json()['continuation']
+
     def fetch_unread(self, folder=None, tags=None):
         if not self.auth_token:
             raise NotLoginError

inoreader/main.py

@@ -123,6 +123,18 @@ def list_folders():
         print("{}\t{}".format(item['unread_count'], item['name']))
 
 
+def get_subscription_list():
+    client = get_client()
+    for item in client.get_subscription_list():
+        print(item.__dict__)
+
+
+def get_stream_contents(stream_id):
+    client = get_client()
+    for item in client.get_stream_contents(stream_id):
+        print(item.__dict__)
+
+
 def add_tags_list_parser(subparsers):
     subparsers.add_parser('list-tags', help="List all tags")
 

inoreader/subscription.py

@@ -0,0 +1,29 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+
+class Subscription(object):
+    def __init__(self, id, title, categories,
+                 sortid, firstitemmsec, url, htmlUrl, iconUrl):
+        self.id = id
+        self.title = title
+        self.categories = categories
+        self.sortid = sortid
+        self.firstitemmsec = firstitemmsec
+        self.url = url
+        self.htmlUrl = htmlUrl
+        self.iconUrl = iconUrl
+
+    @classmethod
+    def from_json(cls, data):
+        subscription_info = {
+            'id': data['id'],
+            'title': data['title'],
+            'categories': [item for item in data['categories']],
+            'sortid': data['sortid'],
+            'firstitemmsec': data['firstitemmsec'],
+            'url': data['url'],
+            'htmlUrl': data['htmlUrl'],
+            'iconUrl': data['iconUrl']
+        }
+        return cls(**subscription_info)