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

new API for the fillobj feature and severaaal fixes

Browse source
This commit is contained in:
Romain Bignon 2010-07-18 00:35:07 +02:00
commit edc83df3a1
11 changed files with 60 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -20,6 +20,7 @@ from weboob.capabilities.video import ICapVideo
from weboob.tools.backend import BaseBackend
from .browser import YoujizzBrowser
from .video import YoujizzVideo
__all__ = ['YoujizzBackend']
@ -46,3 +47,9 @@ class YoujizzBackend(BaseBackend, ICapVideo):
if not nsfw:
return
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)
OBJECTS = {YoujizzVideo: fill_video}

14
weboob/backends/youjizz/browser.py
View file

@ -16,13 +16,10 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
import logging
import re
import urllib
from weboob.tools.browser import BaseBrowser, BrowserUnavailable
from weboob.tools.browser import BaseBrowser
from weboob.tools.browser.decorators import check_domain, id2url
from weboob.tools.misc import iter_fields, to_unicode
from .pages.index import IndexPage
from .pages.video import VideoPage
@ -41,15 +38,10 @@ class YoujizzBrowser(BaseBrowser):
r'http://.*youjizz\.com/videos/(?P<id>.+)\.html': VideoPage,
}
def fillobj(self, video, fields):
# ignore the fields param: VideoPage.get_video() returns all the information
self.location(YoujizzVideo.id2url(video.id))
return self.page.get_video(video)
@id2url(YoujizzVideo.id2url)
def get_video(self, url):
def get_video(self, url, video=None):
self.location(url)
return self.page.get_video()
return self.page.get_video(video)
@check_domain
def iter_page_urls(self, mozaic_url):

9
weboob/backends/youjizz/pages/index.py
View file

@ -43,7 +43,14 @@ class IndexPage(BasePage):
title = title_el.text.strip()
time_span = select(span, 'span.thumbtime span', 1)
minutes, seconds = (int(v) for v in time_span.text.strip().split(':'))
time_txt = time_span.text.strip()
if time_txt == 'N/A':
minutes, seconds = 0, 0
elif ':' in time_txt:
minutes, seconds = (int(v) for v in time_txt.split(':'))
else:
raise SelectElementException('Unable to parse the video duration: %s' % time_txt)
yield YoujizzVideo(_id,
title=title,

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

@ -20,6 +20,7 @@ from weboob.capabilities.video import ICapVideo
from weboob.tools.backend import BaseBackend
from .browser import YoupornBrowser
from .video import YoupornVideo
__all__ = ['YoupornBackend']
@ -46,3 +47,9 @@ class YoupornBackend(BaseBackend, ICapVideo):
def iter_page_urls(self, mozaic_url):
raise NotImplementedError()
def fill_video(self, video, fields):
# ignore the fields param: VideoPage.get_video() returns all the information
return self.browser.get_video(YoupornVideo.id2url(video.id), video)
OBJECTS = {YoupornVideo: fill_video}

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

@ -16,11 +16,8 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
import logging
from weboob.tools.browser import BaseBrowser
from weboob.tools.browser.decorators import id2url
from weboob.tools.misc import iter_fields
from .pages.index import IndexPage
from .pages.video import VideoPage
@ -39,15 +36,10 @@ class YoupornBrowser(BaseBrowser):
r'http://[w\.]*youporngay\.com:80/watch/(?P<id>.+)': VideoPage,
}
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)
@id2url(YoupornVideo.id2url)
def get_video(self, url):
def get_video(self, url, video=None):
self.location(url)
return self.page.get_video()
return self.page.get_video(video)
def iter_search_results(self, pattern, sortby):
if not pattern:

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

@ -18,7 +18,6 @@
import re
import datetime
from logging import warning
from weboob.tools.parsers.lxmlparser import select

8
weboob/backends/youtube/backend.py
View file

@ -17,11 +17,9 @@
import datetime
import logging
from weboob.capabilities.video import ICapVideo
from weboob.tools.backend import BaseBackend
from weboob.tools.misc import iter_fields
from .browser import YoutubeBrowser
from .video import YoutubeVideo
@ -67,3 +65,9 @@ class YoutubeBackend(BaseBackend, ICapVideo):
def iter_page_urls(self, mozaic_url):
raise NotImplementedError()
def fill_video(self, video, fields):
# ignore the fields param: VideoPage.get_video() returns all the information
return self.browser.get_video(YoutubeVideo.id2url(video.id), video)
OBJECTS = {YoutubeVideo: fill_video}

11
weboob/backends/youtube/browser.py
View file

@ -16,8 +16,6 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
import logging
from weboob.tools.browser import BaseBrowser
from weboob.tools.browser.decorators import id2url
@ -36,12 +34,7 @@ class YoutubeBrowser(BaseBrowser):
r'.*youtube\.com/verify_age\?next_url=(?P<next_url>.+)': VerifyAgePage,
}
def fillobj(self, video, fields):
# ignore the fields param: VideoPage.get_video() returns all the information
self.location(YoutubeVideo.id2url(video.id))
return self.page.get_video(video)
@id2url(YoutubeVideo.id2url)
def get_video(self, url):
def get_video(self, url, video=None):
self.location(url)
return self.page.get_video()
return self.page.get_video(video)

2
weboob/backends/youtube/pages.py
View file

@ -24,7 +24,7 @@ from weboob.tools.parsers.lxmlparser import select
from .video import YoutubeVideo
__all__ = ['ForbiddenVideoPage', 'VerifyAgePage', 'VideoPage']
__all__ = ['ForbiddenVideo', 'ForbiddenVideoPage', 'VerifyAgePage', 'VideoPage']
class ForbiddenVideo(Exception):