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

Fixed crash when opening links from the command line.

Browse Source
This commit is contained in:
Michael Lazar
2015-12-03 16:26:55 -08:00
parent 49ecfcec95
commit ea05235ddc
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
rtv/__main__.py
View File

@@ -65,10 +65,9 @@ def main():
with curses_session() as stdscr: with curses_session() as stdscr:
term = Terminal(stdscr, config['ascii']) term = Terminal(stdscr, config['ascii'])
with term.loader(catch_exception=False): with term.loader(catch_exception=False):
reddit = praw.Reddit( reddit = praw.Reddit(user_agent=user_agent,
user_agent=user_agent, decode_html_entities=False,
decode_html_entities=False, disable_update_check=True)
disable_update_check=True)
# Authorize on launch if the refresh token is present # Authorize on launch if the refresh token is present
oauth = OAuthHelper(reddit, term, config) oauth = OAuthHelper(reddit, term, config)
@@ -76,13 +75,18 @@ def main():
oauth.authorize() oauth.authorize()
with term.loader(): with term.loader():
page = SubredditPage( page = SubredditPage(reddit, term, config, oauth,
reddit, term, config, oauth, config['subreddit'])
name=config['subreddit'], url=config['link'])
if term.loader.exception: if term.loader.exception:
return return
# Open the supplied submission link before opening the subreddit
if config['link']:
page.open_submission(url=config['link'])
# Launch the subreddit page
page.loop() page.loop()
except Exception as e: except Exception as e:
_logger.exception(e) _logger.exception(e)
raise raise

5
rtv/subreddit.py
View File

@@ -19,7 +19,7 @@ class SubredditController(PageController):
class SubredditPage(Page): class SubredditPage(Page):
def __init__(self, reddit, term, config, oauth, name, url=None): def __init__(self, reddit, term, config, oauth, name):
""" """
Params: Params:
name (string): Name of subreddit to open name (string): Name of subreddit to open
@@ -31,9 +31,6 @@ class SubredditPage(Page):
self.controller = SubredditController(self) self.controller = SubredditController(self)
self.nav = Navigator(self.content.get) self.nav = Navigator(self.content.get)
if url:
self.open_submission(url=url)
@SubredditController.register(curses.KEY_F5, 'r') @SubredditController.register(curses.KEY_F5, 'r')
def refresh_content(self, name=None, order=None): def refresh_content(self, name=None, order=None):
"Re-download all submissions and reset the page index" "Re-download all submissions and reset the page index"