projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[tvland] Extend _VALID_URL (Closes #10812)
[youtube-dl]
/
youtube_dl
/
extractor
/
tbs.py
diff --git
a/youtube_dl/extractor/tbs.py
b/youtube_dl/extractor/tbs.py
index 79b00e37616f671f697ef7f63f7cfc5276f379ba..bf93eb8682e1f7424216ebd08438dbb6a3a9b955 100644
(file)
--- a/
youtube_dl/extractor/tbs.py
+++ b/
youtube_dl/extractor/tbs.py
@@
-4,10
+4,7
@@
from __future__ import unicode_literals
import re
from .turner import TurnerBaseIE
import re
from .turner import TurnerBaseIE
-from ..utils import (
- extract_attributes,
- ExtractorError,
-)
+from ..utils import extract_attributes
class TBSIE(TurnerBaseIE):
class TBSIE(TurnerBaseIE):
@@
-37,10
+34,6
@@
class TBSIE(TurnerBaseIE):
site = domain[:3]
webpage = self._download_webpage(url, display_id)
video_params = extract_attributes(self._search_regex(r'(<[^>]+id="page-video"[^>]*>)', webpage, 'video params'))
site = domain[:3]
webpage = self._download_webpage(url, display_id)
video_params = extract_attributes(self._search_regex(r'(<[^>]+id="page-video"[^>]*>)', webpage, 'video params'))
- if video_params.get('isAuthRequired') == 'true':
- raise ExtractorError(
- 'This video is only available via cable service provider subscription that'
- ' is not currently supported.', expected=True)
query = None
clip_id = video_params.get('clipid')
if clip_id:
query = None
clip_id = video_params.get('clipid')
if clip_id:
@@
-53,7
+46,11
@@
class TBSIE(TurnerBaseIE):
'media_src': 'http://ht.cdn.turner.com/%s/big' % site,
},
'secure': {
'media_src': 'http://ht.cdn.turner.com/%s/big' % site,
},
'secure': {
- 'media_src': 'http://a
pple
-secure.cdn.turner.com/%s/big' % site,
+ 'media_src': 'http://a
ndroidhls
-secure.cdn.turner.com/%s/big' % site,
'tokenizer_src': 'http://www.%s.com/video/processors/services/token_ipadAdobe.do' % domain,
},
'tokenizer_src': 'http://www.%s.com/video/processors/services/token_ipadAdobe.do' % domain,
},
+ }, {
+ 'url': url,
+ 'site_name': site.upper(),
+ 'auth_required': video_params.get('isAuthRequired') != 'false',
})
})