From b0053643f7f4316a2f09fab5ec57899de2802e56 Mon Sep 17 00:00:00 2001 From: Michael Lazar Date: Mon, 9 Mar 2015 00:11:09 -0700 Subject: [PATCH] Added username to banner if logged in. --- rtv/page.py | 11 ++++++++++- rtv/submission.py | 2 +- rtv/subreddit.py | 3 +-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/rtv/page.py b/rtv/page.py index e7325bf..ebd680a 100644 --- a/rtv/page.py +++ b/rtv/page.py @@ -99,9 +99,10 @@ class BasePage(object): MIN_HEIGHT = 10 MIN_WIDTH = 20 - def __init__(self, stdscr, content, **kwargs): + def __init__(self, stdscr, reddit, content, **kwargs): self.stdscr = stdscr + self.reddit = reddit self.content = content self.nav = Navigator(self.content.get, **kwargs) @@ -155,6 +156,14 @@ class BasePage(object): attr = curses.A_REVERSE | curses.A_BOLD | Color.CYAN self._header_window.bkgd(' ', attr) self._header_window.addnstr(0, 0, self.content.name, n_cols-1) + + if self.reddit.user is not None: + username = self.reddit.user.name + s_col = (n_cols - len(username) - 1) + # Only print the username if it fits in the empty space on the right + if (s_col - 1) >= len(self.content.name): + self._header_window.addnstr(0, s_col, username, (n_cols-s_col-1)) + self._header_window.refresh() def _draw_content(self): diff --git a/rtv/submission.py b/rtv/submission.py index ac51281..25c197e 100644 --- a/rtv/submission.py +++ b/rtv/submission.py @@ -21,7 +21,7 @@ class SubmissionPage(BasePage): else: raise ValueError('Must specify url or submission') - super(SubmissionPage, self).__init__(stdscr, content, page_index=-1) + super(SubmissionPage, self).__init__(stdscr, reddit, content, page_index=-1) def loop(self): diff --git a/rtv/subreddit.py b/rtv/subreddit.py index 195d481..337df36 100644 --- a/rtv/subreddit.py +++ b/rtv/subreddit.py @@ -17,11 +17,10 @@ class SubredditPage(BasePage): def __init__(self, stdscr, reddit, name): - self.reddit = reddit self.loader = LoadScreen(stdscr) content = SubredditContent.from_name(reddit, name, self.loader) - super(SubredditPage, self).__init__(stdscr, content) + super(SubredditPage, self).__init__(stdscr, reddit, content) def loop(self):