diff --git a/rtv/page.py b/rtv/page.py index 70ff6ef..134774c 100644 --- a/rtv/page.py +++ b/rtv/page.py @@ -99,47 +99,6 @@ class Page(object): def show_help(self): self.term.open_pager(docs.HELP.strip()) - @PageController.register(Command('SORT_HOT')) - def sort_content_hot(self): - if self.content.query: - self.refresh_content(order='relevance') - else: - self.refresh_content(order='hot') - - @PageController.register(Command('SORT_TOP')) - def sort_content_top(self): - order = self._prompt_period('top') - if order is None: - self.term.show_notification('Invalid option') - else: - self.refresh_content(order=order) - - @PageController.register(Command('SORT_RISING')) - def sort_content_rising(self): - if self.content.query: - order = self._prompt_period('comments') - if order is None: - self.term.show_notification('Invalid option') - else: - self.refresh_content(order=order) - else: - self.refresh_content(order='rising') - - @PageController.register(Command('SORT_NEW')) - def sort_content_new(self): - self.refresh_content(order='new') - - @PageController.register(Command('SORT_CONTROVERSIAL')) - def sort_content_controversial(self): - if self.content.query: - self.term.flash() - else: - order = self._prompt_period('controversial') - if order is None: - self.term.show_notification('Invalid option') - else: - self.refresh_content(order=order) - @PageController.register(Command('MOVE_UP')) def move_cursor_up(self): self._move_cursor(-1) diff --git a/rtv/submission_page.py b/rtv/submission_page.py index c881f5d..ff587d3 100644 --- a/rtv/submission_page.py +++ b/rtv/submission_page.py @@ -36,6 +36,26 @@ class SubmissionPage(Page): self.nav = Navigator(self.content.get, page_index=-1) self.selected_subreddit = None + @SubmissionController.register(Command('SORT_HOT')) + def sort_content_hot(self): + self.refresh_content(order='hot') + + @SubmissionController.register(Command('SORT_TOP')) + def sort_content_top(self): + self.refresh_content(order='top') + + @SubmissionController.register(Command('SORT_RISING')) + def sort_content_rising(self): + self.refresh_content(order='rising') + + @SubmissionController.register(Command('SORT_NEW')) + def sort_content_new(self): + self.refresh_content(order='new') + + @SubmissionController.register(Command('SORT_CONTROVERSIAL')) + def sort_content_controversial(self): + self.refresh_content(order='controversial') + @SubmissionController.register(Command('SUBMISSION_TOGGLE_COMMENT')) def toggle_comment(self): """ diff --git a/rtv/subreddit_page.py b/rtv/subreddit_page.py index b377a09..7d1463e 100644 --- a/rtv/subreddit_page.py +++ b/rtv/subreddit_page.py @@ -60,6 +60,47 @@ class SubredditPage(Page): if not self.term.loader.exception: self.nav = Navigator(self.content.get) + @SubredditController.register(Command('SORT_HOT')) + def sort_content_hot(self): + if self.content.query: + self.refresh_content(order='relevance') + else: + self.refresh_content(order='hot') + + @SubredditController.register(Command('SORT_TOP')) + def sort_content_top(self): + order = self._prompt_period('top') + if order is None: + self.term.show_notification('Invalid option') + else: + self.refresh_content(order=order) + + @SubredditController.register(Command('SORT_RISING')) + def sort_content_rising(self): + if self.content.query: + order = self._prompt_period('comments') + if order is None: + self.term.show_notification('Invalid option') + else: + self.refresh_content(order=order) + else: + self.refresh_content(order='rising') + + @SubredditController.register(Command('SORT_NEW')) + def sort_content_new(self): + self.refresh_content(order='new') + + @SubredditController.register(Command('SORT_CONTROVERSIAL')) + def sort_content_controversial(self): + if self.content.query: + self.term.flash() + else: + order = self._prompt_period('controversial') + if order is None: + self.term.show_notification('Invalid option') + else: + self.refresh_content(order=order) + @SubredditController.register(Command('SUBREDDIT_SEARCH')) def search_subreddit(self, name=None): """