diff options
| author | The Hatsune Daishi <nao20010128@gmail.com> | 2020-11-06 15:15:07 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-06 15:15:07 +0900 |
| commit | 987d2e079ad0fd45df19b6183d38f83bcd528e9d (patch) | |
| tree | 69ae3716260eae4d03691b73a7b298cc6211f37f | |
| parent | adb118da2667522babf2b849a7ad1f5c44b8873b (diff) | |
| download | hypervideo-pre-987d2e079ad0fd45df19b6183d38f83bcd528e9d.tar.lz hypervideo-pre-987d2e079ad0fd45df19b6183d38f83bcd528e9d.tar.xz hypervideo-pre-987d2e079ad0fd45df19b6183d38f83bcd528e9d.zip | |
[instagram] Fix extractor
| -rw-r--r-- | youtube_dlc/extractor/instagram.py | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/youtube_dlc/extractor/instagram.py b/youtube_dlc/extractor/instagram.py index b061850a1..bbfe23c76 100644 --- a/youtube_dlc/extractor/instagram.py +++ b/youtube_dlc/extractor/instagram.py @@ -126,16 +126,23 @@ class InstagramIE(InfoExtractor): uploader_id, like_count, comment_count, comments, height, width) = [None] * 11 - shared_data = self._parse_json( - self._search_regex( - r'window\._sharedData\s*=\s*({.+?});', - webpage, 'shared data', default='{}'), - video_id, fatal=False) + shared_data = try_get(webpage, + (lambda x: self._parse_json( + self._search_regex( + r'window\.__additionalDataLoaded\(\'/(?:p|tv)/(?:[^/?#&]+)/\',({.+?})\);', + x, 'additional data', default='{}'), + video_id, fatal=False), + lambda x: self._parse_json( + self._search_regex( + r'window\._sharedData\s*=\s*({.+?});', + x, 'shared data', default='{}'), + video_id, fatal=False)['entry_data']['PostPage'][0]), + None) if shared_data: media = try_get( shared_data, - (lambda x: x['entry_data']['PostPage'][0]['graphql']['shortcode_media'], - lambda x: x['entry_data']['PostPage'][0]['media']), + (lambda x: x['graphql']['shortcode_media'], + lambda x: x['media']), dict) if media: video_url = media.get('video_url') |