projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4b3cd73
)
[mdr] Fix extraction (Closes #8702)
author
Sergey M․
<dstftw@gmail.com>
Mon, 29 Feb 2016 19:24:26 +0000
(
01:24
+0600)
committer
Sergey M․
<dstftw@gmail.com>
Mon, 29 Feb 2016 19:24:26 +0000
(
01:24
+0600)
youtube_dl/extractor/mdr.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/mdr.py
b/youtube_dl/extractor/mdr.py
index 425fc9e2a69b93879eb71a32eae2a042d97770cc..2338e7f96f36bea7246e7357302cbcbcac39ad8a 100644
(file)
--- a/
youtube_dl/extractor/mdr.py
+++ b/
youtube_dl/extractor/mdr.py
@@
-14,7
+14,7
@@
from ..utils import (
class MDRIE(InfoExtractor):
IE_DESC = 'MDR.DE and KiKA'
class MDRIE(InfoExtractor):
IE_DESC = 'MDR.DE and KiKA'
- _VALID_URL = r'https?://(?:www\.)?(?:mdr|kika)\.de/(?:.*)/[a-z]+(?P<id>\d+)(?:_.+?)?\.html'
+ _VALID_URL = r'https?://(?:www\.)?(?:mdr|kika)\.de/(?:.*)/[a-z]+
-?
(?P<id>\d+)(?:_.+?)?\.html'
_TESTS = [{
# MDR regularly deletes its videos
_TESTS = [{
# MDR regularly deletes its videos
@@
-60,6
+60,9
@@
class MDRIE(InfoExtractor):
}, {
'url': 'http://www.kika.de/sendungen/einzelsendungen/weihnachtsprogramm/einzelsendung2534.html',
'only_matching': True,
}, {
'url': 'http://www.kika.de/sendungen/einzelsendungen/weihnachtsprogramm/einzelsendung2534.html',
'only_matching': True,
+ }, {
+ 'url': 'http://www.mdr.de/mediathek/mdr-videos/a/video-1334.html',
+ 'only_matching': True,
}]
def _real_extract(self, url):
}]
def _real_extract(self, url):
@@
-68,8
+71,8
@@
class MDRIE(InfoExtractor):
webpage = self._download_webpage(url, video_id)
data_url = self._search_regex(
webpage = self._download_webpage(url, video_id)
data_url = self._search_regex(
- r'
dataURL\s*:\s*(["\'])(?P<url>/.+/(?:video|audio)
[0-9]+-avCustom\.xml)\1',
- webpage, 'data url',
group='url
')
+ r'
(?:dataURL|playerXml(?:["\'])?)\s*:\s*(["\'])(?P<url>\\?/.+/(?:video|audio)-?
[0-9]+-avCustom\.xml)\1',
+ webpage, 'data url',
default=None, group='url').replace('\/', '/
')
doc = self._download_xml(
compat_urlparse.urljoin(url, data_url), video_id)
doc = self._download_xml(
compat_urlparse.urljoin(url, data_url), video_id)