diff --git a/rtv/content.py b/rtv/content.py index 1cc7b4d..f77c7a9 100644 --- a/rtv/content.py +++ b/rtv/content.py @@ -153,7 +153,7 @@ class BaseContent(object): data = {} data['object'] = subscription data['type'] = 'Subscription' - data['name'] = subscription._case_name + data['name'] = "/r/" + subscription._case_name data['title'] = subscription.title return data @@ -404,9 +404,8 @@ class SubscriptionContent(BaseContent): self._subscription_data.append(data) data = self._subscription_data[index] - subreddit_info = "/r/" + data['name'] + "\n" + data['title'] - data['split_title'] = wrap_text(subreddit_info, width=n_cols) - data['n_rows'] = len(data['split_title']) + data['split_title'] = wrap_text(data['name'], width=n_cols) + data['n_rows'] = len(data['split_title']) + 1 data['offset'] = 0 return data diff --git a/rtv/subreddit.py b/rtv/subreddit.py index 342bea2..d73fcb4 100644 --- a/rtv/subreddit.py +++ b/rtv/subreddit.py @@ -8,6 +8,7 @@ import requests from .exceptions import SubredditError, AccountError from .page import BasePage, Navigator, BaseController from .submission import SubmissionPage +from .subscriptions import SubscriptionPage from .content import SubredditContent from .helpers import open_browser, open_editor, strip_subreddit_url from .docs import SUBMISSION_FILE @@ -158,6 +159,19 @@ class SubredditPage(BasePage): page.loop() self.refresh_content() + @SubredditController.register('s') + def open_subscriptions(self): + "Open user subscriptions page" + + if not self.reddit.is_logged_in(): + show_notification(self.stdscr, ['Not logged in']) + return + + with self.safe_call as s: + page = SubscriptionPage(self.stdscr, self.reddit) + page.loop() + self.refresh_content() + @staticmethod def draw_item(win, data, inverted=False): diff --git a/rtv/subscriptions.py b/rtv/subscriptions.py index 5d9cf02..81b3e5a 100644 --- a/rtv/subscriptions.py +++ b/rtv/subscriptions.py @@ -60,4 +60,9 @@ class SubscriptionPage(BasePage): n_title = len(data['split_title']) for row, text in enumerate(data['split_title'], start=offset): if row in valid_rows: - add_line(win, text, row, 1, curses.A_BOLD) + attr = curses.A_BOLD | Color.YELLOW + add_line(win, u'{name}'.format(**data), row, 1, attr) + + row = n_title + offset + if row in valid_rows: + add_line(win, u'{title}'.format(**data), row, 1)