[tvp] Modernize

This commit is contained in:
Philipp Hagemeister 2014-11-26 12:58:53 +01:00
parent b3034f9df7
commit 24144e3b8d
1 changed files with 14 additions and 19 deletions

View File

@ -1,40 +1,35 @@
import json from __future__ import unicode_literals
import re
from .common import InfoExtractor from .common import InfoExtractor
class TvpIE(InfoExtractor): class TvpIE(InfoExtractor):
IE_NAME = u'tvp.pl' IE_NAME = 'tvp.pl'
_VALID_URL = r'https?://www\.tvp\.pl/.*?wideo/(?P<date>\d+)/(?P<id>\d+)' _VALID_URL = r'https?://www\.tvp\.pl/.*?wideo/(?P<date>\d+)/(?P<id>\d+)'
_TEST = { _TEST = {
u'url': u'http://www.tvp.pl/warszawa/magazyny/campusnews/wideo/31102013/12878238', 'url': 'http://www.tvp.pl/warszawa/magazyny/campusnews/wideo/31102013/12878238',
u'md5': u'148408967a6a468953c0a75cbdaf0d7a', 'md5': '148408967a6a468953c0a75cbdaf0d7a',
u'file': u'12878238.wmv', 'info_dict': {
u'info_dict': { 'id': '12878238',
u'title': u'31.10.2013 - Odcinek 2', 'ext': 'wmv',
u'description': u'31.10.2013 - Odcinek 2', 'title': '31.10.2013 - Odcinek 2',
'description': '31.10.2013 - Odcinek 2',
}, },
u'skip': u'Download has to use same server IP as extraction. Therefore, a good (load-balancing) DNS resolver will make the download fail.' 'skip': 'Download has to use same server IP as extraction. Therefore, a good (load-balancing) DNS resolver will make the download fail.'
} }
def _real_extract(self, url): def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url) video_id = self._match_id(url)
video_id = mobj.group('id')
webpage = self._download_webpage(url, video_id) webpage = self._download_webpage(url, video_id)
json_url = 'http://www.tvp.pl/pub/stat/videofileinfo?video_id=%s' % video_id json_url = 'http://www.tvp.pl/pub/stat/videofileinfo?video_id=%s' % video_id
json_params = self._download_webpage( params = self._download_json(
json_url, video_id, u"Downloading video metadata") json_url, video_id, "Downloading video metadata")
params = json.loads(json_params)
self.report_extraction(video_id)
video_url = params['video_url'] video_url = params['video_url']
title = self._og_search_title(webpage, fatal=True)
return { return {
'id': video_id, 'id': video_id,
'title': title, 'title': self._og_search_title(webpage),
'ext': 'wmv', 'ext': 'wmv',
'url': video_url, 'url': video_url,
'description': self._og_search_description(webpage), 'description': self._og_search_description(webpage),