Commit 911cdc13 authored by Romain Bignon's avatar Romain Bignon

new parameter 'sortby' to searches (relevance, rating, views and date)

parent f1ee6d67
......@@ -53,8 +53,9 @@ class YoupornBackend(BaseBackend, ICapVideoProvider):
def get_video(self, _id):
return self.browser.get_video(_id)
def iter_search_results(self, pattern=None):
return self.browser.iter_search_results(pattern)
SORTBY = ['relevance', 'rating', 'views', 'time']
def iter_search_results(self, pattern=None, sortby=ICapVideoProvider.SEARCH_RELEVANCE):
return self.browser.iter_search_results(pattern, self.SORTBY[sortby])
@need_url
def iter_page_urls(self, mozaic_url):
......
......@@ -43,11 +43,11 @@ class YoupornBrowser(BaseBrowser):
else:
return str(_id)
def iter_search_results(self, pattern):
def iter_search_results(self, pattern, sortby):
if not pattern:
self.home()
else:
self.location('/search?query=%s' % urllib.quote_plus(pattern))
self.location('/search/%s?query=%s' % (sortby, urllib.quote_plus(pattern)))
assert self.is_on_page(IndexPage)
return self.page.iter_videos()
......
......@@ -41,12 +41,18 @@ class ICapVideoProvider(ICap):
def iter_page_urls(self, mozaic_url):
raise NotImplementedError()
def iter_search_results(self, pattern=None):
(SEARCH_RELEVANCE,
SEARCH_RATING,
SEARCH_VIEWS,
SEARCH_DATE) = range(4)
def iter_search_results(self, pattern=None, sortby=SEARCH_RELEVANCE):
"""
Iter results of a search on a pattern. Note that if pattern is None,
it get the latest videos.
@param pattern [str] pattern to search on
@param sortby [enum] sort by...
"""
raise NotImplementedError()
......
......@@ -68,7 +68,7 @@ class MainWindow(QtMainWindow):
for backend in self.weboob.iter_backends():
if backend_name and backend.name != backend_name:
continue
for video in backend.iter_search_results(pattern):
for video in backend.iter_search_results(pattern, self.ui.sortbyEdit.currentIndex()):
minivideo = MiniVideo(backend, video)
self.ui.scrollAreaContent.layout().addWidget(minivideo)
self.minivideos.append(minivideo)
......
......@@ -34,6 +34,36 @@
<item>
<widget class="QLineEdit" name="searchEdit"/>
</item>
<item>
<widget class="QComboBox" name="sortbyEdit">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<item>
<property name="text">
<string>Relevance</string>
</property>
</item>
<item>
<property name="text">
<string>Rating</string>
</property>
</item>
<item>
<property name="text">
<string>Duration</string>
</property>
</item>
<item>
<property name="text">
<string>Date</string>
</property>
</item>
</widget>
</item>
<item>
<widget class="QComboBox" name="backendEdit"/>
</item>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment