gryf/tuir
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'hide' of https://github.com/nemanjan00/rtv into nemanjan00-hide

Browse Source
This commit is contained in:
Michael Lazar
2018-06-02 22:50:56 -04:00
parent 26bfeb8802 ec0e54254a
commit 82b29db07c
11 changed files with 37 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
rtv/content.py
View File

@@ -188,6 +188,7 @@ class Content(object):
data['gold'] = comment.gilded > 0
data['author'] = author
data['flair'] = flair
data['hidden'] = False
return data

3
rtv/docs.py
View File

@@ -51,6 +51,7 @@ https://github.com/michael-lazar/rtv
? : Show the help screen
q : Quit
Q : Force quit
x : Hide/unhide
a : Upvote
z : Downvote
c : Compose a new submission/comment
@@ -97,7 +98,7 @@ BANNER_SEARCH = """
"""
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 = """

17
rtv/page.py
View File

@@ -156,6 +156,23 @@ class Page(object):
self.nav.cursor_index = 0
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'))
@logged_in
def upvote(self):

5
rtv/subreddit_page.py
View File

@@ -346,6 +346,11 @@ class SubredditPage(Page):
self.term.add_space(win)
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']:
attr = self.term.attr('Stickied')
self.term.add_space(win)

1
rtv/templates/rtv.cfg
View File

@@ -124,6 +124,7 @@ PAGE_UP = m, <KEY_PPAGE>, <NAK>
PAGE_DOWN = n, <KEY_NPAGE>, <EOT>
PAGE_TOP = gg
PAGE_BOTTOM = G
HIDE = 0x20
UPVOTE = a
DOWNVOTE = z
LOGIN = u

1
rtv/theme.py
View File

@@ -95,6 +95,7 @@ class Theme(object):
'NeutralVote': (None, None, curses.A_BOLD),
'NSFW': (curses.COLOR_RED, None, curses.A_BOLD | curses.A_REVERSE),
'Saved': (curses.COLOR_GREEN, None, None),
'Hidden': (curses.COLOR_GREEN, None, None),
'Score': (None, None, None),
'Separator': (None, None, curses.A_BOLD),
'Stickied': (curses.COLOR_GREEN, None, None),

3
rtv/themes/default.cfg.example
View File

@@ -34,6 +34,7 @@ MultiredditText = - - -
NeutralVote = - - bold
NSFW = red - bold+reverse
Saved = green - -
Hidden = green - -
Score = - - -
Separator = - - bold
Stickied = green - -
@@ -48,4 +49,4 @@ SubmissionTitleSeen = - - -
Upvote = green - bold
Link = blue - underline
LinkSeen = magenta - underline
UserFlair = yellow - bold
UserFlair = yellow - bold

3
rtv/themes/molokai.cfg
View File

@@ -57,6 +57,7 @@ MultiredditText = ansi_244 - -
NeutralVote = - - bold
NSFW = ansi_197 - bold+reverse
Saved = ansi_199 - -
Hidden = green - -
Score = - - bold
Separator = ansi_241 - bold
Stickied = ansi_208 - -
@@ -71,4 +72,4 @@ SubmissionTitleSeen = - - -
Upvote = ansi_154 - bold
Link = ansi_67 - underline
LinkSeen = ansi_141 - underline
UserFlair = ansi_222 - bold
UserFlair = ansi_222 - bold

3
rtv/themes/papercolor.cfg
View File

@@ -55,6 +55,7 @@ MultiredditText = ansi_102 - -
NeutralVote = - - bold
NSFW = ansi_160 - bold+reverse
Saved = ansi_31 - bold
Hidden = green - -
Score = - - bold
Separator = - - bold
Stickied = ansi_166 - bold
@@ -69,4 +70,4 @@ SubmissionTitleSeen = - - -
Upvote = ansi_28 - bold
Link = ansi_24 - underline
LinkSeen = ansi_91 - underline
UserFlair = ansi_162 - bold
UserFlair = ansi_162 - bold

3
rtv/themes/solarized-dark.cfg
View File

@@ -53,6 +53,7 @@ MultiredditText = ansi_240 - -
NeutralVote = - - bold
NSFW = ansi_160 - bold+reverse
Saved = ansi_125 - -
Hidden = green - -
Score = - - -
Separator = - - bold
Stickied = ansi_136 - -
@@ -67,4 +68,4 @@ SubmissionTitleSeen = - - -
Upvote = ansi_64 - bold
Link = ansi_33 - underline
LinkSeen = ansi_61 - underline
UserFlair = ansi_136 - bold
UserFlair = ansi_136 - bold

3
rtv/themes/solarized-light.cfg
View File

@@ -53,6 +53,7 @@ MultiredditText = ansi_245 - -
NeutralVote = - - bold
NSFW = ansi_160 - bold+reverse
Saved = ansi_125 - bold
Hidden = green - -
Score = - - -
Separator = - - bold
Stickied = ansi_136 - bold
@@ -67,4 +68,4 @@ SubmissionTitleSeen = - - -
Upvote = ansi_64 - bold
Link = ansi_33 - underline
LinkSeen = ansi_61 - underline
UserFlair = ansi_136 - bold
UserFlair = ansi_136 - bold