Merge branch 'hide' of https://github.com/nemanjan00/rtv into nemanjan00-hide
This commit is contained in:
@@ -188,6 +188,7 @@ class Content(object):
|
|||||||
data['gold'] = comment.gilded > 0
|
data['gold'] = comment.gilded > 0
|
||||||
data['author'] = author
|
data['author'] = author
|
||||||
data['flair'] = flair
|
data['flair'] = flair
|
||||||
|
data['hidden'] = False
|
||||||
|
|
||||||
return data
|
return data
|
||||||
|
|
||||||
|
|||||||
@@ -51,6 +51,7 @@ https://github.com/michael-lazar/rtv
|
|||||||
? : Show the help screen
|
? : Show the help screen
|
||||||
q : Quit
|
q : Quit
|
||||||
Q : Force quit
|
Q : Force quit
|
||||||
|
x : Hide/unhide
|
||||||
a : Upvote
|
a : Upvote
|
||||||
z : Downvote
|
z : Downvote
|
||||||
c : Compose a new submission/comment
|
c : Compose a new submission/comment
|
||||||
@@ -97,7 +98,7 @@ BANNER_SEARCH = """
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
FOOTER_SUBREDDIT = """
|
FOOTER_SUBREDDIT = """
|
||||||
[?]Help [q]Quit [l]Comments [/]Prompt [u]Login [o]Open [c]Post [a/z]Vote
|
[?]Help [q]Quit [l]Comments [/]Prompt [u]Login [o]Open [c]Post [a/z]Vote [x] hide/unhide
|
||||||
"""
|
"""
|
||||||
|
|
||||||
FOOTER_SUBMISSION = """
|
FOOTER_SUBMISSION = """
|
||||||
|
|||||||
17
rtv/page.py
17
rtv/page.py
@@ -156,6 +156,23 @@ class Page(object):
|
|||||||
self.nav.cursor_index = 0
|
self.nav.cursor_index = 0
|
||||||
self.nav.inverted = True
|
self.nav.inverted = True
|
||||||
|
|
||||||
|
@PageController.register(Command('HIDE'))
|
||||||
|
@logged_in
|
||||||
|
def hide(self):
|
||||||
|
data = self.get_selected_item()
|
||||||
|
if not hasattr(data["object"], 'hide'):
|
||||||
|
self.term.flash()
|
||||||
|
elif data['hidden']:
|
||||||
|
with self.term.loader('Unhiding'):
|
||||||
|
data['object'].unhide()
|
||||||
|
if not self.term.loader.exception:
|
||||||
|
data['hidden'] = False
|
||||||
|
else:
|
||||||
|
with self.term.loader('Hiding'):
|
||||||
|
data['object'].hide()
|
||||||
|
if not self.term.loader.exception:
|
||||||
|
data['hidden'] = True
|
||||||
|
|
||||||
@PageController.register(Command('UPVOTE'))
|
@PageController.register(Command('UPVOTE'))
|
||||||
@logged_in
|
@logged_in
|
||||||
def upvote(self):
|
def upvote(self):
|
||||||
|
|||||||
@@ -346,6 +346,11 @@ class SubredditPage(Page):
|
|||||||
self.term.add_space(win)
|
self.term.add_space(win)
|
||||||
self.term.add_line(win, '[saved]', attr=attr)
|
self.term.add_line(win, '[saved]', attr=attr)
|
||||||
|
|
||||||
|
if data['hidden']:
|
||||||
|
attr = self.term.attr('Hidden')
|
||||||
|
self.term.add_space(win)
|
||||||
|
self.term.add_line(win, '[hidden]', attr=attr)
|
||||||
|
|
||||||
if data['stickied']:
|
if data['stickied']:
|
||||||
attr = self.term.attr('Stickied')
|
attr = self.term.attr('Stickied')
|
||||||
self.term.add_space(win)
|
self.term.add_space(win)
|
||||||
|
|||||||
@@ -124,6 +124,7 @@ PAGE_UP = m, <KEY_PPAGE>, <NAK>
|
|||||||
PAGE_DOWN = n, <KEY_NPAGE>, <EOT>
|
PAGE_DOWN = n, <KEY_NPAGE>, <EOT>
|
||||||
PAGE_TOP = gg
|
PAGE_TOP = gg
|
||||||
PAGE_BOTTOM = G
|
PAGE_BOTTOM = G
|
||||||
|
HIDE = 0x20
|
||||||
UPVOTE = a
|
UPVOTE = a
|
||||||
DOWNVOTE = z
|
DOWNVOTE = z
|
||||||
LOGIN = u
|
LOGIN = u
|
||||||
|
|||||||
@@ -95,6 +95,7 @@ class Theme(object):
|
|||||||
'NeutralVote': (None, None, curses.A_BOLD),
|
'NeutralVote': (None, None, curses.A_BOLD),
|
||||||
'NSFW': (curses.COLOR_RED, None, curses.A_BOLD | curses.A_REVERSE),
|
'NSFW': (curses.COLOR_RED, None, curses.A_BOLD | curses.A_REVERSE),
|
||||||
'Saved': (curses.COLOR_GREEN, None, None),
|
'Saved': (curses.COLOR_GREEN, None, None),
|
||||||
|
'Hidden': (curses.COLOR_GREEN, None, None),
|
||||||
'Score': (None, None, None),
|
'Score': (None, None, None),
|
||||||
'Separator': (None, None, curses.A_BOLD),
|
'Separator': (None, None, curses.A_BOLD),
|
||||||
'Stickied': (curses.COLOR_GREEN, None, None),
|
'Stickied': (curses.COLOR_GREEN, None, None),
|
||||||
|
|||||||
@@ -34,6 +34,7 @@ MultiredditText = - - -
|
|||||||
NeutralVote = - - bold
|
NeutralVote = - - bold
|
||||||
NSFW = red - bold+reverse
|
NSFW = red - bold+reverse
|
||||||
Saved = green - -
|
Saved = green - -
|
||||||
|
Hidden = green - -
|
||||||
Score = - - -
|
Score = - - -
|
||||||
Separator = - - bold
|
Separator = - - bold
|
||||||
Stickied = green - -
|
Stickied = green - -
|
||||||
@@ -48,4 +49,4 @@ SubmissionTitleSeen = - - -
|
|||||||
Upvote = green - bold
|
Upvote = green - bold
|
||||||
Link = blue - underline
|
Link = blue - underline
|
||||||
LinkSeen = magenta - underline
|
LinkSeen = magenta - underline
|
||||||
UserFlair = yellow - bold
|
UserFlair = yellow - bold
|
||||||
|
|||||||
@@ -57,6 +57,7 @@ MultiredditText = ansi_244 - -
|
|||||||
NeutralVote = - - bold
|
NeutralVote = - - bold
|
||||||
NSFW = ansi_197 - bold+reverse
|
NSFW = ansi_197 - bold+reverse
|
||||||
Saved = ansi_199 - -
|
Saved = ansi_199 - -
|
||||||
|
Hidden = green - -
|
||||||
Score = - - bold
|
Score = - - bold
|
||||||
Separator = ansi_241 - bold
|
Separator = ansi_241 - bold
|
||||||
Stickied = ansi_208 - -
|
Stickied = ansi_208 - -
|
||||||
@@ -71,4 +72,4 @@ SubmissionTitleSeen = - - -
|
|||||||
Upvote = ansi_154 - bold
|
Upvote = ansi_154 - bold
|
||||||
Link = ansi_67 - underline
|
Link = ansi_67 - underline
|
||||||
LinkSeen = ansi_141 - underline
|
LinkSeen = ansi_141 - underline
|
||||||
UserFlair = ansi_222 - bold
|
UserFlair = ansi_222 - bold
|
||||||
|
|||||||
@@ -55,6 +55,7 @@ MultiredditText = ansi_102 - -
|
|||||||
NeutralVote = - - bold
|
NeutralVote = - - bold
|
||||||
NSFW = ansi_160 - bold+reverse
|
NSFW = ansi_160 - bold+reverse
|
||||||
Saved = ansi_31 - bold
|
Saved = ansi_31 - bold
|
||||||
|
Hidden = green - -
|
||||||
Score = - - bold
|
Score = - - bold
|
||||||
Separator = - - bold
|
Separator = - - bold
|
||||||
Stickied = ansi_166 - bold
|
Stickied = ansi_166 - bold
|
||||||
@@ -69,4 +70,4 @@ SubmissionTitleSeen = - - -
|
|||||||
Upvote = ansi_28 - bold
|
Upvote = ansi_28 - bold
|
||||||
Link = ansi_24 - underline
|
Link = ansi_24 - underline
|
||||||
LinkSeen = ansi_91 - underline
|
LinkSeen = ansi_91 - underline
|
||||||
UserFlair = ansi_162 - bold
|
UserFlair = ansi_162 - bold
|
||||||
|
|||||||
@@ -53,6 +53,7 @@ MultiredditText = ansi_240 - -
|
|||||||
NeutralVote = - - bold
|
NeutralVote = - - bold
|
||||||
NSFW = ansi_160 - bold+reverse
|
NSFW = ansi_160 - bold+reverse
|
||||||
Saved = ansi_125 - -
|
Saved = ansi_125 - -
|
||||||
|
Hidden = green - -
|
||||||
Score = - - -
|
Score = - - -
|
||||||
Separator = - - bold
|
Separator = - - bold
|
||||||
Stickied = ansi_136 - -
|
Stickied = ansi_136 - -
|
||||||
@@ -67,4 +68,4 @@ SubmissionTitleSeen = - - -
|
|||||||
Upvote = ansi_64 - bold
|
Upvote = ansi_64 - bold
|
||||||
Link = ansi_33 - underline
|
Link = ansi_33 - underline
|
||||||
LinkSeen = ansi_61 - underline
|
LinkSeen = ansi_61 - underline
|
||||||
UserFlair = ansi_136 - bold
|
UserFlair = ansi_136 - bold
|
||||||
|
|||||||
@@ -53,6 +53,7 @@ MultiredditText = ansi_245 - -
|
|||||||
NeutralVote = - - bold
|
NeutralVote = - - bold
|
||||||
NSFW = ansi_160 - bold+reverse
|
NSFW = ansi_160 - bold+reverse
|
||||||
Saved = ansi_125 - bold
|
Saved = ansi_125 - bold
|
||||||
|
Hidden = green - -
|
||||||
Score = - - -
|
Score = - - -
|
||||||
Separator = - - bold
|
Separator = - - bold
|
||||||
Stickied = ansi_136 - bold
|
Stickied = ansi_136 - bold
|
||||||
@@ -67,4 +68,4 @@ SubmissionTitleSeen = - - -
|
|||||||
Upvote = ansi_64 - bold
|
Upvote = ansi_64 - bold
|
||||||
Link = ansi_33 - underline
|
Link = ansi_33 - underline
|
||||||
LinkSeen = ansi_61 - underline
|
LinkSeen = ansi_61 - underline
|
||||||
UserFlair = ansi_136 - bold
|
UserFlair = ansi_136 - bold
|
||||||
|
|||||||
Reference in New Issue
Block a user