mirrors/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2024-11-16 13:23:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

[bandcamp] fix regexp for JSON matching on bandcamp

Browse source
This commit is contained in:
Gilles Pietri 2020-09-23 23:09:00 +02:00
parent c5764b3f89
commit 9c1f99402f
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
youtube_dl/extractor/bandcamp.py
View file

@ -91,10 +91,11 @@ def _real_extract(self, url):
duration = None duration = None
formats = [] formats = []
track_info = self._parse_json( trackinfo_block = self._search_regex(
self._search_regex( r'trackinfo":\[\s*({.+?})\s*\],"',
r'trackinfo\s*:\s*\[\s*({.+?})\s*\]\s*,\s*?\n', webpage, 'track info', default='{}')
webpage, 'track info', default='{}'), title) quoted_json = trackinfo_block.replace('"', '"')
track_info = self._parse_json(quoted_json, title)
if track_info: if track_info:
file_ = track_info.get('file') file_ = track_info.get('file')
if isinstance(file_, dict): if isinstance(file_, dict):
@ -117,7 +118,7 @@ def _real_extract(self, url):
def extract(key): def extract(key):
return self._search_regex( return self._search_regex(
r'\b%s\s*["\']?\s*:\s*(["\'])(?P<value>(?:(?!\1).)+)\1' % key, r',&quot;%s&quot;:(&quot;)(?P<value>(?:(?!&quot;).)+)&quot;' % key,
webpage, key, default=None, group='value') webpage, key, default=None, group='value')
artist = extract('artist') artist = extract('artist')