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

Merge branch 'master' of https://github.com/michael-lazar/rtv

Browse Source
This commit is contained in:
Tobin
2015-04-02 23:12:58 -05:00
parent 66bc9f5667 09c4865ece
commit 2f4f706d0c
7 changed files with 117 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
rtv/content.py
View File

@@ -249,7 +249,7 @@ class SubredditContent(BaseContent):
self._submission_data = []
@classmethod
def from_name(cls, reddit, name, loader, order='hot'):
def from_name(cls, reddit, name, loader, order='hot', search=None):
if name is None:
name = 'front'
@@ -266,9 +266,11 @@ class SubredditContent(BaseContent):
display_name = '/r/{}'.format(name)
else:
display_name = '/r/{}/{}'.format(name, order)
if name == 'front':
if order == 'hot':
if search:
submissions = reddit.search(search, None, order)
elif order == 'hot':
submissions = reddit.get_front_page(limit=None)
elif order == 'top':
submissions = reddit.get_top(limit=None)
@@ -280,10 +282,11 @@ class SubredditContent(BaseContent):
submissions = reddit.get_controversial(limit=None)
else:
raise SubredditError(display_name)
else:
subreddit = reddit.get_subreddit(name)
if order == 'hot':
if search:
submissions = reddit.search(search, name, order)
elif order == 'hot':
submissions = subreddit.get_hot(limit=None)
elif order == 'top':
submissions = subreddit.get_top(limit=None)