From 54fa6577c9e1c659ba125c8ce71212ab64cfabe0 Mon Sep 17 00:00:00 2001 From: Nemanja Nedeljkovic Date: Thu, 11 Jan 2018 09:36:33 +0100 Subject: [PATCH 01/10] Hide command --- rtv/page.py | 7 +++++++ rtv/templates/rtv.cfg | 1 + 2 files changed, 8 insertions(+) diff --git a/rtv/page.py b/rtv/page.py index d106e58..f575d53 100644 --- a/rtv/page.py +++ b/rtv/page.py @@ -155,6 +155,13 @@ 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() + with self.term.loader('Hiding'): + data['object'].hide() + @PageController.register(Command('UPVOTE')) @logged_in def upvote(self): diff --git a/rtv/templates/rtv.cfg b/rtv/templates/rtv.cfg index d52909e..a1cdcb5 100644 --- a/rtv/templates/rtv.cfg +++ b/rtv/templates/rtv.cfg @@ -121,6 +121,7 @@ PAGE_UP = m, , PAGE_DOWN = n, , PAGE_TOP = gg PAGE_BOTTOM = G +HIDE = x UPVOTE = a DOWNVOTE = z LOGIN = u From da81275c5ee50f764df7b8bd50a48b9c14b39ec0 Mon Sep 17 00:00:00 2001 From: Nemanja Nedeljkovic Date: Thu, 11 Jan 2018 10:15:41 +0100 Subject: [PATCH 02/10] Fix typo in theme name --- rtv/templates/rtv.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rtv/templates/rtv.cfg b/rtv/templates/rtv.cfg index a1cdcb5..0262a89 100644 --- a/rtv/templates/rtv.cfg +++ b/rtv/templates/rtv.cfg @@ -46,7 +46,7 @@ hide_username = False ; Color theme, use "rtv --list-themes" to view a list of valid options. ; This can be an absolute filepath, or the name of a theme file that has ; been installed into either the custom of default theme paths. -;theme = monokai +;theme = molokai ################ # OAuth Settings From ff87c89e0b75779b44789138dd1e6d9d93bf1c9d Mon Sep 17 00:00:00 2001 From: Nemanja Nedeljkovic Date: Thu, 11 Jan 2018 10:45:58 +0100 Subject: [PATCH 03/10] Add hidden to GUI --- rtv/page.py | 2 ++ rtv/subreddit_page.py | 5 +++++ rtv/theme.py | 1 + 3 files changed, 8 insertions(+) diff --git a/rtv/page.py b/rtv/page.py index f575d53..e06b184 100644 --- a/rtv/page.py +++ b/rtv/page.py @@ -161,6 +161,8 @@ class Page(object): data = self.get_selected_item() with self.term.loader('Hiding'): data['object'].hide() + if not self.term.loader.exception: + data['hidden'] = True @PageController.register(Command('UPVOTE')) @logged_in diff --git a/rtv/subreddit_page.py b/rtv/subreddit_page.py index 04a35bf..b602591 100644 --- a/rtv/subreddit_page.py +++ b/rtv/subreddit_page.py @@ -347,6 +347,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) diff --git a/rtv/theme.py b/rtv/theme.py index 8ecd971..bed9f82 100644 --- a/rtv/theme.py +++ b/rtv/theme.py @@ -93,6 +93,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), From fa89732f9a71ce58b9f5a62abe1a0fc9e363ca2f Mon Sep 17 00:00:00 2001 From: Nemanja Nedeljkovic Date: Thu, 11 Jan 2018 10:58:30 +0100 Subject: [PATCH 04/10] Maybe fix for tests/test_theme.py::test_theme_default_cfg_matches_builtin --- rtv/themes/default.cfg.example | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rtv/themes/default.cfg.example b/rtv/themes/default.cfg.example index 07c372a..060e33c 100644 --- a/rtv/themes/default.cfg.example +++ b/rtv/themes/default.cfg.example @@ -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 \ No newline at end of file +UserFlair = yellow - bold From d86918d2337c79a7c7648dc013b23a5df05fb01f Mon Sep 17 00:00:00 2001 From: Nemanja Nedeljkovic Date: Thu, 11 Jan 2018 14:54:52 +0100 Subject: [PATCH 05/10] Hide toggle --- rtv/page.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/rtv/page.py b/rtv/page.py index e06b184..b208b0d 100644 --- a/rtv/page.py +++ b/rtv/page.py @@ -159,10 +159,16 @@ class Page(object): @logged_in def hide(self): data = self.get_selected_item() - with self.term.loader('Hiding'): - data['object'].hide() - if not self.term.loader.exception: - data['hidden'] = True + if 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 From f1621241b581d8464414b93f197b538734eafa97 Mon Sep 17 00:00:00 2001 From: Nemanja Nedeljkovic Date: Thu, 11 Jan 2018 15:05:23 +0100 Subject: [PATCH 06/10] Fix for comments --- rtv/page.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/rtv/page.py b/rtv/page.py index b208b0d..38e8e40 100644 --- a/rtv/page.py +++ b/rtv/page.py @@ -159,7 +159,9 @@ class Page(object): @logged_in def hide(self): data = self.get_selected_item() - if data['hidden']: + 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: From 7cc12cd416a43ff8b9a4a359f7d90a9dbcaa42de Mon Sep 17 00:00:00 2001 From: Nemanja Nedeljkovic Date: Thu, 11 Jan 2018 15:09:55 +0100 Subject: [PATCH 07/10] Added footer documentation --- rtv/docs.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rtv/docs.py b/rtv/docs.py index 692487e..1c6beef 100644 --- a/rtv/docs.py +++ b/rtv/docs.py @@ -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 = """ From 6411640c07a0f2dfa886dd92875651ab1e3af223 Mon Sep 17 00:00:00 2001 From: Nemanja Nedeljkovic Date: Sun, 8 Apr 2018 20:20:27 +0200 Subject: [PATCH 08/10] Fixing bug for subreddit pages --- rtv/content.py | 1 + 1 file changed, 1 insertion(+) diff --git a/rtv/content.py b/rtv/content.py index d191709..61addc6 100644 --- a/rtv/content.py +++ b/rtv/content.py @@ -188,6 +188,7 @@ class Content(object): data['gold'] = comment.gilded > 0 data['author'] = author data['flair'] = flair + data['hidden'] = False return data From e5dc7f264cd6ee77a9b2fe3af542269e413d529c Mon Sep 17 00:00:00 2001 From: Nemanja Nedeljkovic Date: Sun, 8 Apr 2018 20:22:56 +0200 Subject: [PATCH 09/10] Fixing themes --- rtv/themes/molokai.cfg | 3 ++- rtv/themes/papercolor.cfg | 3 ++- rtv/themes/solarized-dark.cfg | 3 ++- rtv/themes/solarized-light.cfg | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/rtv/themes/molokai.cfg b/rtv/themes/molokai.cfg index c55d8bb..d8cfe1f 100644 --- a/rtv/themes/molokai.cfg +++ b/rtv/themes/molokai.cfg @@ -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 \ No newline at end of file +UserFlair = ansi_222 - bold diff --git a/rtv/themes/papercolor.cfg b/rtv/themes/papercolor.cfg index 7bea410..de8f01c 100644 --- a/rtv/themes/papercolor.cfg +++ b/rtv/themes/papercolor.cfg @@ -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 \ No newline at end of file +UserFlair = ansi_162 - bold diff --git a/rtv/themes/solarized-dark.cfg b/rtv/themes/solarized-dark.cfg index 049f951..f6aca18 100644 --- a/rtv/themes/solarized-dark.cfg +++ b/rtv/themes/solarized-dark.cfg @@ -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 \ No newline at end of file +UserFlair = ansi_136 - bold diff --git a/rtv/themes/solarized-light.cfg b/rtv/themes/solarized-light.cfg index 057e880..8437326 100644 --- a/rtv/themes/solarized-light.cfg +++ b/rtv/themes/solarized-light.cfg @@ -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 \ No newline at end of file +UserFlair = ansi_136 - bold From ec0e54254ac12dc9f3cc4c5d459acac080c66fea Mon Sep 17 00:00:00 2001 From: Nemanja Nedeljkovic Date: Sun, 8 Apr 2018 20:31:35 +0200 Subject: [PATCH 10/10] Space button for hide --- rtv/templates/rtv.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rtv/templates/rtv.cfg b/rtv/templates/rtv.cfg index 0262a89..335ad03 100644 --- a/rtv/templates/rtv.cfg +++ b/rtv/templates/rtv.cfg @@ -121,7 +121,7 @@ PAGE_UP = m, , PAGE_DOWN = n, , PAGE_TOP = gg PAGE_BOTTOM = G -HIDE = x +HIDE = 0x20 UPVOTE = a DOWNVOTE = z LOGIN = u