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

Merge pull request #19 from tobywhughes/slashfix

Browse Source 
A fix for the backslash bugs (plus front/... alias)
This commit is contained in:
michael-lazar
2015-03-04 18:55:41 -08:00
parent eb1e8dde32 73af45f4a2
commit 0c18fd50e4
1 changed files with 51 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
rtv/content.py
View File

@@ -68,6 +68,22 @@ def humanize_timestamp(utc_timestamp, verbose=False):
years = months // 12 years = months // 12
return ('%d years ago' % years) if verbose else ('%dyr' % years) return ('%d years ago' % years) if verbose else ('%dyr' % years)
def validate_backslashes(name):
"""
Makes sure backslashes in subreddit name work with for_name()
"""
if name[0] == '/':
raise SubredditNameError(name)
if name[-1] == '/':
name = name[:-1]
if name.count('/') > 1:
raise SubredditNameError(name)
return name
@contextmanager @contextmanager
def default_loader(self): def default_loader(self):
yield yield
@@ -309,12 +325,7 @@ class SubredditContent(BaseContent):
self._submission_data = [] self._submission_data = []
@classmethod @classmethod
def from_name(cls, reddit, name, loader=default_loader): def from_name(cls, reddit, name, loader=default_loader, display_type = 'hot'):
display_type = 'normal'
if name == 'front':
return cls('Front Page', reddit.get_front_page(limit=None), loader)
if name == 'new': if name == 'new':
return cls('New', reddit.get_new(limit=None), loader) return cls('New', reddit.get_new(limit=None), loader)
@@ -324,24 +335,53 @@ class SubredditContent(BaseContent):
else: else:
name = validate_backslashes(name)
if '/' in name: if '/' in name:
name, display_type = name.split('/') name, display_type = name.split('/')
if display_type not in ['new', 'top', 'hot', 'rising', 'controversial']:
raise SubredditNameError(name)
if name == 'front':
if display_type == 'new':
return cls('New', reddit.get_new(limit=None), loader)
elif display_type == 'top':
return cls('Top', reddit.get_top(limit=None), loader)
elif display_type == 'hot':
return cls('Front Page', reddit.get_front_page(limit=None), loader)
elif display_type == 'rising':
return cls('Rising', reddit.get_rising(limit=None), loader)
elif display_type == 'controversial':
return cls('Controversial', reddit.get_controversial(limit=None), loader)
try: try:
with loader(): with loader():
sub = reddit.get_subreddit(name, fetch=True) sub = reddit.get_subreddit(name, fetch=True)
except praw.errors.ClientException: except praw.errors.ClientException:
raise SubredditNameError(name) raise SubredditNameError(name)
if display_type == 'top': if display_type == 'new':
return cls('/r/'+sub.display_name+'/top', sub.get_top_from_all(limit=None), loader)
elif display_type == 'new':
return cls('/r/'+sub.display_name+'/new', sub.get_new(limit=None), loader) return cls('/r/'+sub.display_name+'/new', sub.get_new(limit=None), loader)
else: elif display_type == 'top':
return cls('/r/'+sub.display_name+'/top', sub.get_top_from_all(limit=None), loader)
elif display_type == 'hot':
return cls('/r/'+sub.display_name, sub.get_hot(limit=None), loader) return cls('/r/'+sub.display_name, sub.get_hot(limit=None), loader)
elif display_type == 'rising':
return cls('/r/'+sub.display_name+'/rising', sub.get_rising(limit=None), loader)
elif display_type == 'controversial':
return cls('/r/'+sub.display_name+'/controversial', sub.get_controversial(limit=None), loader)
def get(self, index, n_cols=70): def get(self, index, n_cols=70):
""" """
Grab the `i`th submission, with the title field formatted to fit inside Grab the `i`th submission, with the title field formatted to fit inside