Merge branch '5225223-master'
This commit is contained in:
@@ -100,6 +100,7 @@ class Content(object):
|
|||||||
sub_name = getattr(sub_author, 'name', '[deleted]')
|
sub_name = getattr(sub_author, 'name', '[deleted]')
|
||||||
flair = getattr(comment, 'author_flair_text', '')
|
flair = getattr(comment, 'author_flair_text', '')
|
||||||
permalink = getattr(comment, 'permalink', None)
|
permalink = getattr(comment, 'permalink', None)
|
||||||
|
stickied = getattr(comment, 'stickied', False)
|
||||||
|
|
||||||
data['type'] = 'Comment'
|
data['type'] = 'Comment'
|
||||||
data['body'] = comment.body
|
data['body'] = comment.body
|
||||||
@@ -112,6 +113,7 @@ class Content(object):
|
|||||||
data['likes'] = comment.likes
|
data['likes'] = comment.likes
|
||||||
data['gold'] = comment.gilded > 0
|
data['gold'] = comment.gilded > 0
|
||||||
data['permalink'] = permalink
|
data['permalink'] = permalink
|
||||||
|
data['stickied'] = stickied
|
||||||
|
|
||||||
return data
|
return data
|
||||||
|
|
||||||
@@ -151,6 +153,7 @@ class Content(object):
|
|||||||
data['likes'] = sub.likes
|
data['likes'] = sub.likes
|
||||||
data['gold'] = sub.gilded > 0
|
data['gold'] = sub.gilded > 0
|
||||||
data['nsfw'] = sub.over_18
|
data['nsfw'] = sub.over_18
|
||||||
|
data['stickied'] = sub.stickied
|
||||||
data['index'] = None # This is filled in later by the method caller
|
data['index'] = None # This is filled in later by the method caller
|
||||||
|
|
||||||
if sub.url.split('/r/')[-1] == sub.permalink.split('/r/')[-1]:
|
if sub.url.split('/r/')[-1] == sub.permalink.split('/r/')[-1]:
|
||||||
|
|||||||
@@ -163,6 +163,10 @@ class SubmissionPage(Page):
|
|||||||
text, attr = self.term.guilded
|
text, attr = self.term.guilded
|
||||||
self.term.add_line(win, text, attr=attr)
|
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):
|
for row, text in enumerate(data['split_body'], start=offset+1):
|
||||||
if row in valid_rows:
|
if row in valid_rows:
|
||||||
self.term.add_line(win, text, row, 1)
|
self.term.add_line(win, text, row, 1)
|
||||||
|
|||||||
@@ -191,6 +191,9 @@ class SubredditPage(Page):
|
|||||||
text, attr = self.term.get_arrow(data['likes'])
|
text, attr = self.term.get_arrow(data['likes'])
|
||||||
self.term.add_line(win, text, attr=attr)
|
self.term.add_line(win, text, attr=attr)
|
||||||
self.term.add_line(win, ' {created} {comments} '.format(**data))
|
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']:
|
if data['gold']:
|
||||||
text, attr = self.term.guilded
|
text, attr = self.term.guilded
|
||||||
|
|||||||
@@ -67,6 +67,12 @@ class Terminal(object):
|
|||||||
attr = curses.A_BOLD | Color.YELLOW
|
attr = curses.A_BOLD | Color.YELLOW
|
||||||
return symbol, attr
|
return symbol, attr
|
||||||
|
|
||||||
|
@property
|
||||||
|
def stickied(self):
|
||||||
|
text = '[stickied]'
|
||||||
|
attr = Color.GREEN
|
||||||
|
return text, attr
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def vline(self):
|
def vline(self):
|
||||||
return getattr(curses, 'ACS_VLINE', ord('|'))
|
return getattr(curses, 'ACS_VLINE', ord('|'))
|
||||||
|
|||||||
Reference in New Issue
Block a user