The CLI interface is simple and smaller, it passes it's params through to PocketApp

cli.py

@@ -1,4 +1,4 @@
-import configparser
+
 import csv
 import math
 import os
@@ -13,6 +13,12 @@ import click
 import pocket
 from progress.spinner import Spinner
 
+from app import PocketApp
+from utils import format_article
+
+
+pocket_app = PocketApp()
+
 WORDS_PER_MINUTE = 180
 
 
@@ -21,6 +27,19 @@ def main():
     pass
 
 
+@click.command()
+@click.option('--consumer-key', '-k',
+              prompt='Please provide your consumer key')
+@click.option('--access-token', '-t',
+              prompt='Please provide your access token')
+@click.option('--words-per-minute', '-wpm',
+              type=click.INT,
+              prompt='Please prefer your reading speed in words per minute',
+              help='Used in calculating reading time for each article')
+def configure():
+    pass
+
+
 @click.command(name='list')
 @click.option('--limit', '-l', default=10,
               help='Number of items to list')
@@ -28,7 +47,7 @@ def main():
               type=click.Choice(['asc', 'desc']),
               help='Order of items to return')
 def list_articles(limit, order):
-    articles = get_index(limit, order)
+    articles = pocket_app.get_articles(limit, order)
 
     try:
         pager = subprocess.Popen(['less'],
@@ -37,173 +56,72 @@ def list_articles(limit, order):
         for article in articles:
             if int(article['reading_time']) <= 0:
                 article['reading_time'] = 'Unknown'
-
-            pager.stdin.write(b'=' * shutil.get_terminal_size()[0])
             pager.stdin.write(
-                '{} - {}\nReading Time: {} Mins\nURL: {}\n'.format(
+                bytearray(format_article(article, line=True), 'utf-8'))
-                    article['id'],
+
-                    article['title'] if article['title'] else '(No Title)',
-                    article['reading_time'],
-                    article['url']
-                ).encode('utf-8')
-            )
         pager.stdin.close()
         pager.wait()
     except (KeyboardInterrupt, ValueError):
-        # let less handle this, -K will exit cleanly
         pass
 
 
-@click.command(name='random')
+@click.command()
-@click.option('--archive/--no-archive', '-a/-na',
+@click.argument('item_id')
+@click.option('--open-origin', '-o', is_flag=True,
+              default=False,
+              help='Open original URL not the pocket one')
+@click.option('--archive', '-a', is_flag=True,
               default=False,
               help='Archive article')
-@click.option('--browser/--no-browser', '-b/-nb',
+def read(item_id, open_origin, archive):
+    article = pocket_app.find_article(item_id)
+
+    if not article:
+        print('Article with this ID was not found.')
+
+    url = 'https://getpocket.com/a/read/{}'.format(article['id'])
+
+    print(format_article(article, header='Selected Article'))
+
+    if open_origin:
+        url = article['url']
+
+    webbrowser.open_new_tab(url)
+
+    if archive:
+        pocket_app.archive_article(article['id'])
+
+
+@click.command(name='random')
+@click.option('--archive', '-a', is_flag=True,
+              default=False,
+              help='Archive article')
+@click.option('--browser', '-b', is_flag=True,
               default=False,
               help='Open in browser')
 def random_article(browser, archive):
-    articles = get_index()
+    articles = pocket_app.get_articles()
     article = random.choice(articles)
 
-    print('=' * shutil.get_terminal_size()[0])
+    print(format_article(article, header='Selected Article', line=True))
-    print('Selected Article:\n{} - {}\nReading Time: {} Mins\nURL: {}'.format(
-        article['id'],
-        article['title'],
-        article['reading_time'],
-        article['url']
-    ))
-    print('=' * shutil.get_terminal_size()[0])
 
     if browser:
         webbrowser.open_new_tab(article['url'])
 
     if archive:
-        archive_article(article['id'])
+        pocket_app.archive_article(article['id'])
 
 
 @click.command()
 def fetch():
-    configs = get_configs(None)
+    pocket_app.fetch_articles(True)
-
-    try:
-        wpm = configs.get('reading', 'words_per_minute')
-    except (configparser.NoSectionError, configparser.NoOptionError):
-        wpm = None
-
-    if not wpm:
-        wpm = WORDS_PER_MINUTE
-
-    pocket_instance = pocket.Pocket(
-        configs.get('auth', 'consumer_key'),
-        configs.get('auth', 'access_token')
-    )
-
-    articles_index = []
-
-    spinner = Spinner('Loading articles ')
-
-    offset = 0
-    count = 20
-    while(True):
-        articles = pocket_instance.retrieve(
-            state='unread',
-            count=count,
-            offset=offset
-        )
-
-        print(articles)
-
-        if not articles['list']:
-            break
-
-        for article in articles['list'].values():
-            word_count = int(article['word_count'])
-            if word_count == 0:
-                reading_time = -1
-            else:
-                reading_time = math.ceil(word_count / wpm)
-
-            title = article['resolved_title']
-            if not title:
-                title = article['given_title']
-
-            url = article['resolved_url']
-            if not url:
-                url = article['given_url']
-
-            index = {
-                'id': article['item_id'],
-                'title': title,
-                'url': url,
-                'word_count': article['word_count'],
-                'reading_time': reading_time
-            }
-
-            articles_index.append(index)
-
-        offset += count
-        spinner.next()
-
-    articles_index = sorted(articles_index,
-                            key=itemgetter('reading_time'))
-    store_index(articles_index)
 
 
-def archive_article(item_id):
+main.add_command(configure)
-    configs = get_configs(None)
-
-    pocket_instance = pocket.Pocket(
-        configs.get('auth', 'consumer_key'),
-        configs.get('auth', 'access_token')
-    )
-
-    pocket_instance.archive(int(item_id)).commit()
-
-
-def get_index(limit=10, order='asc'):
-    index = []
-    filename = '{}/.pocket-time-index'.format(os.path.expanduser('~'))
-
-    row_counter = 0
-    with open(filename, 'r') as csv_file:
-        reader = csv.DictReader(csv_file)
-        for row in reader:
-            index.append(row)
-
-            if order == 'asc':
-                row_counter += 1
-            if row_counter == limit:
-                break
-
-    if order == 'desc':
-        index = index[::-1]
-
-    return index[0:limit]
-
-
-def store_index(index_data):
-    filename = '{}/.pocket-time-index'.format(os.path.expanduser('~'))
-    with open(filename, 'w') as csv_file:
-        dict_writer = csv.DictWriter(csv_file, index_data[0].keys())
-        dict_writer.writeheader()
-        dict_writer.writerows(index_data)
-
-
-def get_configs(path):
-    if path is not None and not os.path.exists(path):
-        raise ValueError('Path {} does not exist'.format(path))
-
-    if path is None:
-        path = '{}/.pocket-time'.format(os.path.expanduser('~'))
-
-    config_parser = configparser.ConfigParser()
-    config_parser.readfp(open(path))
-
-    return config_parser
-
 main.add_command(list_articles)
 main.add_command(random_article)
 main.add_command(fetch)
+main.add_command(read)
 
 if __name__ == '__main__':
     main()