diff --git a/weboob/backends/canalplus/backend.py b/weboob/backends/canalplus/backend.py index d97de1bf..6cc7158b 100644 --- a/weboob/backends/canalplus/backend.py +++ b/weboob/backends/canalplus/backend.py @@ -44,12 +44,13 @@ class CanalplusBackend(BaseBackend, ICapVideo): def iter_search_results(self, pattern=None, sortby=ICapVideo.SEARCH_RELEVANCE, nsfw=False, max_results=None): with self.browser: return self.browser.iter_search_results(pattern) - + def get_video(self, _id): with self.browser: return self.browser.get_video(_id) - + def fill_video(self, video, fields): - return self.browser.get_video(CanalplusVideo.id2url(video.id)) - + with self.browser: + return self.browser.get_video(CanalplusVideo.id2url(video.id), video) + OBJECTS = {CanalplusVideo: fill_video} diff --git a/weboob/backends/canalplus/pages/videopage.py b/weboob/backends/canalplus/pages/videopage.py index d45cec35..04003ff3 100644 --- a/weboob/backends/canalplus/pages/videopage.py +++ b/weboob/backends/canalplus/pages/videopage.py @@ -22,12 +22,10 @@ __all__ = ['VideoPage'] class VideoPage(BasePage): def on_loaded(self): pass - + def get_video(self, video, quality): if not video: video = CanalplusVideo(self.group_dict['id']) - print quality - print video.id for vid in self.document.getchildren(): url = None lastest = None