X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fwat.py;h=affcc52f6e244c40bbca6381700c2f15e645580f;hb=44cae2fb2e7b8cffcdfdd57b1224115345009cc5;hp=1f330378a7fbd72bd23c92747930e85e9145e452;hpb=30b871b0ca09ae6088d8a8a0f77bf4d25aa0cb5b;p=youtube-dl

diff --git a/youtube_dl/extractor/wat.py b/youtube_dl/extractor/wat.py
index 1f330378a..affcc52f6 100644
--- a/youtube_dl/extractor/wat.py
+++ b/youtube_dl/extractor/wat.py
@@ -2,7 +2,6 @@
 from __future__ import unicode_literals
 
 import re
-import time
 import hashlib
 
 from .common import InfoExtractor
@@ -15,19 +14,35 @@ from ..utils import (
 class WatIE(InfoExtractor):
     _VALID_URL = r'http://www\.wat\.tv/video/(?P<display_id>.*)-(?P<short_id>.*?)_.*?\.html'
     IE_NAME = 'wat.tv'
-    _TEST = {
-        'url': 'http://www.wat.tv/video/soupe-figues-l-orange-aux-epices-6z1uz_2hvf7_.html',
-        'md5': 'ce70e9223945ed26a8056d413ca55dc9',
-        'info_dict': {
-            'id': '11713067',
-            'display_id': 'soupe-figues-l-orange-aux-epices',
-            'ext': 'mp4',
-            'title': 'Soupe de figues à l\'orange et aux épices',
-            'description': 'Retrouvez l\'émission "Petits plats en équilibre", diffusée le 18 août 2014.',
-            'upload_date': '20140819',
-            'duration': 120,
+    _TESTS = [
+        {
+            'url': 'http://www.wat.tv/video/soupe-figues-l-orange-aux-epices-6z1uz_2hvf7_.html',
+            'md5': 'ce70e9223945ed26a8056d413ca55dc9',
+            'info_dict': {
+                'id': '11713067',
+                'display_id': 'soupe-figues-l-orange-aux-epices',
+                'ext': 'mp4',
+                'title': 'Soupe de figues à l\'orange et aux épices',
+                'description': 'Retrouvez l\'émission "Petits plats en équilibre", diffusée le 18 août 2014.',
+                'upload_date': '20140819',
+                'duration': 120,
+            },
+        },
+        {
+            'url': 'http://www.wat.tv/video/gregory-lemarchal-voix-ange-6z1v7_6ygkj_.html',
+            'md5': 'fbc84e4378165278e743956d9c1bf16b',
+            'info_dict': {
+                'id': '11713075',
+                'display_id': 'gregory-lemarchal-voix-ange',
+                'ext': 'mp4',
+                'title': 'Grégory Lemarchal, une voix d\'ange depuis 10 ans (1/3)',
+                'description': 'md5:b7a849cf16a2b733d9cd10c52906dee3',
+                'upload_date': '20140816',
+                'duration': 2910,
+            },
+            'skip': "Ce contenu n'est pas disponible pour l'instant.",
         },
-    }
+    ]
 
     def download_video_info(self, real_id):
         # 'contentv4' is used in the website, but it also returns the related
@@ -46,8 +61,13 @@ class WatIE(InfoExtractor):
 
         video_info = self.download_video_info(real_id)
 
-        if video_info.get('geolock'):
-            raise ExtractorError('This content is not available in your area', expected=True)
+        error_desc = video_info.get('error_desc')
+        if error_desc:
+            raise ExtractorError(
+                '%s returned error: %s' % (self.IE_NAME, error_desc), expected=True)
+
+        geo_list = video_info.get('geoList')
+        country = geo_list[0] if geo_list else ''
 
         chapters = video_info['chapters']
         first_chapter = chapters[0]
@@ -82,16 +102,18 @@ class WatIE(InfoExtractor):
             fmts.append(('HD', 'webhd'))
 
         def compute_token(param):
-            timestamp = '%08x' % int(time.time())
+            timestamp = '%08x' % int(self._download_webpage(
+                'http://www.wat.tv/servertime', real_id,
+                'Downloading server time').split('|')[0])
             magic = '9b673b13fa4682ed14c3cfa5af5310274b514c4133e9b3a81e6e3aba009l2564'
             return '%s/%s' % (hashlib.md5((magic + param + timestamp).encode('ascii')).hexdigest(), timestamp)
 
         for fmt in fmts:
             webid = '/%s/%s' % (fmt[1], real_id)
             video_url = self._download_webpage(
-                'http://www.wat.tv/get%s?token=%s&getURL=1' % (webid, compute_token(webid)),
+                'http://www.wat.tv/get%s?token=%s&getURL=1&country=%s' % (webid, compute_token(webid), country),
                 real_id,
-                'Downloding %s video URL' % fmt[0],
+                'Downloading %s video URL' % fmt[0],
                 'Failed to download %s video URL' % fmt[0],
                 False)
             if not video_url: