fill all available fields

weboob/backends/canalplus/pages/__init__.py

@@ -16,8 +16,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 from .initpage import InitPage
-from .searchresultpage import SearchResultPage
 from .video import CanalplusVideo
 from .videopage import VideoPage
 
-__all__ = ['InitPage', 'SearchResultPage', 'VideoPage',  'CanalplusVideo']
+__all__ = ['InitPage', 'VideoPage',  'CanalplusVideo']

weboob/backends/canalplus/pages/searchresultpage.py

@@ -1,33 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Copyright(C) 2010  Nicolas Duhamel
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, version 3 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-from weboob.tools.browser import BasePage
-from .video import CanalplusVideo
-
-
-__all__ = ['SearchResultPage']
-
-class SearchResultPage(BasePage):
-	def iter_results(self):
-		for vid in self.document.getchildren():
-			#id
-			_id = vid[0].text
-			#Titre
-			titre = vid[2][9][0].text
-			#Sous titre
-			titre = titre + " " + vid[2][9][1].text
-			yield CanalplusVideo(_id, title=titre)

weboob/backends/canalplus/pages/videopage.py

@@ -15,26 +15,63 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
+
+from datetime import datetime
+
+from weboob.capabilities.video import VideoThumbnail
 from weboob.tools.browser import BasePage
 from .video import CanalplusVideo
+
+
 __all__ = ['VideoPage']
 
+
 class VideoPage(BasePage):
-    def on_loaded(self):
-        pass
+    def parse_video(self, el, video=None, quality=None):
+        _id = el.find('ID').text
+        if _id == '-1':
+            # means the video is not found
+            return None
+
+        if not video:
+            video = CanalplusVideo(_id)
+
+        infos = el.find('INFOS')
+        video.title = u''
+        for part in infos.find('TITRAGE'):
+            if len(part.text.strip()) == 0:
+                continue
+            if len(video.title) > 0:
+                video.title += u' — '
+            video.title += part.text.strip()
+        video.description = infos.find('DESCRIPTION').text
+
+        media = el.find('MEDIA')
+        video.thumbnail = VideoThumbnail(media.find('IMAGES').find('PETIT').text)
+        lastest_format = None
+        for format in media.find('VIDEOS'):
+            if format.text is None:
+                continue
+            if format.tag == quality:
+                video.url = format.text
+                break
+            lastest_format = format
+        if not video.url and lastest_format is not None:
+            video.url = lastest_format.text
+
+        day, month, year = map(int, infos.find('PUBLICATION').find('DATE').text.split('/'))
+        hour, minute, second = map(int, infos.find('PUBLICATION').find('HEURE').text.split(':'))
+        video.date = datetime(year, month, day, hour, minute, second)
+
+        return video
+
+    def iter_results(self):
+        for vid in self.document.getchildren():
+            yield self.parse_video(vid)
 
     def get_video(self, video, quality):
-        if not video:
-            video = CanalplusVideo(self.group_dict['id'])
+        _id = self.group_dict['id']
         for vid in self.document.getchildren():
-            url = None
-            lastest = None
-            for format in vid[5][1].getchildren():
-                if format.tag == quality:
-                   url = format.text
-                if format.text:
-                    lastest = format
-            if url == None:
-                url = lastest.text
-            video.url = url
-            return video
+            if not _id in vid.find('ID').text:
+                continue
+            return self.parse_video(vid, video, quality)