X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fwdr.py;h=54d37da618960d46d977ff4b97682ca0c7b2a99c;hb=cc7fec5818254f4679896823c7de9d17f50201ca;hp=500b9146fc3338366b7d77d35b10e579a11af67f;hpb=87a29e6f25fce2bae9369b5c30624c39ddf02eab;p=youtube-dl
diff --git a/youtube_dl/extractor/wdr.py b/youtube_dl/extractor/wdr.py
index 500b9146f..54d37da61 100644
--- a/youtube_dl/extractor/wdr.py
+++ b/youtube_dl/extractor/wdr.py
@@ -1,12 +1,14 @@
+# -*- coding: utf-8 -*-
from __future__ import unicode_literals
import re
from .common import InfoExtractor
from ..utils import (
- unified_strdate,
+ compat_parse_qs,
compat_urlparse,
determine_ext,
+ unified_strdate,
)
@@ -53,14 +55,14 @@ class WDRIE(InfoExtractor):
},
},
{
- 'url': 'http://www.funkhauseuropa.de/av/audiogrenzenlosleckerbaklava101-audioplayer.html',
- 'md5': 'cfff440d4ee64114083ac44676df5d15',
+ 'url': 'http://www.funkhauseuropa.de/av/audioflaviacoelhoamaramar100-audioplayer.html',
+ 'md5': '99a1443ff29af19f6c52cf6f4dc1f4aa',
'info_dict': {
- 'id': 'mdb-363068',
+ 'id': 'mdb-478135',
'ext': 'mp3',
- 'title': 'Grenzenlos lecker - Baklava',
+ 'title': 'Flavia Coelho: Amar é Amar',
'description': 'md5:7b29e97e10dfb6e265238b32fa35b23a',
- 'upload_date': '20140311',
+ 'upload_date': '20140717',
},
},
]
@@ -79,7 +81,7 @@ class WDRIE(InfoExtractor):
]
return self.playlist_result(entries, page_id)
- flashvars = compat_urlparse.parse_qs(
+ flashvars = compat_parse_qs(
self._html_search_regex(r'[0-9]+)
+ /[0-9]+/[0-9]+/
+ (?P[0-9]+)_(?P[0-9]+)'''
+ IE_NAME = 'wdr:mobile'
+ _TEST = {
+ 'url': 'http://mobile-ondemand.wdr.de/CMS2010/mdb/ondemand/weltweit/fsk0/42/421735/421735_4283021.mp4',
+ 'info_dict': {
+ 'title': '4283021',
+ 'id': '421735',
+ 'ext': 'mp4',
+ 'age_limit': 0,
+ },
+ 'skip': 'Problems with loading data.'
+ }
+
+ def _real_extract(self, url):
+ mobj = re.match(self._VALID_URL, url)
+ return {
+ 'id': mobj.group('id'),
+ 'title': mobj.group('title'),
+ 'age_limit': int(mobj.group('age_limit')),
+ 'url': url,
+ 'ext': determine_ext(url),
+ 'user_agent': 'mobile',
+ }
+
+
+class WDRMausIE(InfoExtractor):
+ _VALID_URL = 'http://(?:www\.)?wdrmaus\.de/(?:[^/]+/){,2}(?P[^/?#]+)(?:/index\.php5|(?Sendedatum:\s*([0-9\.]+)
',
+ webpage, 'air date')
+ title_str = self._html_search_regex(
+ r'(.*?)
', webpage, 'title')
+ title = '%s - %s' % (title_date, title_str)
+ upload_date = unified_strdate(
+ self._html_search_meta('dc.date', webpage))
+
+ fields = compat_parse_qs(param_code)
+ video_url = fields['firstVideo'][0]
+ thumbnail = compat_urlparse.urljoin(url, fields['startPicture'][0])
+
+ formats = [{
+ 'format_id': 'rtmp',
+ 'url': video_url,
+ }]
+
+ jscode = self._download_webpage(
+ 'http://www.wdrmaus.de/codebase/js/extended-medien.min.js',
+ video_id, fatal=False,
+ note='Downloading URL translation table',
+ errnote='Could not download URL translation table')
+ if jscode:
+ for m in re.finditer(
+ r"stream:\s*'dslSrc=(?P[^']+)',\s*download:\s*'(?P[^']+)'\s*\}",
+ jscode):
+ if video_url.startswith(m.group('stream')):
+ http_url = video_url.replace(
+ m.group('stream'), m.group('dl'))
+ formats.append({
+ 'format_id': 'http',
+ 'url': http_url,
+ })
+ break
+
+ self._sort_formats(formats)
+
+ return {
+ 'id': video_id,
+ 'title': title,
+ 'formats': formats,
+ 'thumbnail': thumbnail,
+ 'upload_date': upload_date,
+ }
+
+# TODO test _1
\ No newline at end of file