diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2014-08-24 03:20:31 +0200 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2014-08-24 03:20:31 +0200 |
| commit | 1f8b6af77341433603601473d33766005177dacd (patch) | |
| tree | 190b6c1e58d973f8ffb4f69ff3743ddef1f84937 /youtube_dl | |
| parent | 8f9b683eeb01eb60c6cf8373f0429a7f560faa1c (diff) | |
[bip.tv] Allow underscore in lookup ids (Fixes #3573)
Diffstat (limited to 'youtube_dl')
| -rw-r--r-- | youtube_dl/extractor/bliptv.py | 2 | ||||
| -rw-r--r-- | youtube_dl/extractor/generic.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/youtube_dl/extractor/bliptv.py b/youtube_dl/extractor/bliptv.py index 4e80d8293..261ead98f 100644 --- a/youtube_dl/extractor/bliptv.py +++ b/youtube_dl/extractor/bliptv.py @@ -15,7 +15,7 @@ from ..utils import ( class BlipTVIE(SubtitlesInfoExtractor): - _VALID_URL = r'https?://(?:\w+\.)?blip\.tv/(?:(?:.+-|rss/flash/)(?P<id>\d+)|((?:play/|api\.swf#)(?P<lookup_id>[\da-zA-Z+]+)))' + _VALID_URL = r'https?://(?:\w+\.)?blip\.tv/(?:(?:.+-|rss/flash/)(?P<id>\d+)|((?:play/|api\.swf#)(?P<lookup_id>[\da-zA-Z+_TESTS]+)))' _TESTS = [ { diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py index f05ac4d38..8b2d1d033 100644 --- a/youtube_dl/extractor/generic.py +++ b/youtube_dl/extractor/generic.py @@ -640,7 +640,7 @@ class GenericIE(InfoExtractor): mobj = re.search(r'<meta\s[^>]*https?://api\.blip\.tv/\w+/redirect/\w+/(\d+)', webpage) if mobj: return self.url_result('http://blip.tv/a/a-'+mobj.group(1), 'BlipTV') - mobj = re.search(r'<(?:iframe|embed|object)\s[^>]*(https?://(?:\w+\.)?blip\.tv/(?:play/|api\.swf#)[a-zA-Z0-9]+)', webpage) + mobj = re.search(r'<(?:iframe|embed|object)\s[^>]*(https?://(?:\w+\.)?blip\.tv/(?:play/|api\.swf#)[a-zA-Z0-9_]+)', webpage) if mobj: return self.url_result(mobj.group(1), 'BlipTV') |