From a00685e95aeed779c9c0e8408dd83bcb5b231a43 Mon Sep 17 00:00:00 2001 From: woorst Date: Sat, 15 Sep 2018 23:45:55 -0400 Subject: [PATCH] display gold counts on gild comments/submissions --- rtv/content.py | 6 +++--- rtv/submission_page.py | 8 ++++++-- rtv/subreddit_page.py | 4 +++- rtv/terminal.py | 2 +- scripts/demo_theme.py | 4 ++-- tests/test_submission.py | 4 ++-- tests/test_terminal.py | 2 +- 7 files changed, 18 insertions(+), 12 deletions(-) diff --git a/rtv/content.py b/rtv/content.py index f174e39..3b542f1 100644 --- a/rtv/content.py +++ b/rtv/content.py @@ -155,7 +155,7 @@ class Content(object): data['is_author'] = (name == sub_name) data['flair'] = flair data['likes'] = comment.likes - data['gold'] = comment.gilded > 0 + data['gold'] = comment.gilded data['permalink'] = permalink data['stickied'] = stickied data['hidden'] = False @@ -185,7 +185,7 @@ class Content(object): data['created'] = cls.humanize_timestamp(comment.created_utc) data['saved'] = comment.saved data['stickied'] = stickied - data['gold'] = comment.gilded > 0 + data['gold'] = comment.gilded data['author'] = author data['flair'] = flair data['hidden'] = False @@ -227,7 +227,7 @@ class Content(object): data['flair'] = '[{0}]'.format(flair.strip(' []')) if flair else '' data['url_full'] = sub.url data['likes'] = sub.likes - data['gold'] = sub.gilded > 0 + data['gold'] = sub.gilded data['nsfw'] = sub.over_18 data['stickied'] = sub.stickied data['hidden'] = sub.hidden diff --git a/rtv/submission_page.py b/rtv/submission_page.py index 5cbc5ad..784fc16 100644 --- a/rtv/submission_page.py +++ b/rtv/submission_page.py @@ -345,7 +345,9 @@ class SubmissionPage(Page): if data['gold']: attr = self.term.attr('Gold') self.term.add_space(win) - self.term.add_line(win, self.term.guilded, attr=attr) + count = 'x{}'.format(data['gold']) if data['gold'] > 1 else '' + text = self.term.guilded + count + self.term.add_line(win, text, attr=attr) if data['stickied']: attr = self.term.attr('Stickied') @@ -446,7 +448,9 @@ class SubmissionPage(Page): if data['gold']: attr = self.term.attr('Gold') self.term.add_space(win) - self.term.add_line(win, self.term.guilded, attr=attr) + count = 'x{}'.format(data['gold']) if data['gold'] > 1 else '' + text = self.term.guilded + count + self.term.add_line(win, text, attr=attr) if data['nsfw']: attr = self.term.attr('NSFW') diff --git a/rtv/subreddit_page.py b/rtv/subreddit_page.py index 6a857d9..ff3fedb 100644 --- a/rtv/subreddit_page.py +++ b/rtv/subreddit_page.py @@ -382,7 +382,9 @@ class SubredditPage(Page): if data['gold']: attr = self.term.attr('Gold') self.term.add_space(win) - self.term.add_line(win, self.term.guilded, attr=attr) + count = 'x{}'.format(data['gold']) if data['gold'] > 1 else '' + text = self.term.guilded + count + self.term.add_line(win, text, attr=attr) if data['nsfw']: attr = self.term.attr('NSFW') diff --git a/rtv/terminal.py b/rtv/terminal.py index 94cd7a7..6d241d8 100644 --- a/rtv/terminal.py +++ b/rtv/terminal.py @@ -82,7 +82,7 @@ class Terminal(object): return 'o' if self.config['ascii'] else '•' @property - def guilded(self): + def gilded(self): return '*' if self.config['ascii'] else '✪' @property diff --git a/scripts/demo_theme.py b/scripts/demo_theme.py index e4af53e..da5492a 100755 --- a/scripts/demo_theme.py +++ b/scripts/demo_theme.py @@ -103,7 +103,7 @@ def draw_screen(stdscr, reddit, config, theme, oauth): # Tweak the data in order to demonstrate the full range of settings data = page.content.get(-1) data['object'].link_flair_text = 'flair' - data['object'].guilded = 1 + data['object'].gilded = 1 data['object'].over_18 = True data['object'].saved = True data.update(page.content.strip_praw_submission(data['object'])) @@ -117,7 +117,7 @@ def draw_screen(stdscr, reddit, config, theme, oauth): data['object'].saved = True data['object'].likes = False data['object'].score_hidden = True - data['object'].guilded = 1 + data['object'].gilded = 1 data.update(page.content.strip_praw_comment(data['object'])) data = page.content.get(2) data['object'].author.name = 'kafoozalum' diff --git a/tests/test_submission.py b/tests/test_submission.py index a8a8a0e..9143838 100644 --- a/tests/test_submission.py +++ b/tests/test_submission.py @@ -40,14 +40,14 @@ def test_submission_page_construct(reddit, terminal, config, oauth): # Set some special flags to make sure that we can draw them submission_data = page.content.get(-1) - submission_data['gold'] = True + submission_data['gold'] = 1 submission_data['stickied'] = True submission_data['saved'] = True submission_data['flair'] = 'flair' # Set some special flags to make sure that we can draw them comment_data = page.content.get(0) - comment_data['gold'] = True + comment_data['gold'] = 3 comment_data['stickied'] = True comment_data['saved'] = True comment_data['flair'] = 'flair' diff --git a/tests/test_terminal.py b/tests/test_terminal.py index c76b0f0..7559de3 100644 --- a/tests/test_terminal.py +++ b/tests/test_terminal.py @@ -25,7 +25,7 @@ def test_terminal_properties(terminal, config): assert isinstance(terminal.up_arrow, six.text_type) assert isinstance(terminal.down_arrow, six.text_type) assert isinstance(terminal.neutral_arrow, six.text_type) - assert isinstance(terminal.guilded, six.text_type) + assert isinstance(terminal.gilded, six.text_type) terminal._display = None with mock.patch('rtv.terminal.sys') as sys, \