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

Added tests for subreddit.py's new show_frontpage. Refactored getters and setters.

Browse Source
This commit is contained in:
mardiqwop
2016-07-20 16:02:34 -04:00
parent 270f0dff3c
commit 1dbcf22742
4 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rtv/docs.py
View File

@@ -39,7 +39,7 @@ HELP = """
`l` or `RIGHT` : Enter the selected submission
`/` : Open a prompt to switch subreddits
`f` : Open a prompt to search the current subreddit
'q' : Toggles between FrontPage and last visited subreddit
'p' : Toggles between FrontPage and last visited subreddit
[Submission Mode]
`h` or `LEFT` : Return to subreddit mode

20
rtv/subreddit.py
View File

@@ -30,7 +30,7 @@ class SubredditPage(Page):
self.controller = SubredditController(self, keymap=config.keymap)
self.content = SubredditContent.from_name(reddit, name, term.loader)
self.nav = Navigator(self.content.get)
self._toggled_subreddit = ''
self._toggled_subreddit = None
@SubredditController.register(Command('REFRESH'))
def refresh_content(self, order=None, name=None):
@@ -82,14 +82,14 @@ class SubredditPage(Page):
"""
target =''
if not self.on_frontpage():
if not self.content.name == '/r/front':
target = '/r/front'
self.set_last_subreddit()
self._toggled_subreddit = self.content.name
else:
target = self.get_last_subreddit()
target = self._toggled_subreddit
# target still may be emptystring if this command hasn't yet been used
if not target == '':
if not target == None:
self.refresh_content(order='ignore',name=target)
@SubredditController.register(Command('SUBREDDIT_OPEN'))
@@ -189,16 +189,6 @@ class SubredditPage(Page):
self.refresh_content(order='ignore',
name=page.subreddit_data['name'])
def on_frontpage(self):
"Returns whether the current page is the front page"
return self.content.name == '/r/front'
def set_last_subreddit(self):
self._toggled_subreddit = self.content.name
def get_last_subreddit(self):
return self._toggled_subreddit
def _draw_item(self, win, data, inverted):
n_rows, n_cols = win.getmaxyx()