Fix continuation

Author: einverne

inoreader/client.py

@@ -110,8 +110,7 @@ def get_subscription_list(self):
         for item in resp.json()['subscriptions']:
             yield Subscription.from_json(item)
 
-    def get_stream_contents(self, stream_id):
-        c = ''
+    def get_stream_contents(self, stream_id, c=''):
         while True:
             articles, c = self.__get_stream_contents(stream_id, c)
             for a in articles:
@@ -134,7 +133,10 @@ def __get_stream_contents(self, stream_id, continuation=''):
         if resp.status_code != 200:
             raise APIError(resp.text)
 
-        return resp.json()['items'], resp.json()['continuation']
+        if 'continuation' in resp.json():
+            return resp.json()['items'], resp.json()['continuation']
+        else:
+            return resp.json()['items'], None
 
     def fetch_unread(self, folder=None, tags=None):
         if not self.auth_token:

inoreader/main.py

@@ -123,18 +123,6 @@ 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")