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

implement fillobj() browser method

Browse source
This commit is contained in:
Christophe Benz 2010-07-15 01:21:49 +02:00
commit 3175883351
13 changed files with 164 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

4
weboob/backends/youporn/backend.py
View file

@ -39,10 +39,10 @@ class YoupornBackend(BaseBackend, ICapVideo):
return self.browser.get_video(_id)
SORTBY = ['relevance', 'rating', 'views', 'time']
def iter_search_results(self, pattern=None, sortby=ICapVideo.SEARCH_RELEVANCE, nsfw=False, required_fields=None):
def iter_search_results(self, pattern=None, sortby=ICapVideo.SEARCH_RELEVANCE, nsfw=False):
if not nsfw:
return
return self.browser.iter_search_results(pattern, self.SORTBY[sortby], required_fields=required_fields)
return self.browser.iter_search_results(pattern, self.SORTBY[sortby])
def iter_page_urls(self, mozaic_url):
raise NotImplementedError()

32
weboob/backends/youporn/browser.py
View file

@ -39,30 +39,20 @@ class YoupornBrowser(BaseBrowser):
r'http://[w\.]*youporngay\.com:80/watch/(?P<id>.+)': VideoPage,
}
@id2url(YoupornVideo.id2url)
def get_video(self, url, video=None):
self.location(url)
if video is None:
return self.page.video
else:
for k, v in iter_fields(self.page.video):
if v and getattr(video, k) != v:
setattr(video, k, v)
return video
def fillobj(self, video, fields):
# ignore the fields param: VideoPage.get_video() returns all the information
self.location(YoupornVideo.id2url(video.id))
return self.page.get_video(video)
def iter_search_results(self, pattern, sortby, required_fields=None):
@id2url(YoupornVideo.id2url)
def get_video(self, url):
self.location(url)
return self.page.get_video()
def iter_search_results(self, pattern, sortby):
if not pattern:
self.home()
else:
self.location(self.buildurl('/search/%s' % sortby, query=pattern))
assert self.is_on_page(IndexPage)
for video in self.page.iter_videos():
if required_fields is not None:
missing_required_fields = set(required_fields) - set(k for k, v in iter_fields(video) if v)
if missing_required_fields:
logging.debug(u'Completing missing required fields: %s' % missing_required_fields)
self.get_video(video.id, video=video)
missing_required_fields = set(required_fields) - set(k for k, v in iter_fields(video) if v)
if missing_required_fields:
raise Exception(u'Could not load all required fields. Missing: %s' % missing_required_fields)
yield video
return self.page.iter_videos()

26
weboob/backends/youporn/pages/video.py
View file

@ -27,19 +27,20 @@ from ..video import YoupornVideo
class VideoPage(PornPage):
def on_loaded(self):
def get_video(self, video=None):
if not PornPage.on_loaded(self):
return
self.video = YoupornVideo(self.group_dict['id'],
self.get_title(),
self.get_url(),
)
self.set_details(self.video)
if video is None:
video = YoupornVideo(self.group_dict['id'])
video.title = self.get_title()
video.url = self.get_url()
self.set_details(video)
return video
def get_url(self):
el = self.document.getroot().cssselect('div[id=download]')
if el:
return el[0].cssselect('a')[0].attrib['href']
download_div = select(self.document.getroot(), '#download', 1)
a = select(download_div, 'a', 1)
return a.attrib['href']
def get_title(self):
element = select(self.document.getroot(), '#videoArea h1', 1)
@ -49,11 +50,8 @@ class VideoPage(PornPage):
MONTH2I = ['', 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
def set_details(self, v):
div = self.document.getroot().cssselect('div[id=details]')
if not div:
return
for li in div[0].getiterator('li'):
details_div = select(self.document.getroot(), '#details', 1)
for li in details_div.getiterator('li'):
span = li.find('span')
name = span.text.strip()
value = span.tail.strip()