fill all available fields

This commit is contained in:
Romain Bignon 2010-11-09 23:27:00 +01:00
commit 08297f5f0b
5 changed files with 71 additions and 61 deletions

View file

@ -20,7 +20,7 @@ import urllib
from weboob.tools.browser import BaseBrowser
from weboob.tools.browser.decorators import id2url
from .pages import InitPage, SearchResultPage, CanalplusVideo, VideoPage
from .pages import InitPage, CanalplusVideo, VideoPage
import lxml.etree
@ -40,7 +40,7 @@ class CanalplusBrowser(BaseBrowser):
DOMAIN = u'service.canal-plus.com'
ENCODING = 'utf-8'
PAGES = {r"http://service.canal-plus.com/video/rest/initPlayer/cplus/": InitPage,
r"http://service.canal-plus.com/video/rest/search/cplus/.*": SearchResultPage,
r"http://service.canal-plus.com/video/rest/search/cplus/.*": VideoPage,
r"http://service.canal-plus.com/video/rest/getVideosLiees/cplus/(?P<id>.+)": VideoPage,
}
@ -49,24 +49,24 @@ class CanalplusBrowser(BaseBrowser):
FORMATS = { 'sd': 'BAS_DEBIT',
'hd': 'HD'
}
def __init__(self, quality, *args, **kwargs):
BaseBrowser.__init__(self, parser= self.PARSER, *args, **kwargs)
if quality in self.FORMATS:
self.quality = self.FORMATS[quality]
else:
self.quality = 'HD'
self.quality = 'HD'
def home(self):
self.location("http://service.canal-plus.com/video/rest/initPlayer/cplus/")
def iter_search_results(self, pattern):
self.location("http://service.canal-plus.com/video/rest/search/cplus/" + urllib.quote_plus(pattern) )
self.location("http://service.canal-plus.com/video/rest/search/cplus/" + urllib.quote_plus(pattern))
return self.page.iter_results()
@id2url(CanalplusVideo.id2url)
def get_video(self, url, video=None):
self.location(url)
return self.page.get_video(video, self.quality)