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

Merge pull request #11 from tobywhughes/master

Browse Source 
Added option to sort subreddit posts by top and new
This commit is contained in:
michael-lazar
2015-03-03 00:07:25 -08:00
parent 97d72a0f3d 98fc02e28e
commit 1fc1eb5972
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
rtv/content.py
View File

@@ -298,21 +298,34 @@ class SubredditContent(BaseContent):
@classmethod @classmethod
def from_name(cls, reddit, name, loader=default_loader): def from_name(cls, reddit, name, loader=default_loader):
display_type = 'normal'
if name == 'front': if name == 'front':
return cls('Front Page', reddit.get_front_page(limit=None), loader) return cls('Front Page', reddit.get_front_page(limit=None), loader)
if name == 'all': if name == 'all':
sub = reddit.get_subreddit(name) sub = reddit.get_subreddit(name)
else: else:
if '/' in name:
name, display_type = name.split('/')
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':
return cls('/r/'+sub.display_name + '/top', sub.get_top_from_all(limit=None), loader)
return cls('/r/'+sub.display_name, sub.get_hot(limit=None), loader) elif display_type == 'new':
return cls('/r/'+sub.display_name + '/new', sub.get_new(limit=None), loader)
else:
return cls('/r/'+sub.display_name, sub.get_hot(limit=None), loader)
def get(self, index, n_cols=70): def get(self, index, n_cols=70):
""" """
@@ -340,4 +353,4 @@ class SubredditContent(BaseContent):
data['n_rows'] = len(data['split_title']) + 3 data['n_rows'] = len(data['split_title']) + 3
data['offset'] = 0 data['offset'] = 0
return data return data