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

fixed for searching of front page

Browse Source
This commit is contained in:
Tobin
2015-03-31 13:45:57 -05:00
parent a1fdd2a93a
commit 2a7525debd
1 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
rtv/content.py
View File

@@ -262,38 +262,38 @@ class SubredditContent(BaseContent):
display_name = '/r/{}'.format(name) display_name = '/r/{}'.format(name)
else: else:
display_name = '/r/{}/{}'.format(name, order) display_name = '/r/{}/{}'.format(name, order)
if search: if name == 'front':
submissions = reddit.search(search, name, order) if search:
submissions = reddit.search(search, None, order)
else: elif order == 'hot':
if name == 'front': submissions = reddit.get_front_page(limit=None)
if order == 'hot': elif order == 'top':
submissions = reddit.get_front_page(limit=None) submissions = reddit.get_top(limit=None)
elif order == 'top': elif order == 'rising':
submissions = reddit.get_top(limit=None) submissions = reddit.get_rising(limit=None)
elif order == 'rising': elif order == 'new':
submissions = reddit.get_rising(limit=None) submissions = reddit.get_new(limit=None)
elif order == 'new': elif order == 'controversial':
submissions = reddit.get_new(limit=None) submissions = reddit.get_controversial(limit=None)
elif order == 'controversial':
submissions = reddit.get_controversial(limit=None)
else:
raise SubredditError(display_name)
else: else:
subreddit = reddit.get_subreddit(name) raise SubredditError(display_name)
if order == 'hot': else:
submissions = subreddit.get_hot(limit=None) subreddit = reddit.get_subreddit(name)
elif order == 'top': if search:
submissions = subreddit.get_top(limit=None) submissions = reddit.search(search, name, order)
elif order == 'rising': elif order == 'hot':
submissions = subreddit.get_rising(limit=None) submissions = subreddit.get_hot(limit=None)
elif order == 'new': elif order == 'top':
submissions = subreddit.get_new(limit=None) submissions = subreddit.get_top(limit=None)
elif order == 'controversial': elif order == 'rising':
submissions = subreddit.get_controversial(limit=None) submissions = subreddit.get_rising(limit=None)
else: elif order == 'new':
raise SubredditError(display_name) submissions = subreddit.get_new(limit=None)
elif order == 'controversial':
submissions = subreddit.get_controversial(limit=None)
else:
raise SubredditError(display_name)
# Verify that content exists for the given submission generator. # Verify that content exists for the given submission generator.
# This is necessary because PRAW loads submissions lazily, and # This is necessary because PRAW loads submissions lazily, and