From 6aadce819b42e2c0daabc7625464994010e40e51 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Fri, 9 Oct 2020 14:41:45 +0000
Subject: patches/youtube-dl: fix bandcamp

---
 .../0008-bandcamp-fix-album-downloading.patch      | 62 ++++++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 overlays/patches/youtube-dl/0008-bandcamp-fix-album-downloading.patch

(limited to 'overlays/patches/youtube-dl/0008-bandcamp-fix-album-downloading.patch')

diff --git a/overlays/patches/youtube-dl/0008-bandcamp-fix-album-downloading.patch b/overlays/patches/youtube-dl/0008-bandcamp-fix-album-downloading.patch
new file mode 100644
index 000000000000..750e4b1ae0a3
--- /dev/null
+++ b/overlays/patches/youtube-dl/0008-bandcamp-fix-album-downloading.patch
@@ -0,0 +1,62 @@
+From 4b2caf8924f404d15d8cdc475912eac3a6e24339 Mon Sep 17 00:00:00 2001
+From: Valentin Berlier <berlier.v@gmail.com>
+Date: Fri, 9 Oct 2020 14:23:21 +0000
+Subject: [PATCH 8/8] [bandcamp] fix album downloading
+
+From
+<https://github.com/ytdl-org/youtube-dl/pull/26684#issuecomment-705253522>,
+with missing json import added.
+---
+ youtube_dl/extractor/bandcamp.py | 27 ++++++++-------------------
+ 1 file changed, 8 insertions(+), 19 deletions(-)
+
+diff --git a/youtube_dl/extractor/bandcamp.py b/youtube_dl/extractor/bandcamp.py
+index 04b8aa80f..3fba35b83 100644
+--- a/youtube_dl/extractor/bandcamp.py
++++ b/youtube_dl/extractor/bandcamp.py
+@@ -1,5 +1,6 @@
+ from __future__ import unicode_literals
+ 
++import json
+ import random
+ import re
+ import time
+@@ -305,28 +306,16 @@ class BandcampAlbumIE(InfoExtractor):
+         album_id = mobj.group('album_id')
+         playlist_id = album_id or uploader_id
+         webpage = self._download_webpage(url, playlist_id)
+-        track_elements = re.findall(
+-            r'(?s)<div[^>]*>(.*?<a[^>]+href="([^"]+?)"[^>]+itemprop="url"[^>]*>.*?)</div>', webpage)
+-        if not track_elements:
+-            raise ExtractorError('The page doesn\'t contain any tracks')
+-        # Only tracks with duration info have songs
++        ld = re.findall(r'<script[^>]+type="application/ld\+json"[^>]*>(.*?)</script>', webpage, re.DOTALL)
++        album = json.loads(ld[0])
+         entries = [
+             self.url_result(
+-                compat_urlparse.urljoin(url, t_path),
++                record['item']['@id'],
+                 ie=BandcampIE.ie_key(),
+-                video_title=self._search_regex(
+-                    r'<span\b[^>]+\bitemprop=["\']name["\'][^>]*>([^<]+)',
+-                    elem_content, 'track title', fatal=False))
+-            for elem_content, t_path in track_elements
+-            if self._html_search_meta('duration', elem_content, default=None)]
+-
+-        title = self._html_search_regex(
+-            r'album_title\s*(?:&quot;|["\']):\s*(&quot;|["\'])(?P<album>(?:\\\1|((?!\1).))+)\1',
+-            webpage, 'title', fatal=False, group='album')
+-
+-        if title:
+-            title = title.replace(r'\"', '"')
+-
++                video_title=record['item']['name'])
++            for record in album['track']['itemListElement']
++        ]
++        title = album['name']
+         return {
+             '_type': 'playlist',
+             'uploader_id': uploader_id,
+-- 
+2.27.0
+
-- 
cgit 1.4.1