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

Handle internal reddit links internally, including x-posts

Browse Source
This commit is contained in:
Obosob
2015-07-30 09:01:20 +01:00
parent bed4e4572f
commit 68d5d99f57
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
rtv/content.py
View File

@@ -2,6 +2,7 @@ import logging
import praw import praw
import requests import requests
import re
from .exceptions import SubmissionError, SubredditError, AccountError from .exceptions import SubmissionError, SubredditError, AccountError
from .helpers import humanize_timestamp, wrap_text, strip_subreddit_url from .helpers import humanize_timestamp, wrap_text, strip_subreddit_url
@@ -105,7 +106,8 @@ class BaseContent(object):
displayed through the terminal. displayed through the terminal.
""" """
is_selfpost = lambda s: s.startswith('http://www.reddit.com/r/') reddit_link = re.compile("https?://(np.)?redd(it.com|.it)/r/.*")
reddit_link_no_host = re.compile("/r/.*")
author = getattr(sub, 'author', '[deleted]') author = getattr(sub, 'author', '[deleted]')
name = getattr(author, 'name', '[deleted]') name = getattr(author, 'name', '[deleted]')
flair = getattr(sub, 'link_flair_text', '') flair = getattr(sub, 'link_flair_text', '')
@@ -123,7 +125,14 @@ class BaseContent(object):
data['subreddit'] = strip_subreddit_url(sub.permalink) data['subreddit'] = strip_subreddit_url(sub.permalink)
data['flair'] = flair data['flair'] = flair
data['url_full'] = sub.url data['url_full'] = sub.url
data['url'] = ('selfpost' if is_selfpost(sub.url) else sub.url)
if reddit_link.match(sub.url):
stripped_url = reddit_link_no_host.search(sub.url).group()
stripped_comments = reddit_link_no_host.search(sub.permalink).group()
data['url'] = ('selfpost' if stripped_url == stripped_comments
else 'x-post via {}'.format(strip_subreddit_url(sub.url)) )
else:
data['url'] = sub.url
data['likes'] = sub.likes data['likes'] = sub.likes
data['gold'] = sub.gilded > 0 data['gold'] = sub.gilded > 0
data['nsfw'] = sub.over_18 data['nsfw'] = sub.over_18

7
rtv/subreddit.py
View File

@@ -108,10 +108,11 @@ class SubredditPage(BasePage):
"Open a link with the webbrowser" "Open a link with the webbrowser"
data = self.content.get(self.nav.absolute_index) data = self.content.get(self.nav.absolute_index)
if data['url'] == 'selfpost': url = data['url_full']
self.open_submission() if data['url'] != url:
page = SubmissionPage(self.stdscr, self.reddit, url=url)
page.loop()
else: else:
url = data['url_full']
open_browser(url) open_browser(url)
global history global history
history.add(url) history.add(url)