From 66bc9f56672328fcd91bd7aec0d87ef57d0485e5 Mon Sep 17 00:00:00 2001 From: Tobin Date: Thu, 2 Apr 2015 22:58:27 -0500 Subject: [PATCH 1/4] toggle hidden comment with arrow left or h --- rtv/content.py | 4 ++++ rtv/submission.py | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/rtv/content.py b/rtv/content.py index 5a1f872..302ebea 100644 --- a/rtv/content.py +++ b/rtv/content.py @@ -229,6 +229,10 @@ class SubmissionContent(BaseContent): else: raise ValueError('% type not recognized' % data['type']) + def is_hidden_comment(self, index): + data = self.get(index) + return data['type'] == 'HiddenComment' + class SubredditContent(BaseContent): diff --git a/rtv/submission.py b/rtv/submission.py index 43899d6..f8bfa95 100644 --- a/rtv/submission.py +++ b/rtv/submission.py @@ -53,7 +53,11 @@ class SubmissionPage(BasePage): @SubmissionController.register(curses.KEY_LEFT, 'h') def exit_submission(self): - self.active = False + index = self.nav.absolute_index + if self.content.is_hidden_comment(index): + self.content.toggle(index) + else: + self.active = False @SubmissionController.register(curses.KEY_F5, 'r') def refresh_content(self): From db7f2f9fd7d33a175e9f864f2c37f213c5d94faf Mon Sep 17 00:00:00 2001 From: Tobin Date: Fri, 3 Apr 2015 23:31:47 -0500 Subject: [PATCH 2/4] Revert "toggle hidden comment with arrow left or h" This reverts commit 66bc9f56672328fcd91bd7aec0d87ef57d0485e5. --- rtv/content.py | 4 ---- rtv/submission.py | 6 +----- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/rtv/content.py b/rtv/content.py index b1ef638..8d3a501 100644 --- a/rtv/content.py +++ b/rtv/content.py @@ -229,10 +229,6 @@ class SubmissionContent(BaseContent): else: raise ValueError('% type not recognized' % data['type']) - def is_hidden_comment(self, index): - data = self.get(index) - return data['type'] == 'HiddenComment' - class SubredditContent(BaseContent): diff --git a/rtv/submission.py b/rtv/submission.py index ee7aa63..461fc67 100644 --- a/rtv/submission.py +++ b/rtv/submission.py @@ -53,11 +53,7 @@ class SubmissionPage(BasePage): @SubmissionController.register(curses.KEY_LEFT, 'h') def exit_submission(self): - index = self.nav.absolute_index - if self.content.is_hidden_comment(index): - self.content.toggle(index) - else: - self.active = False + self.active = False @SubmissionController.register(curses.KEY_F5, 'r') def refresh_content(self): From 69c3f1c35717b9f35d61fb2a9f4cbeb2fb78df77 Mon Sep 17 00:00:00 2001 From: Tobin Date: Fri, 3 Apr 2015 23:43:14 -0500 Subject: [PATCH 3/4] added gold symbol to submissions --- rtv/content.py | 1 + rtv/submission.py | 6 +++++- rtv/subreddit.py | 10 +++++++--- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/rtv/content.py b/rtv/content.py index 69a0ea4..06c535a 100644 --- a/rtv/content.py +++ b/rtv/content.py @@ -108,6 +108,7 @@ class BaseContent(object): data['url_full'] = sub.url data['url'] = ('selfpost' if is_selfpost(sub.url) else sub.url) data['likes'] = sub.likes + data['gold'] = sub.gilded > 0 return data diff --git a/rtv/submission.py b/rtv/submission.py index 185003d..57b1f20 100644 --- a/rtv/submission.py +++ b/rtv/submission.py @@ -220,9 +220,13 @@ class SubmissionPage(BasePage): attr = curses.A_BOLD | Color.YELLOW text = clean(u' {flair}'.format(**data)) win.addnstr(text, n_cols - win.getyx()[1], attr) - text = clean(u' {created} {subreddit}'.format(**data)) + text = clean(u' {created} {subreddit} '.format(**data)) win.addnstr(text, n_cols - win.getyx()[1]) + if data['gold']: + text, attr = GOLD, (curses.A_BOLD | Color.YELLOW) + win.addnstr(text, n_cols - win.getyx()[1], attr) + row = len(data['split_title']) + 2 attr = curses.A_UNDERLINE | Color.BLUE text = clean(u'{url}'.format(**data)) diff --git a/rtv/subreddit.py b/rtv/subreddit.py index 85282e8..89d8504 100644 --- a/rtv/subreddit.py +++ b/rtv/subreddit.py @@ -7,8 +7,8 @@ from .page import BasePage, Navigator, BaseController from .submission import SubmissionPage from .content import SubredditContent from .helpers import clean, open_browser -from .curses_helpers import (BULLET, UARROW, DARROW, Color, LoadScreen, - show_notification) +from .curses_helpers import (BULLET, UARROW, DARROW, GOLD, Color, + LoadScreen, show_notification) __all__ = ['opened_links', 'SubredditController', 'SubredditPage'] @@ -131,9 +131,13 @@ class SubredditPage(BasePage): text, attr = DARROW, curses.A_BOLD | Color.RED win.addnstr(text, n_cols - win.getyx()[1], attr) - text = clean(u' {created} {comments}'.format(**data)) + text = clean(u' {created} {comments} '.format(**data)) win.addnstr(text, n_cols - win.getyx()[1]) + if data['gold']: + text, attr = GOLD, (curses.A_BOLD | Color.YELLOW) + win.addnstr(text, n_cols - win.getyx()[1], attr) + row = n_title + offset + 2 if row in valid_rows: text = clean(u'{author}'.format(**data)) From b0124560be42f7c4f85ffb7d467dff7b2ac63cf3 Mon Sep 17 00:00:00 2001 From: Tobin Date: Sat, 4 Apr 2015 00:00:16 -0500 Subject: [PATCH 4/4] moved gold symbol on submission view to match subreddit view --- rtv/submission.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/rtv/submission.py b/rtv/submission.py index 57b1f20..35089fc 100644 --- a/rtv/submission.py +++ b/rtv/submission.py @@ -220,13 +220,9 @@ class SubmissionPage(BasePage): attr = curses.A_BOLD | Color.YELLOW text = clean(u' {flair}'.format(**data)) win.addnstr(text, n_cols - win.getyx()[1], attr) - text = clean(u' {created} {subreddit} '.format(**data)) + text = clean(u' {created} {subreddit}'.format(**data)) win.addnstr(text, n_cols - win.getyx()[1]) - if data['gold']: - text, attr = GOLD, (curses.A_BOLD | Color.YELLOW) - win.addnstr(text, n_cols - win.getyx()[1], attr) - row = len(data['split_title']) + 2 attr = curses.A_UNDERLINE | Color.BLUE text = clean(u'{url}'.format(**data)) @@ -245,7 +241,11 @@ class SubmissionPage(BasePage): win.addnstr(row, 1, text, n_cols) row = len(data['split_title']) + len(split_text) + 3 - text = clean(u'{score} {comments}'.format(**data)) + text = clean(u'{score} {comments} '.format(**data)) win.addnstr(row, 1, text, n_cols, curses.A_BOLD) + if data['gold']: + text, attr = GOLD, (curses.A_BOLD | Color.YELLOW) + win.addnstr(text, n_cols - win.getyx()[1], attr) + win.border()