lopar/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-12-23 08:26:50 +00:00
Code Releases Activity

[wat] Use server time and pass country argument (Closes #3579)

Browse Source
This commit is contained in:
Sergey M․ 2014-08-25 20:21:33 +07:00
parent 241f7a8ade
commit c28df2478f
1 changed files with 34 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
youtube_dl/extractor/wat.py
View File

@ -2,19 +2,17 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import re import re
import time
import hashlib import hashlib
from .common import InfoExtractor from .common import InfoExtractor
from ..utils import ( from ..utils import unified_strdate
unified_strdate,
)
class WatIE(InfoExtractor): class WatIE(InfoExtractor):
_VALID_URL = r'http://www\.wat\.tv/video/(?P<display_id>.*)-(?P<short_id>.*?)_.*?\.html' _VALID_URL = r'http://www\.wat\.tv/video/(?P<display_id>.*)-(?P<short_id>.*?)_.*?\.html'
IE_NAME = 'wat.tv' IE_NAME = 'wat.tv'
_TEST = { _TESTS = [
{
'url': 'http://www.wat.tv/video/soupe-figues-l-orange-aux-epices-6z1uz_2hvf7_.html', 'url': 'http://www.wat.tv/video/soupe-figues-l-orange-aux-epices-6z1uz_2hvf7_.html',
'md5': 'ce70e9223945ed26a8056d413ca55dc9', 'md5': 'ce70e9223945ed26a8056d413ca55dc9',
'info_dict': { 'info_dict': {
@ -26,7 +24,21 @@ class WatIE(InfoExtractor):
'upload_date': '20140819', 'upload_date': '20140819',
'duration': 120, '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,
},
},
]
def download_video_info(self, real_id): def download_video_info(self, real_id):
# 'contentv4' is used in the website, but it also returns the related # 'contentv4' is used in the website, but it also returns the related
@ -45,9 +57,8 @@ class WatIE(InfoExtractor):
video_info = self.download_video_info(real_id) video_info = self.download_video_info(real_id)
if video_info.get('geolock'): geo_list = video_info.get('geoList')
self.report_warning( country = geo_list[0] if geo_list else ''
'This content is marked as not available in your area. Trying anyway ..')
chapters = video_info['chapters'] chapters = video_info['chapters']
first_chapter = chapters[0] first_chapter = chapters[0]
@ -82,14 +93,16 @@ class WatIE(InfoExtractor):
fmts.append(('HD', 'webhd')) fmts.append(('HD', 'webhd'))
def compute_token(param): 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' magic = '9b673b13fa4682ed14c3cfa5af5310274b514c4133e9b3a81e6e3aba009l2564'
return '%s/%s' % (hashlib.md5((magic + param + timestamp).encode('ascii')).hexdigest(), timestamp) return '%s/%s' % (hashlib.md5((magic + param + timestamp).encode('ascii')).hexdigest(), timestamp)
for fmt in fmts: for fmt in fmts:
webid = '/%s/%s' % (fmt[1], real_id) webid = '/%s/%s' % (fmt[1], real_id)
video_url = self._download_webpage( 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, real_id,
'Downloding %s video URL' % fmt[0], 'Downloding %s video URL' % fmt[0],
'Failed to download %s video URL' % fmt[0], 'Failed to download %s video URL' % fmt[0],