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

address Brobin's comments on #126

Browse Source
This commit is contained in:
Obosob
2015-07-30 16:46:47 +01:00
parent 763174fea6
commit f4ea094e93
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rtv/content.py
View File

@@ -130,7 +130,7 @@ class BaseContent(object):
stripped_url = reddit_link_no_host.search(sub.url).group() stripped_url = reddit_link_no_host.search(sub.url).group()
stripped_comments = reddit_link_no_host.search(sub.permalink).group() stripped_comments = reddit_link_no_host.search(sub.permalink).group()
data['url'] = ('selfpost' if stripped_url == stripped_comments data['url'] = ('selfpost' if stripped_url == stripped_comments
else 'x-post via {}'.format(strip_subreddit_url(sub.url)) ) else 'x-post')
else: else:
data['url'] = sub.url data['url'] = sub.url
data['likes'] = sub.likes data['likes'] = sub.likes

9
rtv/subreddit.py
View File

@@ -9,7 +9,7 @@ from .exceptions import SubredditError, AccountError
from .page import BasePage, Navigator, BaseController from .page import BasePage, Navigator, BaseController
from .submission import SubmissionPage from .submission import SubmissionPage
from .content import SubredditContent from .content import SubredditContent
from .helpers import open_browser, open_editor from .helpers import open_browser, open_editor, strip_subreddit_url
from .docs import SUBMISSION_FILE from .docs import SUBMISSION_FILE
from .history import load_history, save_history from .history import load_history, save_history
from .curses_helpers import (Color, LoadScreen, add_line, get_arrow, get_gold, from .curses_helpers import (Color, LoadScreen, add_line, get_arrow, get_gold,
@@ -109,7 +109,7 @@ class SubredditPage(BasePage):
data = self.content.get(self.nav.absolute_index) data = self.content.get(self.nav.absolute_index)
url = data['url_full'] url = data['url_full']
if data['url'] != url: if data['url'] in ['x-post', 'selfpost']:
page = SubmissionPage(self.stdscr, self.reddit, url=url) page = SubmissionPage(self.stdscr, self.reddit, url=url)
page.loop() page.loop()
else: else:
@@ -178,7 +178,10 @@ class SubredditPage(BasePage):
seen = (data['url_full'] in history) seen = (data['url_full'] in history)
link_color = Color.MAGENTA if seen else Color.BLUE link_color = Color.MAGENTA if seen else Color.BLUE
attr = curses.A_UNDERLINE | link_color attr = curses.A_UNDERLINE | link_color
add_line(win, u'{url}'.format(**data), row, 1, attr) if data['url'] == 'x-post':
add_line(win, u'x-post via {}'.format(strip_subreddit_url(data['url_full'])), row, 1, attr)
else:
add_line(win, u'{url}'.format(**data), row, 1, attr)
row = n_title + offset + 1 row = n_title + offset + 1
if row in valid_rows: if row in valid_rows: