Merge branch 'gilou-bandcamp_update'

This commit is contained in:
Tom-Oliver Heidel 2020-10-07 05:42:48 +02:00
commit 39b7f3ec15

View File

@ -99,7 +99,6 @@ def _real_extract(self, url):
webpage, 'track info', default='{}')
track_info = self._parse_json(trackinfo_block, title)
if track_info:
file_ = track_info.get('file')
if isinstance(file_, dict):
@ -115,7 +114,7 @@ def _real_extract(self, url):
'acodec': ext,
'abr': int_or_none(abr_str),
})
track = track_info.get('title')
track_id = str_or_none(track_info.get('track_id') or track_info.get('id'))
track_number = int_or_none(track_info.get('track_num'))
duration = float_or_none(track_info.get('duration'))
@ -126,6 +125,7 @@ def extract(key):
webpage, key, default=None, group='value')
return data.replace(r'\"', '"').replace('\\\\', '\\') if data else data
track = extract('title')
artist = extract('artist')
album = extract('album_title')
timestamp = unified_timestamp(