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

Moving the hide command to the subreddit page

Browse Source
This commit is contained in:
Michael Lazar
2018-06-02 23:36:44 -04:00
parent ff35328d40
commit f218a4e837
3 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
rtv/page.py
View File

@@ -156,23 +156,6 @@ 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):

15
rtv/subreddit_page.py
View File

@@ -292,6 +292,21 @@ class SubredditPage(Page):
self.content = page.selected_subreddit self.content = page.selected_subreddit
self.nav = Navigator(self.content.get) self.nav = Navigator(self.content.get)
@SubredditController.register(Command('SUBREDDIT_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()
data['hidden'] = False
else:
with self.term.loader('Hiding'):
data['object'].hide()
data['hidden'] = True
def _draw_item(self, win, data, inverted): def _draw_item(self, win, data, inverted):
n_rows, n_cols = win.getmaxyx() n_rows, n_cols = win.getmaxyx()

2
rtv/templates/rtv.cfg
View File

@@ -124,7 +124,6 @@ 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
@@ -155,6 +154,7 @@ SUBREDDIT_OPEN_IN_BROWSER = o, <LF>, <KEY_ENTER>
SUBREDDIT_OPEN_SUBSCRIPTIONS = s SUBREDDIT_OPEN_SUBSCRIPTIONS = s
SUBREDDIT_OPEN_MULTIREDDITS = S SUBREDDIT_OPEN_MULTIREDDITS = S
SUBREDDIT_FRONTPAGE = p SUBREDDIT_FRONTPAGE = p
SUBREDDIT_HIDE = 0x20
; Subscription page ; Subscription page
SUBSCRIPTION_SELECT = l, <LF>, <KEY_ENTER>, <KEY_RIGHT> SUBSCRIPTION_SELECT = l, <LF>, <KEY_ENTER>, <KEY_RIGHT>