projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f24a5a2
)
[zdf] Simplify
author
Philipp Hagemeister
<phihag@phihag.de>
Mon, 27 Oct 2014 01:14:07 +0000
(
02:14
+0100)
committer
Philipp Hagemeister
<phihag@phihag.de>
Mon, 27 Oct 2014 01:14:07 +0000
(
02:14
+0100)
youtube_dl/extractor/zdf.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/zdf.py
b/youtube_dl/extractor/zdf.py
index 3b1ac4e9f5246e268e0c0b49d64249196270e9d4..52b066ce39231ee9a923a5f6c0878e44941e11cd 100644
(file)
--- a/
youtube_dl/extractor/zdf.py
+++ b/
youtube_dl/extractor/zdf.py
@@
-11,7
+11,7
@@
from ..utils import (
class ZDFIE(InfoExtractor):
class ZDFIE(InfoExtractor):
- _VALID_URL = r'^https?://www\.zdf\.de/ZDFmediathek(?P<hash>#)?/(.*beitrag/(?:video/)?)(?P<
video_
id>[0-9]+)(?:/[^/?]+)?(?:\?.*)?'
+ _VALID_URL = r'^https?://www\.zdf\.de/ZDFmediathek(?P<hash>#)?/(.*beitrag/(?:video/)?)(?P<id>[0-9]+)(?:/[^/?]+)?(?:\?.*)?'
_TEST = {
'url': 'http://www.zdf.de/ZDFmediathek/beitrag/video/2037704/ZDFspezial---Ende-des-Machtpokers--?bc=sts;stt',
_TEST = {
'url': 'http://www.zdf.de/ZDFmediathek/beitrag/video/2037704/ZDFspezial---Ende-des-Machtpokers--?bc=sts;stt',
@@
-29,8
+29,7
@@
class ZDFIE(InfoExtractor):
}
def _real_extract(self, url):
}
def _real_extract(self, url):
- mobj = re.match(self._VALID_URL, url)
- video_id = mobj.group('video_id')
+ video_id = self._match_id(url)
xml_url = 'http://www.zdf.de/ZDFmediathek/xmlservice/web/beitragsDetails?ak=web&id=%s' % video_id
doc = self._download_xml(
xml_url = 'http://www.zdf.de/ZDFmediathek/xmlservice/web/beitragsDetails?ak=web&id=%s' % video_id
doc = self._download_xml(