nojhan/weboob-devel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'fillobj'

Browse source 
Conflicts:
	weboob/backends/youjizz/backend.py
	weboob/backends/youporn/backend.py
	weboob/tools/application/console.py
This commit is contained in:
Romain Bignon 2010-07-20 20:39:13 +02:00
commit cd56abe724
6 changed files with 50 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

12
weboob/backends/youjizz/backend.py
View file

@ -37,19 +37,23 @@ class YoujizzBackend(BaseBackend, ICapVideo):
BROWSER = YoujizzBrowser
def get_video(self, _id):
video = self.browser.get_video(_id)
with self.browser:
video = self.browser.get_video(_id)
return video
def iter_page_urls(self, mozaic_url):
return self.browser.iter_page_urls(mozaic_url)
with self.browser:
return self.browser.iter_page_urls(mozaic_url)
def iter_search_results(self, pattern=None, sortby=ICapVideo.SEARCH_RELEVANCE, nsfw=False):
if not nsfw:
return set()
return self.browser.iter_search_results(pattern)
with self.browser:
return self.browser.iter_search_results(pattern)
def fill_video(self, video, fields):
# ignore the fields param: VideoPage.get_video() returns all the information
return self.browser.get_video(YoujizzVideo.id2url(video.id), video)
with self.browser:
return self.browser.get_video(YoujizzVideo.id2url(video.id), video)
OBJECTS = {YoujizzVideo: fill_video}