Merge pull request #26 from Linusp/new-command-edit-subscription

New command `edit-subscription`

Author: Linusp

CHANGELOG.md

@@ -1,5 +1,19 @@
 # CHANGELOG
 
+## v0.5.0
+
+Added
+
+- New method: `Inoreader.edit_subscription`
+- New command `edit-subscription`, now  you can do these with this command:
+
+  - Subscribe a new feed
+  - Unsubscribe a subscription
+  - Rename a subscription
+  - Add a subscription to a folder or remove it from a folder
+
+Thanks to [Robért](https://github.com/rsguhr) for his [advice](https://github.com/Linusp/python-inoreader/issues/25).
+
 ## v0.4.6
 
 Added

inoreader/client.py

@@ -32,6 +32,7 @@ class InoreaderClient(object):
     SUBSCRIPTION_LIST_PATH = 'subscription/list'
     STREAM_CONTENTS_PATH = 'stream/contents/'
     EDIT_TAG_PATH = 'edit-tag'
+    EDIT_SUBSCRIPTION_PATH = 'subscription/edit'
 
     # tags
     GENERAL_TAG_TEMPLATE = 'user/-/label/{}'
@@ -151,7 +152,7 @@ def get_stream_contents(self, stream_id, c='', limit=None):
             for a in articles:
                 try:
                     yield Article.from_json(a)
-                    fetched_count+=1
+                    fetched_count += 1
                 except Exception as e:
                     print(e)
                     continue
@@ -160,7 +161,6 @@ def get_stream_contents(self, stream_id, c='', limit=None):
                     break
             if c is None:
                 break
-            
 
     def __get_stream_contents(self, stream_id, continuation=''):
         self.check_token()
@@ -227,7 +227,6 @@ def fetch_articles(self, folder=None, tags=None, unread=True, starred=False, lim
                     break
 
             continuation = response.get('continuation')
-            
 
     def fetch_unread(self, folder=None, tags=None, limit=None):
         for article in self.fetch_articles(folder=folder, tags=tags, unread=True):
@@ -285,3 +284,27 @@ def remove_liked(self, articles):
 
     def broadcast(self, articles):
         self.add_general_label(articles, self.BROADCAST_TAG)
+
+    def edit_subscription(self, stream_id, action, title=None, add_folder=None, remove_folder=None):
+        self.check_token()
+        url = urljoin(BASE_URL, self.EDIT_SUBSCRIPTION_PATH)
+        # https://us.inoreader.com/developers/edit-subscription
+        # The documentation looks a bit outdated, `follow`/`unfollow` don't work
+        action = {'follow': 'subscribe', 'unfollow': 'unsubscribe'}.get(action) or action
+        params = {'ac': action, 's': stream_id}
+        if title:
+            params['t'] = title
+
+        if add_folder:
+            params['a'] = add_folder
+
+        if remove_folder:
+            params['r'] = remove_folder
+
+        r = self.session.post(url, params=params, proxies=self.proxies)
+        response = self.parse_response(
+            r,
+            # self.session.post(url, params=params, proxies=self.proxies),
+            json_data=False
+        )
+        return response

inoreader/main.py

@@ -586,5 +586,47 @@ def fetch_starred(folder, tags, outfile, outdir, limit, save_image, out_format):
         LOGGER.info("fetched %d articles and saved them in %s", fetched_count, outdir)
 
 
+@main.command("edit-subscription")
+@click.option("-a", "--action",
+              required=True,
+              type=click.Choice(['follow', 'unfollow', 'rename', 'add-folder', 'remove-folder']),
+              help="")
+@click.option("-i", "--stream-id", required=True, help='Stream ID which you want to fetch')
+@click.option("-n", "--name", help='The name of subscription, for action follow/rename(required)')
+@click.option("-f", "--folder", help='Folder which subscription belong to')
+@catch_error
+def edit_subscriptions(action, stream_id, name, folder):
+    """Get your subscriptions"""
+    edit_action = action
+    if action in ('rename', 'add-folder', 'remove-folder'):
+        edit_action = 'edit'
+        if action == 'rename' and not name:
+            click.secho("`name` is required for action `rename`!", fg="red")
+            return -1
+        elif action in ('add-folder', 'remove_starred') and not folder:
+            click.secho(f"`folder` is required for action `{action}`", fg="red")
+            return -1
+
+    client = get_client()
+    stream_id = 'feed/' + stream_id if not stream_id.startswith('feed/') else stream_id
+    if folder and not folder.startswith('user/-/label/'):
+        folder = client.GENERAL_TAG_TEMPLATE.format(folder)
+
+    add_folder = folder if action in ('follow', 'add-folder') else None
+    remove_folder = folder if action == 'remove-folder' else None
+    try:
+        response = client.edit_subscription(
+            stream_id,
+            edit_action,
+            title=name,
+            add_folder=add_folder,
+            remove_folder=remove_folder
+        )
+        click.secho(response, fg="green")
+    except Exception as exception:
+        print("Error:", str(exception))
+        return -1
+
+
 if __name__ == '__main__':
     main()

inoreader/utils.py

@@ -38,7 +38,7 @@ def extract_text(html_content):
         link.text = '[%s](%s)' % (text, url)
     try:
         return content.text_content().replace("\xa0", "").strip()
-    except:
+    except Exception:
         return ""
 
 

setup.cfg

@@ -1,7 +1,7 @@
 [flake8]
 max-line-length = 100
-ignore = E201,E202
+ignore = E201,E202,E203
 
 [pep8]
 max-line-length = 100
-ignore = E201,E202
+ignore = E201,E202,E203

setup.py

@@ -4,7 +4,7 @@
 from setuptools import setup, find_packages
 
 
-VERSION = '0.4.7'
+VERSION = '0.5.0'
 REQS = [
     'lxml',
     'requests',