Upstream/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-12-13 20:57:14 +01:00
Code Issues Projects Releases Wiki Activity

[thisoldhouse] Add more fallbacks for video id (closes #13541)

Browse Source
This commit is contained in:
Sergey M․ 2017-07-02 20:04:08 +07:00
parent 99a7e76240
commit 50ae3f646e
No known key found for this signature in database
GPG Key ID: 2C393E0F18A9236D
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
youtube_dl/extractor/thisoldhouse.py
View File

@ -2,6 +2,8 @@
from __future__ import unicode_literals from __future__ import unicode_literals
from .common import InfoExtractor from .common import InfoExtractor
from ..compat import compat_str
from ..utils import try_get
class ThisOldHouseIE(InfoExtractor): class ThisOldHouseIE(InfoExtractor):
@ -28,8 +30,15 @@ class ThisOldHouseIE(InfoExtractor):
def _real_extract(self, url): def _real_extract(self, url):
display_id = self._match_id(url) display_id = self._match_id(url)
webpage = self._download_webpage(url, display_id) webpage = self._download_webpage(url, display_id)
drupal_settings = self._parse_json(self._search_regex( video_id = self._search_regex(
r'jQuery\.extend\(Drupal\.settings\s*,\s*({.+?})\);', (r'data-mid=(["\'])(?P<id>(?:(?!\1).)+)\1',
webpage, 'drupal settings'), display_id) r'id=(["\'])inline-video-player-(?P<id>(?:(?!\1).)+)\1'),
video_id = list(drupal_settings['comScore'])[0] webpage, 'video id', default=None, group='id')
if not video_id:
drupal_settings = self._parse_json(self._search_regex(
r'jQuery\.extend\(Drupal\.settings\s*,\s*({.+?})\);',
webpage, 'drupal settings'), display_id)
video_id = try_get(
drupal_settings, lambda x: x['jwplatform']['video_id'],
compat_str) or list(drupal_settings['comScore'])[0]
return self.url_result('jwplatform:' + video_id, 'JWPlatform', video_id) return self.url_result('jwplatform:' + video_id, 'JWPlatform', video_id)