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

remove username attribute and use reddit.user.name

Browse Source
This commit is contained in:
Tobin
2015-04-04 17:16:27 -05:00
parent 3253535273
commit c69728bea0
4 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rtv/__main__.py
View File

@@ -109,7 +109,7 @@ def main():
if args.link: if args.link:
page = SubmissionPage(stdscr, reddit, url=args.link) page = SubmissionPage(stdscr, reddit, url=args.link)
page.loop() page.loop()
page = SubredditPage(stdscr, reddit, args.subreddit, args.username) page = SubredditPage(stdscr, reddit, args.subreddit)
page.loop() page.loop()
except praw.errors.InvalidUserPass: except praw.errors.InvalidUserPass:
print('Invalid password for username: {}'.format(args.username)) print('Invalid password for username: {}'.format(args.username))

4
rtv/page.py
View File

@@ -161,12 +161,11 @@ class BasePage(object):
MIN_HEIGHT = 10 MIN_HEIGHT = 10
MIN_WIDTH = 20 MIN_WIDTH = 20
def __init__(self, stdscr, reddit, content, username, **kwargs): def __init__(self, stdscr, reddit, content, **kwargs):
self.stdscr = stdscr self.stdscr = stdscr
self.reddit = reddit self.reddit = reddit
self.content = content self.content = content
self.username = username
self.nav = Navigator(self.content.get, **kwargs) self.nav = Navigator(self.content.get, **kwargs)
self._header_window = None self._header_window = None
@@ -247,7 +246,6 @@ class BasePage(object):
try: try:
self.reddit.login(username, password) self.reddit.login(username, password)
self.username = username
except praw.errors.InvalidUserPass: except praw.errors.InvalidUserPass:
show_notification(self.stdscr, ['Invalid user/pass']) show_notification(self.stdscr, ['Invalid user/pass'])
else: else:

4
rtv/submission.py
View File

@@ -31,8 +31,8 @@ class SubmissionPage(BasePage):
else: else:
raise ValueError('Must specify url or submission') raise ValueError('Must specify url or submission')
super(SubmissionPage, self).__init__(stdscr, reddit, content, super(SubmissionPage, self).__init__(stdscr, reddit,
page_index=-1, username=None) content, page_index=-1)
def loop(self): def loop(self):
self.active = True self.active = True

7
rtv/subreddit.py
View File

@@ -24,13 +24,13 @@ class SubredditController(BaseController):
class SubredditPage(BasePage): class SubredditPage(BasePage):
def __init__(self, stdscr, reddit, name, username): def __init__(self, stdscr, reddit, name):
self.controller = SubredditController(self) self.controller = SubredditController(self)
self.loader = LoadScreen(stdscr) self.loader = LoadScreen(stdscr)
content = SubredditContent.from_name(reddit, name, self.loader) content = SubredditContent.from_name(reddit, name, self.loader)
super(SubredditPage, self).__init__(stdscr, reddit, content, username) super(SubredditPage, self).__init__(stdscr, reddit, content)
def loop(self): def loop(self):
while True: while True:
@@ -79,8 +79,9 @@ class SubredditPage(BasePage):
def redditor_profile(self): def redditor_profile(self):
if self.reddit.is_logged_in(): if self.reddit.is_logged_in():
try: try:
redditor = self.reddit.user.name
self.content = SubredditContent.from_redditor( self.content = SubredditContent.from_redditor(
self.reddit, self.username, self.loader) self.reddit, redditor, self.loader)
except requests.HTTPError: except requests.HTTPError:
show_notification(self.stdscr, ['Could not reach subreddit']) show_notification(self.stdscr, ['Could not reach subreddit'])
else: else: