Merge remote-tracking branch 'origin/master' into woorst-more_listings

Conflicts:
	rtv/rtv.cfg
	tests/test_subreddit.py

rtv/docs.py

@@ -40,6 +40,7 @@ HELP = """
   `l` or `RIGHT`      : Enter the selected submission
   `/`                 : Open a prompt to switch subreddits
   `f`                 : Open a prompt to search the current subreddit
+  'p'                 : Toggle between the front page and last visited subreddit
 
 [Submission Mode]
   `h` or `LEFT`       : Return to subreddit mode

rtv/rtv.cfg

@@ -122,6 +122,7 @@ SUBREDDIT_OPEN = l, <KEY_RIGHT>
 SUBREDDIT_OPEN_IN_BROWSER = o, <LF>, <KEY_ENTER>, <KEY_ENTER>
 SUBREDDIT_OPEN_SUBSCRIPTIONS = s
 SUBREDDIT_OPEN_MULTIREDDITS = S
+SUBREDDIT_FRONTPAGE = p
 
 ; Subscription page
 SUBSCRIPTION_SELECT = l, <LF>, <KEY_ENTER>, <KEY_RIGHT>

rtv/subreddit.py

@@ -30,6 +30,7 @@ class SubredditPage(Page):
         self.controller = SubredditController(self, keymap=config.keymap)
         self.content = SubredditContent.from_name(reddit, name, term.loader)
         self.nav = Navigator(self.content.get)
+        self._toggled_subreddit = None
 
     @SubredditController.register(Command('REFRESH'))
     def refresh_content(self, order=None, name=None):
@@ -73,6 +74,23 @@ class SubredditPage(Page):
         if name is not None:
             self.refresh_content(order='ignore', name=name)
 
+    @SubredditController.register(Command('SUBREDDIT_FRONTPAGE'))
+    def show_frontpage(self):
+        """
+        If on a subreddit, remember it and head back to the front page.
+        If this was pressed on the front page, go back to the last subreddit.
+        """
+
+        if not self.content.name == '/r/front':
+            target = '/r/front'
+            self._toggled_subreddit = self.content.name
+        else:
+            target = self._toggled_subreddit
+
+        # target still may be empty string if this command hasn't yet been used
+        if target is not None:
+            self.refresh_content(order='ignore', name=target)
+
     @SubredditController.register(Command('SUBREDDIT_OPEN'))
     def open_submission(self, url=None):
         "Select the current submission to view posts"