projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8e82ecf
)
[njoy] Add support for URLs without display id
author
Sergey M․
<dstftw@gmail.com>
Sun, 25 Oct 2015 14:48:29 +0000
(20:48 +0600)
committer
Sergey M․
<dstftw@gmail.com>
Sun, 25 Oct 2015 14:48:29 +0000
(20:48 +0600)
youtube_dl/extractor/ndr.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/ndr.py
b/youtube_dl/extractor/ndr.py
index e3cc6fde80ea545a0c98a26854afa13c81cbc9b9..ba06d8a98aeb179ce67b61d12ac6be2db8d8c0db 100644
(file)
--- a/
youtube_dl/extractor/ndr.py
+++ b/
youtube_dl/extractor/ndr.py
@@
-14,7
+14,8
@@
from ..utils import (
class NDRBaseIE(InfoExtractor):
def _real_extract(self, url):
class NDRBaseIE(InfoExtractor):
def _real_extract(self, url):
- display_id = self._match_id(url)
+ mobj = re.match(self._VALID_URL, url)
+ display_id = next(group for group in mobj.groups() if group)
webpage = self._download_webpage(url, display_id)
return self._extract_embed(webpage, display_id)
webpage = self._download_webpage(url, display_id)
return self._extract_embed(webpage, display_id)
@@
-101,7
+102,7
@@
class NDRIE(NDRBaseIE):
class NJoyIE(NDRBaseIE):
IE_NAME = 'njoy'
IE_DESC = 'N-JOY'
class NJoyIE(NDRBaseIE):
IE_NAME = 'njoy'
IE_DESC = 'N-JOY'
- _VALID_URL = r'https?://www\.n-joy\.de/(?:[^/]+/)+(?
P<id>[^/?#]+),[\da-z]+
\.html'
+ _VALID_URL = r'https?://www\.n-joy\.de/(?:[^/]+/)+(?
:(?P<display_id>[^/?#]+),)?(?P<id>[\da-z]+)
\.html'
_TESTS = [{
# httpVideo, same content id
'url': 'http://www.n-joy.de/entertainment/comedy/comedy_contest/Benaissa-beim-NDR-Comedy-Contest,comedycontest2480.html',
_TESTS = [{
# httpVideo, same content id
'url': 'http://www.n-joy.de/entertainment/comedy/comedy_contest/Benaissa-beim-NDR-Comedy-Contest,comedycontest2480.html',
@@
-136,6
+137,9
@@
class NJoyIE(NDRBaseIE):
'params': {
'skip_download': True,
},
'params': {
'skip_download': True,
},
+ }, {
+ 'url': 'http://www.n-joy.de/radio/webradio/morningshow209.html',
+ 'only_matching': True,
}]
def _extract_embed(self, webpage, display_id):
}]
def _extract_embed(self, webpage, display_id):