Merge pull request #11 from tobywhughes/master
Added option to sort subreddit posts by top and new
This commit is contained in:
@@ -299,6 +299,8 @@ 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)
|
||||||
|
|
||||||
@@ -306,12 +308,23 @@ class SubredditContent(BaseContent):
|
|||||||
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)
|
||||||
|
|
||||||
|
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)
|
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):
|
||||||
|
|||||||
Reference in New Issue
Block a user