diff options
| author | Naglis Jonaitis <njonaitis@gmail.com> | 2015-04-30 21:26:55 +0300 | 
|---|---|---|
| committer | Naglis Jonaitis <njonaitis@gmail.com> | 2015-04-30 21:28:08 +0300 | 
| commit | 67fc8ecd53b4ffe5375a741bf0b1282f7a44587d (patch) | |
| tree | 4ef1d70515cd32825f6b2876ce9081e166597549 | |
| parent | df8301fef55f9144f06337c10b8570b6560caa24 (diff) | |
[dreisat] Extend _VALID_URL (Closes #5548)
| -rw-r--r-- | youtube_dl/extractor/dreisat.py | 32 | 
1 files changed, 19 insertions, 13 deletions
diff --git a/youtube_dl/extractor/dreisat.py b/youtube_dl/extractor/dreisat.py index 05bb22ddf..8ac8587be 100644 --- a/youtube_dl/extractor/dreisat.py +++ b/youtube_dl/extractor/dreisat.py @@ -11,19 +11,25 @@ from ..utils import (  class DreiSatIE(InfoExtractor):      IE_NAME = '3sat' -    _VALID_URL = r'(?:http://)?(?:www\.)?3sat\.de/mediathek/(?:index\.php)?\?(?:(?:mode|display)=[^&]+&)*obj=(?P<id>[0-9]+)$' -    _TEST = { -        'url': 'http://www.3sat.de/mediathek/index.php?mode=play&obj=45918', -        'md5': 'be37228896d30a88f315b638900a026e', -        'info_dict': { -            'id': '45918', -            'ext': 'mp4', -            'title': 'Waidmannsheil', -            'description': 'md5:cce00ca1d70e21425e72c86a98a56817', -            'uploader': '3sat', -            'upload_date': '20140913' -        } -    } +    _VALID_URL = r'(?:http://)?(?:www\.)?3sat\.de/mediathek/(?:index\.php|mediathek\.php)?\?(?:(?:mode|display)=[^&]+&)*obj=(?P<id>[0-9]+)$' +    _TESTS = [ +        { +            'url': 'http://www.3sat.de/mediathek/index.php?mode=play&obj=45918', +            'md5': 'be37228896d30a88f315b638900a026e', +            'info_dict': { +                'id': '45918', +                'ext': 'mp4', +                'title': 'Waidmannsheil', +                'description': 'md5:cce00ca1d70e21425e72c86a98a56817', +                'uploader': '3sat', +                'upload_date': '20140913' +            } +        }, +        { +            'url': 'http://www.3sat.de/mediathek/mediathek.php?mode=play&obj=51066', +            'only_matching': True, +        }, +    ]      def _real_extract(self, url):          mobj = re.match(self._VALID_URL, url)  | 
