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

Refactoring and making rtv OAuth-compliant

Browse Source
This commit is contained in:
Théo Piboubès
2015-08-17 00:36:18 +02:00
parent ef38b112a2
commit efed781fa1
8 changed files with 239 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
rtv/submission.py
View File

@@ -20,10 +20,11 @@ class SubmissionController(BaseController):
class SubmissionPage(BasePage):
def __init__(self, stdscr, reddit, url=None, submission=None):
def __init__(self, stdscr, reddit, oauth, url=None, submission=None):
self.controller = SubmissionController(self)
self.loader = LoadScreen(stdscr)
self.oauth = oauth
if url:
content = SubmissionContent.from_url(reddit, url, self.loader)
elif submission:
@@ -32,7 +33,7 @@ class SubmissionPage(BasePage):
raise ValueError('Must specify url or submission')
super(SubmissionPage, self).__init__(stdscr, reddit,
content, page_index=-1)
content, oauth, page_index=-1)
def loop(self):
"Main control loop"
@@ -88,10 +89,13 @@ class SubmissionPage(BasePage):
selected comment.
"""
if not self.reddit.is_logged_in():
if not self.reddit.is_oauth_session():
show_notification(self.stdscr, ['Not logged in'])
return
# Refresh access token if expired
self.oauth.refresh()
data = self.content.get(self.nav.absolute_index)
if data['type'] == 'Submission':
content = data['text']
@@ -127,6 +131,9 @@ class SubmissionPage(BasePage):
def delete_comment(self):
"Delete a comment as long as it is not the current submission"
# Refresh access token if expired
self.oauth.refresh()
if self.nav.absolute_index != -1:
self.delete()
else: