Merge branch '5225223-master'

This commit is contained in:
Michael Lazar
2016-01-09 01:27:39 -08:00
4 changed files with 16 additions and 0 deletions

View File

@@ -100,6 +100,7 @@ class Content(object):
sub_name = getattr(sub_author, 'name', '[deleted]')
flair = getattr(comment, 'author_flair_text', '')
permalink = getattr(comment, 'permalink', None)
stickied = getattr(comment, 'stickied', False)
data['type'] = 'Comment'
data['body'] = comment.body
@@ -112,6 +113,7 @@ class Content(object):
data['likes'] = comment.likes
data['gold'] = comment.gilded > 0
data['permalink'] = permalink
data['stickied'] = stickied
return data
@@ -151,6 +153,7 @@ class Content(object):
data['likes'] = sub.likes
data['gold'] = sub.gilded > 0
data['nsfw'] = sub.over_18
data['stickied'] = sub.stickied
data['index'] = None # This is filled in later by the method caller
if sub.url.split('/r/')[-1] == sub.permalink.split('/r/')[-1]:

View File

@@ -163,6 +163,10 @@ class SubmissionPage(Page):
text, attr = self.term.guilded
self.term.add_line(win, text, attr=attr)
if data['stickied']:
text, attr = self.term.stickied
self.term.add_line(win, text, attr=attr)
for row, text in enumerate(data['split_body'], start=offset+1):
if row in valid_rows:
self.term.add_line(win, text, row, 1)

View File

@@ -191,6 +191,9 @@ class SubredditPage(Page):
text, attr = self.term.get_arrow(data['likes'])
self.term.add_line(win, text, attr=attr)
self.term.add_line(win, ' {created} {comments} '.format(**data))
if data['stickied']:
text, attr = self.term.stickied
self.term.add_line(win, text, attr=attr)
if data['gold']:
text, attr = self.term.guilded

View File

@@ -67,6 +67,12 @@ class Terminal(object):
attr = curses.A_BOLD | Color.YELLOW
return symbol, attr
@property
def stickied(self):
text = '[stickied]'
attr = Color.GREEN
return text, attr
@property
def vline(self):
return getattr(curses, 'ACS_VLINE', ord('|'))