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

No longer leave submission/subscription page when entering an invalid subreddit.

Browse Source
This commit is contained in:
Michael Lazar
2016-08-05 23:06:15 -07:00
parent 6328407c32
commit 66854522ff
3 changed files with 42 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
rtv/subscription.py
View File

@@ -4,7 +4,7 @@ from __future__ import unicode_literals
import curses
from .page import Page, PageController
from .content import SubscriptionContent
from .content import SubscriptionContent, SubredditContent
from .objects import Color, Navigator, Command
@@ -22,7 +22,7 @@ class SubscriptionPage(Page):
reddit, term.loader, content_type)
self.nav = Navigator(self.content.get)
self.content_type = content_type
self.subreddit_name = None
self.selected_subreddit = None
@SubscriptionController.register(Command('REFRESH'))
def refresh_content(self, order=None, name=None):
@@ -45,15 +45,24 @@ class SubscriptionPage(Page):
name = self.term.prompt_input('Enter page: /')
if name is not None:
self.subreddit_name = name
self.active = False
with self.term.loader('Loading page'):
content = SubredditContent.from_name(
self.reddit, name, self.term.loader)
if not self.term.loader.exception:
self.selected_subreddit = content
self.active = False
@SubscriptionController.register(Command('SUBSCRIPTION_SELECT'))
def select_subreddit(self):
"Store the selected subreddit and return to the subreddit page"
self.subreddit_name = self.content.get(self.nav.absolute_index)['name']
self.active = False
name = self.content.get(self.nav.absolute_index)['name']
with self.term.loader('Loading page'):
content = SubredditContent.from_name(
self.reddit, name, self.term.loader)
if not self.term.loader.exception:
self.selected_subreddit = content
self.active = False
@SubscriptionController.register(Command('SUBSCRIPTION_EXIT'))
def close_subscriptions(self):