aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGilles Pietri <gilles@wolface.fr>2020-09-29 12:09:55 +0200
committerGilles Pietri <gilles@wolface.fr>2020-09-29 12:09:55 +0200
commit03edd545a9e14b0fbcb36574248d8cf0e7a224d6 (patch)
tree8fd9f6099d5965c41c40b64522e3c0191f46b6bb
parent75a83afe3b8fd9dfe242ca2de428c313a2bd3e0e (diff)
downloadhypervideo-pre-03edd545a9e14b0fbcb36574248d8cf0e7a224d6.tar.lz
hypervideo-pre-03edd545a9e14b0fbcb36574248d8cf0e7a224d6.tar.xz
hypervideo-pre-03edd545a9e14b0fbcb36574248d8cf0e7a224d6.zip
[bandcamp] Revert test song title, and extract title generally (which may fail, as the other title json values might come up), instead of out of trackinfo, as bandcamp prefixes it with artist -
-rw-r--r--youtube_dl/extractor/bandcamp.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/youtube_dl/extractor/bandcamp.py b/youtube_dl/extractor/bandcamp.py
index 3405b570a..04b8aa80f 100644
--- a/youtube_dl/extractor/bandcamp.py
+++ b/youtube_dl/extractor/bandcamp.py
@@ -33,7 +33,7 @@ class BandcampIE(InfoExtractor):
'info_dict': {
'id': '1812978515',
'ext': 'mp3',
- 'title': "youtube-dl \"'/\\\u00e4\u21ad - youtube-dl \"'/\\\u00e4\u21ad - youtube-dl test song \"'/\\\u00e4\u21ad",
+ 'title': "youtube-dl \"'/\\\u00e4\u21ad - youtube-dl test song \"'/\\\u00e4\u21ad",
'duration': 9.8485,
'uploader': "youtube-dl \"'/\\\u00e4\u21ad",
'timestamp': 1354224127,
@@ -99,7 +99,6 @@ class BandcampIE(InfoExtractor):
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 @@ class BandcampIE(InfoExtractor):
'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 @@ class BandcampIE(InfoExtractor):
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(