projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5547014
)
[tbs] fix info extraction(fixes #18403)
author
Remita Amine
<remitamine@gmail.com>
Wed, 5 Dec 2018 06:03:00 +0000
(07:03 +0100)
committer
Remita Amine
<remitamine@gmail.com>
Wed, 5 Dec 2018 06:03:00 +0000
(07:03 +0100)
youtube_dl/extractor/tbs.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/tbs.py
b/youtube_dl/extractor/tbs.py
index 784f8ed6639d9ef2eb4e73e4c5645d309e6bb500..e8a7c65e0552b2904a48d141c6b950dd36cd44a4 100644
(file)
--- a/
youtube_dl/extractor/tbs.py
+++ b/
youtube_dl/extractor/tbs.py
@@
-16,7
+16,7
@@
from ..utils import (
class TBSIE(TurnerBaseIE):
class TBSIE(TurnerBaseIE):
- _VALID_URL = r'https?://(?:www\.)?(?P<site>tbs|tntdrama)\.com
/(?:movies|shows/[^/]+/(?:clips|season-\d+/episode-\d+))/(?P<id>[^/?#]+
)'
+ _VALID_URL = r'https?://(?:www\.)?(?P<site>tbs|tntdrama)\.com
(?P<path>/(?:movies|shows/[^/]+/(?:clips|season-\d+/episode-\d+))/(?P<id>[^/?#]+)
)'
_TESTS = [{
'url': 'http://www.tntdrama.com/shows/the-alienist/clips/monster',
'info_dict': {
_TESTS = [{
'url': 'http://www.tntdrama.com/shows/the-alienist/clips/monster',
'info_dict': {
@@
-40,12
+40,12
@@
class TBSIE(TurnerBaseIE):
}]
def _real_extract(self, url):
}]
def _real_extract(self, url):
- site, display_id = re.match(self._VALID_URL, url).groups()
+ site,
path,
display_id = re.match(self._VALID_URL, url).groups()
webpage = self._download_webpage(url, display_id)
drupal_settings = self._parse_json(self._search_regex(
r'<script[^>]+?data-drupal-selector="drupal-settings-json"[^>]*?>({.+?})</script>',
webpage, 'drupal setting'), display_id)
webpage = self._download_webpage(url, display_id)
drupal_settings = self._parse_json(self._search_regex(
r'<script[^>]+?data-drupal-selector="drupal-settings-json"[^>]*?>({.+?})</script>',
webpage, 'drupal setting'), display_id)
- video_data =
drupal_settings['turner_playlist'][0]
+ video_data =
next(v for v in drupal_settings['turner_playlist'] if v.get('url') == path)
media_id = video_data['mediaID']
title = video_data['title']
media_id = video_data['mediaID']
title = video_data['title']