From fc9510c295b2f9bfaa56a7c67c1352397b7091ac Mon Sep 17 00:00:00 2001 From: Michael Lazar Date: Mon, 18 Feb 2019 20:23:57 -0500 Subject: [PATCH] Give sort commands more generic sounding names --- rtv/docs.py | 13 +++++++------ rtv/submission_page.py | 10 +++++----- rtv/subreddit_page.py | 12 ++++++------ rtv/templates/rtv.cfg | 13 +++++++------ 4 files changed, 25 insertions(+), 23 deletions(-) diff --git a/rtv/docs.py b/rtv/docs.py index 94b4d34..a71b0dd 100644 --- a/rtv/docs.py +++ b/rtv/docs.py @@ -38,12 +38,13 @@ https://github.com/michael-lazar/rtv G : Jump to the last post J : Jump to the next sibling comment K : Jump to the parent comment - 1 : Sort by hot - 2 : Sort by top - 3 : Sort by rising - 4 : Sort by new - 5 : Sort by controversial - 6 : Sort by gilded + 1 : Sort by category 1 + 2 : Sort by category 2 + 3 : Sort by category 3 + 4 : Sort by category 4 + 5 : Sort by category 5 + 6 : Sort by category 6 + 7 : Sort by category 7 p : Return to the front page r : Refresh page u : Login or logout diff --git a/rtv/submission_page.py b/rtv/submission_page.py index 22fa14f..b87902e 100644 --- a/rtv/submission_page.py +++ b/rtv/submission_page.py @@ -37,23 +37,23 @@ class SubmissionPage(Page): self.nav = Navigator(self.content.get, page_index=-1) self.selected_subreddit = None - @SubmissionController.register(Command('SORT_HOT')) + @SubmissionController.register(Command('SORT_1')) def sort_content_hot(self): self.refresh_content(order='hot') - @SubmissionController.register(Command('SORT_TOP')) + @SubmissionController.register(Command('SORT_2')) def sort_content_top(self): self.refresh_content(order='top') - @SubmissionController.register(Command('SORT_RISING')) + @SubmissionController.register(Command('SORT_3')) def sort_content_rising(self): self.refresh_content(order='rising') - @SubmissionController.register(Command('SORT_NEW')) + @SubmissionController.register(Command('SORT_4')) def sort_content_new(self): self.refresh_content(order='new') - @SubmissionController.register(Command('SORT_CONTROVERSIAL')) + @SubmissionController.register(Command('SORT_5')) def sort_content_controversial(self): self.refresh_content(order='controversial') diff --git a/rtv/subreddit_page.py b/rtv/subreddit_page.py index 4e796d8..bbb7769 100644 --- a/rtv/subreddit_page.py +++ b/rtv/subreddit_page.py @@ -60,14 +60,14 @@ class SubredditPage(Page): if not self.term.loader.exception: self.nav = Navigator(self.content.get) - @SubredditController.register(Command('SORT_HOT')) + @SubredditController.register(Command('SORT_1')) 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')) + @SubredditController.register(Command('SORT_2')) def sort_content_top(self): order = self._prompt_period('top') if order is None: @@ -75,7 +75,7 @@ class SubredditPage(Page): else: self.refresh_content(order=order) - @SubredditController.register(Command('SORT_RISING')) + @SubredditController.register(Command('SORT_3')) def sort_content_rising(self): if self.content.query: order = self._prompt_period('comments') @@ -86,11 +86,11 @@ class SubredditPage(Page): else: self.refresh_content(order='rising') - @SubredditController.register(Command('SORT_NEW')) + @SubredditController.register(Command('SORT_4')) def sort_content_new(self): self.refresh_content(order='new') - @SubredditController.register(Command('SORT_CONTROVERSIAL')) + @SubredditController.register(Command('SORT_5')) def sort_content_controversial(self): if self.content.query: self.term.flash() @@ -101,7 +101,7 @@ class SubredditPage(Page): else: self.refresh_content(order=order) - @SubredditController.register(Command('SORT_GILDED')) + @SubredditController.register(Command('SORT_6')) def sort_content_gilded(self): if self.content.query: self.term.flash() diff --git a/rtv/templates/rtv.cfg b/rtv/templates/rtv.cfg index e16e503..c521642 100644 --- a/rtv/templates/rtv.cfg +++ b/rtv/templates/rtv.cfg @@ -117,12 +117,13 @@ imgur_client_id = 93396265f59dec9 EXIT = q FORCE_EXIT = Q HELP = ? -SORT_HOT = 1 -SORT_TOP = 2 -SORT_RISING = 3 -SORT_NEW = 4 -SORT_CONTROVERSIAL = 5 -SORT_GILDED = 6 +SORT_1 = 1 +SORT_2 = 2 +SORT_3 = 3 +SORT_4 = 4 +SORT_5 = 5 +SORT_6 = 6 +SORT_7 = 7 MOVE_UP = k, MOVE_DOWN = j, PREVIOUS_THEME =