github/gallery-dl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[instagram] fix syntax for Python 3.4

Browse Source 
Python 3.4 doesn't like '**common' in dict literals.
This also makes '_ytdl_index' zero-based.
This commit is contained in:
Mike Fährmann
2019-03-24 11:22:50 +01:00
parent e5f44a5160
commit a9bdd0f153
1 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
gallery_dl/extractor/instagram.py
View File

@@ -57,11 +57,7 @@ class InstagramExtractor(Extractor):
yi = 0 yi = 0
for n in media['edge_sidecar_to_children']['edges']: for n in media['edge_sidecar_to_children']['edges']:
children = n['node'] children = n['node']
ytdl_metadata = {} media_data = {
if children['__typename'] == 'GraphVideo':
yi += 1
ytdl_metadata['_ytdl_index'] = yi
medias.append({
'media_id': children['id'], 'media_id': children['id'],
'shortcode': children['shortcode'], 'shortcode': children['shortcode'],
'typename': children['__typename'], 'typename': children['__typename'],
@@ -70,19 +66,24 @@ class InstagramExtractor(Extractor):
'width': text.parse_int(children['dimensions']['width']), 'width': text.parse_int(children['dimensions']['width']),
'sidecar_media_id': media['id'], 'sidecar_media_id': media['id'],
'sidecar_shortcode': media['shortcode'], 'sidecar_shortcode': media['shortcode'],
**common, }
**ytdl_metadata, if children['__typename'] == 'GraphVideo':
}) media_data["_ytdl_index"] = yi
yi += 1
media_data.update(common)
medias.append(media_data)
else: else:
medias.append({ media_data = {
'media_id': media['id'], 'media_id': media['id'],
'shortcode': media['shortcode'], 'shortcode': media['shortcode'],
'typename': media['__typename'], 'typename': media['__typename'],
'display_url': media['display_url'], 'display_url': media['display_url'],
'height': text.parse_int(media['dimensions']['height']), 'height': text.parse_int(media['dimensions']['height']),
'width': text.parse_int(media['dimensions']['width']), 'width': text.parse_int(media['dimensions']['width']),
**common, }
}) media_data.update(common)
medias.append(media_data)
return medias return medias
@@ -179,6 +180,17 @@ class InstagramImageExtractor(InstagramExtractor):
"width": int, "width": int,
} }
}), }),
# GraphSidecar with 2 embedded GraphVideo objects
("https://www.instagram.com/p/BtOvDOfhvRr/", {
"count": 2,
"url": "e290d4180a58ae50c910d51d3b04d5f5c4622cd7",
"keyword": {
"sidecar_media_id": "1967717017113261163",
"sidecar_shortcode": "BtOvDOfhvRr",
"_ytdl_index": int,
}
})
) )
def __init__(self, match): def __init__(self, match):