display gold counts on gild comments/submissions

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

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')

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')

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

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'

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'

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, \