Merge pull request #616 from woorst/open_links_previous

Previous page link in open links prompt.

rtv/terminal.py

@@ -361,39 +361,50 @@ class Terminal(object):
         Return the link that was selected, or ``None`` if no link was selected.
         """
         link_pages = self.get_link_pages(links)
-        for n, link_page in enumerate(link_pages, start=1):
+        n = 0
+        while n in range(len(link_pages)):
+            link_page = link_pages[n]
             text = 'Select a link to open (page {} of {}):\n\n'
-            text = text.format(n, len(link_pages))
+            text = text.format(n+1, len(link_pages))
             text += self.get_link_page_text(link_page)
             if link_page is not link_pages[-1]:
-                text += '[9] next page...'
+                text += '[j] next page...'
+            if link_page is not link_pages[0]:
+                if link_page is not link_pages[-1]:
+                    text += '\n'
+                text += '[k] ...previous page'
 
             try:
-                choice = int(chr(self.show_notification(text)))
+                choice = chr(self.show_notification(text))
+                try:
+                    choice = int(choice)
+                except ValueError:
+                    pass
             except ValueError:
                 return None
-            if link_page is not link_pages[-1] and choice == 9:
+            if choice == 'j':
+                if link_page is not link_pages[-1]:
+                    n += 1
                 continue
-            elif choice == 0 or choice > len(link_page):
+            elif choice == 'k':
+                if link_page is not link_pages[0]:
+                    n -= 1
+                continue
+            elif choice not in range(len(link_page)):
                 return None
-            return link_page[choice - 1]['href']
+            return link_page[choice]['href']
 
     @staticmethod
     def get_link_pages(links):
         """
         Given a list of links, separate them into pages that can be displayed
-        to the user and navigated using the 1-9 number keys. The last page
+        to the user and navigated using the 1-9 and 0 number keys.
-        can contain up to 9 links, and all other pages can contain up to 8
-        links.
         """
         link_pages = []
         i = 0
         while i < len(links):
             link_page = []
-            while i < len(links) and len(link_page) < 8:
+            while i < len(links) and len(link_page) < 10:
-                link_page.append(links[i])
-                i += 1
-            if i == len(links) - 1:
                 link_page.append(links[i])
                 i += 1
             link_pages.append(link_page)
@@ -408,7 +419,7 @@ class Terminal(object):
         for i, link in enumerate(link_page):
             capped_link_text = (link['text'] if len(link['text']) <= 20
                                 else link['text'][:19] + '…')
-            text += '[{}] [{}]({})\n'.format(i + 1, capped_link_text, link['href'])
+            text += '[{}] [{}]({})\n'.format(i, capped_link_text, link['href'])
         return text
 
     def open_link(self, url):

tests/test_terminal.py

@@ -710,13 +710,13 @@ def test_terminal_get_link_pages(terminal):
     # A single link should generate a single page
     assert terminal.get_link_pages([1]) == [[1]]
 
-    # Up to 9 links should fit on a single page
+    # Up to 10 links should fit on a single page
-    link_pages = terminal.get_link_pages([1, 2, 3, 4, 5, 6, 7, 8, 9])
+    link_pages = terminal.get_link_pages([0, 1, 2, 3, 4, 5, 6, 7, 8, 9])
-    assert link_pages == [[1, 2, 3, 4, 5, 6, 7, 8, 9]]
+    assert link_pages == [[0, 1, 2, 3, 4, 5, 6, 7, 8, 9]]
 
-    # When the 10th link is added, the 9th link should now wrap to a new page
+    # When the 11th link is added a new page is created
-    link_pages = terminal.get_link_pages([1, 2, 3, 4, 5, 6, 7, 8, 9, 10])
+    link_pages = terminal.get_link_pages([0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10])
-    assert link_pages == [[1, 2, 3, 4, 5, 6, 7, 8], [9, 10]]
+    assert link_pages == [[0, 1, 2, 3, 4, 5, 6, 7, 8, 9], [10]]
 
 
 def test_terminal_get_link_page_text(terminal):
@@ -732,9 +732,9 @@ def test_terminal_get_link_page_text(terminal):
 
     text = terminal.get_link_page_text(link_page)
     assert text == dedent("""\
-    [1] [Reddit Homepage](https://www.reddit.com)
+    [0] [Reddit Homepage](https://www.reddit.com)
-    [2] [Search Engine](https://www.duckduckgo.com)
+    [1] [Search Engine](https://www.duckduckgo.com)
-    [3] [This project's home…](https://github.com/michael-lazar/rtv)
+    [2] [This project's home…](https://github.com/michael-lazar/rtv)
     """)
 
 
@@ -742,6 +742,7 @@ def test_terminal_prompt_user_to_select_link(terminal, stdscr):
 
     # Select the 2nd link on the 2nd page
     links = [
+        {'href': 'www.website-0.com', 'text': 'Website 0'},
         {'href': 'www.website-1.com', 'text': 'Website 1'},
         {'href': 'www.website-2.com', 'text': 'Website 2'},
         {'href': 'www.website-3.com', 'text': 'Website 3'},
@@ -755,12 +756,13 @@ def test_terminal_prompt_user_to_select_link(terminal, stdscr):
         {'href': 'www.website-11.com', 'text': 'Website 11'},
         {'href': 'www.website-12.com', 'text': 'Website 12'},
     ]
-    stdscr.getch.side_effect = [ord('9'), ord('2')]
+    stdscr.getch.side_effect = [ord('j'), ord('2')]
     href = terminal.prompt_user_to_select_link(links)
-    assert href == 'www.website-10.com'
+    assert href == 'www.website-12.com'
 
     # Select a link that doesn't exist
     links = [
+        {'href': 'www.website-0.com', 'text': 'Website 0'},
         {'href': 'www.website-1.com', 'text': 'Website 1'},
         {'href': 'www.website-2.com', 'text': 'Website 2'},
     ]