projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #1310 from rzhxeo/rtlnow
[youtube-dl]
/
youtube_dl
/
extractor
/
rtlnow.py
diff --git
a/youtube_dl/extractor/rtlnow.py
b/youtube_dl/extractor/rtlnow.py
index 67f341bcc63171e2f6362fff7cd79aadeffceb60..7bb236c2b9fe02e998a9cdee38c640110f22b19c 100644
(file)
--- a/
youtube_dl/extractor/rtlnow.py
+++ b/
youtube_dl/extractor/rtlnow.py
@@
-2,7
+2,10
@@
import re
from .common import InfoExtractor
import re
from .common import InfoExtractor
-from ..utils import ExtractorError
+from ..utils import (
+ clean_html,
+ ExtractorError,
+)
class RTLnowIE(InfoExtractor):
"""Information Extractor for RTL NOW, RTL2 NOW, SUPER RTL NOW and VOX NOW"""
class RTLnowIE(InfoExtractor):
"""Information Extractor for RTL NOW, RTL2 NOW, SUPER RTL NOW and VOX NOW"""
@@
-18,6
+21,7
@@
class RTLnowIE(InfoExtractor):
u'params': {
u'skip_download': True,
},
u'params': {
u'skip_download': True,
},
+ u'skip': u'Only works from Germany',
},
{
u'url': u'http://rtl2now.rtl2.de/aerger-im-revier/episode-15-teil-1.php?film_id=69756&player=1&season=2&index=5',
},
{
u'url': u'http://rtl2now.rtl2.de/aerger-im-revier/episode-15-teil-1.php?film_id=69756&player=1&season=2&index=5',
@@
-31,6
+35,7
@@
class RTLnowIE(InfoExtractor):
u'params': {
u'skip_download': True,
},
u'params': {
u'skip_download': True,
},
+ u'skip': u'Only works from Germany',
},
{
u'url': u'www.voxnow.de/voxtours/suedafrika-reporter-ii.php?film_id=13883&player=1&season=17',
},
{
u'url': u'www.voxnow.de/voxtours/suedafrika-reporter-ii.php?film_id=13883&player=1&season=17',
@@
-66,6
+71,14
@@
class RTLnowIE(InfoExtractor):
video_id = mobj.group(u'video_id')
webpage = self._download_webpage(webpage_url, video_id)
video_id = mobj.group(u'video_id')
webpage = self._download_webpage(webpage_url, video_id)
+
+ note_m = re.search(r'''(?sx)
+ <div[ ]style="margin-left:[ ]20px;[ ]font-size:[ ]13px;">(.*?)
+ <div[ ]id="playerteaser">''', webpage)
+ if note_m:
+ msg = clean_html(note_m.group(1))
+ raise ExtractorError(msg)
+
video_title = self._html_search_regex(r'<title>(?P<title>[^<]+)</title>',
webpage, u'title')
playerdata_url = self._html_search_regex(r'\'playerdata\': \'(?P<playerdata_url>[^\']+)\'',
video_title = self._html_search_regex(r'<title>(?P<title>[^<]+)</title>',
webpage, u'title')
playerdata_url = self._html_search_regex(r'\'playerdata\': \'(?P<playerdata_url>[^\']+)\'',