implement fillobj() browser method

weboob/backends/youtube/backend.py

@@ -24,7 +24,6 @@ from weboob.tools.backend import BaseBackend
 from weboob.tools.misc import iter_fields
 
 from .browser import YoutubeBrowser
-from .pages import ForbiddenVideo
 from .video import YoutubeVideo
 
 
@@ -41,23 +40,10 @@ class YoutubeBackend(BaseBackend, ICapVideo):
 
     BROWSER = YoutubeBrowser
 
-    def get_video(self, _id, video=None):
-        try:
-            browser_video = self.browser.get_video(_id)
-        except ForbiddenVideo:
-            if video is None:
-                return None
-            else:
-                raise
-        if video is None:
-            return browser_video
-        else:
-            for k, v in iter_fields(browser_video):
-                if v and getattr(video, k) != v:
-                    setattr(video, k, v)
-            return video
+    def get_video(self, _id):
+        return self.browser.get_video(_id)
 
-    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):
         import gdata.youtube.service
         yt_service = gdata.youtube.service.YouTubeService()
         query = gdata.youtube.service.YouTubeVideoQuery()
@@ -77,19 +63,6 @@ class YoutubeBackend(BaseBackend, ICapVideo):
                                  duration=datetime.timedelta(seconds=int(entry.media.duration.seconds.decode('utf-8').strip())),
                                  thumbnail_url=entry.media.thumbnail[0].url.decode('utf-8').strip(),
                                  )
-            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)
-                    try:
-                        self.get_video(video.id, video=video)
-                    except ForbiddenVideo, e:
-                        logging.debug(e)
-                        continue
-                    else:
-                        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
 
     def iter_page_urls(self, mozaic_url):

weboob/backends/youtube/browser.py

@@ -16,10 +16,12 @@
 # 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 .pages import ForbiddenVideoPage, VerifyAgePage, VideoPage
+from .pages import ForbiddenVideo, ForbiddenVideoPage, VerifyAgePage, VideoPage
 from .video import YoutubeVideo
 
 
@@ -34,10 +36,12 @@ 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):
         self.location(url)
-        if hasattr(self.page, 'video'):
-            return self.page.video
-        else:
-            return None
+        return self.page.get_video()

weboob/backends/youtube/pages.py

@@ -32,26 +32,26 @@ class ForbiddenVideo(Exception):
 
 
 class ForbiddenVideoPage(BasePage):
-    def on_loaded(self):
+    def get_video(self, video=None):
         element = select(self.document.getroot(), '.yt-alert-content', 1)
         raise ForbiddenVideo(element.text.strip())
 
 
 class VerifyAgePage(BasePage):
-    def on_loaded(self):
+    def get_video(self, video=None):
         raise ForbiddenVideo('verify age not implemented')
 
 
 class VideoPage(BasePage):
     VIDEO_SIGNATURE_REGEX = re.compile(r'&t=([^ ,&]*)')
 
-    def on_loaded(self):
-        _id = self.group_dict['id']
-        self.video = YoutubeVideo(_id,
-                                  title=self.get_title(),
-                                  url=self.get_url(_id),
-                                  author=self.get_author(),
-                                  )
+    def get_video(self, video=None):
+        if video is None:
+            video = YoutubeVideo(self.group_dict['id'])
+        video.title = self.get_title()
+        video.url = self.get_url(video.id)
+        video.author = self.get_author()
+        return video
 
     def get_author(self):
         element = select(self.document.getroot(), 'a.watch-description-username strong', 1)