Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
weboob
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
178
Issues
178
List
Boards
Labels
Milestones
Merge Requests
49
Merge Requests
49
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
weboob
weboob
Commits
911cdc13
Commit
911cdc13
authored
Apr 17, 2010
by
Romain Bignon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
new parameter 'sortby' to searches (relevance, rating, views and date)
parent
f1ee6d67
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
43 additions
and
6 deletions
+43
-6
weboob/backends/youporn/backend.py
weboob/backends/youporn/backend.py
+3
-2
weboob/backends/youporn/browser.py
weboob/backends/youporn/browser.py
+2
-2
weboob/capabilities/video.py
weboob/capabilities/video.py
+7
-1
weboob/frontends/qvideoob/main_window.py
weboob/frontends/qvideoob/main_window.py
+1
-1
weboob/frontends/qvideoob/ui/main_window.ui
weboob/frontends/qvideoob/ui/main_window.ui
+30
-0
No files found.
weboob/backends/youporn/backend.py
View file @
911cdc13
...
...
@@ -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
):
...
...
weboob/backends/youporn/browser.py
View file @
911cdc13
...
...
@@ -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
()
...
...
weboob/capabilities/video.py
View file @
911cdc13
...
...
@@ -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
()
...
...
weboob/frontends/qvideoob/main_window.py
View file @
911cdc13
...
...
@@ -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
)
...
...
weboob/frontends/qvideoob/ui/main_window.ui
View file @
911cdc13
...
...
@@ -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>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment