From 42a494d5e1663c2160ae6f8b31c167d9ed29a643 Mon Sep 17 00:00:00 2001
From: Thor77 <thor77@thor77.org>
Date: Sat, 15 Oct 2016 23:09:44 +0200
Subject: [PATCH 1/9] [jamendo] Add new extractor

---
 youtube_dl/extractor/extractors.py |  1 +
 youtube_dl/extractor/jamendo.py    | 94 ++++++++++++++++++++++++++++++
 2 files changed, 95 insertions(+)
 create mode 100644 youtube_dl/extractor/jamendo.py

diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py
index 11b64eeaa..9de0a900a 100644
--- a/youtube_dl/extractor/extractors.py
+++ b/youtube_dl/extractor/extractors.py
@@ -369,6 +369,7 @@ from .ivi import (
 )
 from .ivideon import IvideonIE
 from .izlesene import IzleseneIE
+from .jamendo import JamendoIE, JamendoAlbumIE
 from .jeuxvideo import JeuxVideoIE
 from .jove import JoveIE
 from .jwplatform import JWPlatformIE
diff --git a/youtube_dl/extractor/jamendo.py b/youtube_dl/extractor/jamendo.py
new file mode 100644
index 000000000..b562903bc
--- /dev/null
+++ b/youtube_dl/extractor/jamendo.py
@@ -0,0 +1,94 @@
+# coding: utf-8
+from __future__ import unicode_literals
+
+import re
+
+from .common import InfoExtractor
+from ..compat import compat_urlparse
+
+
+class JamendoIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?jamendo\.com/track/(?P<id>[0-9]+)/(?P<display_id>[\w-]+)'
+    _TEST = {
+        'url': 'https://www.jamendo.com/track/196219/stories-from-emona-i',
+        'md5': '697564d8b10c60af35edda4fafb3fbfd',
+        'info_dict': {
+            'id': '196219',
+            'display_id': 'stories-from-emona-i',
+            'ext': 'mp3',
+            'title': 'Stories from Emona I',
+            'thumbnail': 're:^https?://.*\.jpg',
+            'url': 'https://mp3d.jamendo.com/download/track/196219/mp32'
+        }
+    }
+
+    def _real_extract(self, url):
+        url_data = self._VALID_URL_RE.match(url)
+        track_id = url_data.group('id')
+        webpage = self._download_webpage(url, track_id)
+
+        thumbnail = self._html_search_regex(r'<meta itemprop="image" content="(.+)">', webpage, 'thumbnail', fatal=False)
+        title = self._html_search_regex('<meta itemprop="name" content="(.+)">', webpage, 'title')
+
+        return {
+            'id': track_id,
+            'display_id': url_data.group('display_id'),
+            'ext': 'mp3',
+            'title': title,
+            'thumbnail': thumbnail,
+            'url': 'https://mp3d.jamendo.com/download/track/%s/mp32' % track_id
+        }
+
+
+class JamendoAlbumIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?jamendo\.com/album/(?P<id>[0-9]+)/(?P<display_id>[\w-]+)'
+    _TEST = {
+        'url': 'https://www.jamendo.com/album/121486/duck-on-cover',
+        'info_dict': {
+            'id': '121486',
+            'title': 'Duck On Cover'
+        },
+        'playlist_mincount': 2,
+        'playlist': [
+            {
+                'url': 'https://mp3d.jamendo.com/download/track/1032333/mp32',
+                'md5': '84a1dfcc15c78943d9f736c0fc60191b',
+                'info_dict': {
+                    'id': '1032333',
+                    'ext': 'mp3',
+                    'title': 'Warmachine'
+                }
+            },
+            {
+                'url': 'https://mp3d.jamendo.com/download/track/1032330/mp32',
+                'md5': '6a3f03c8bc01bc2f6eedef277ecaf310',
+                'info_dict': {
+                    'id': '1032330',
+                    'ext': 'mp3',
+                    'title': 'Without Your Ghost'
+                }
+            }
+        ],
+        'params': {
+            'playlistend': 2
+        }
+    }
+
+    def _real_extract(self, url):
+        url_data = self._VALID_URL_RE.match(url)
+        album_id = url_data.group('id')
+        webpage = self._download_webpage(url, album_id)
+
+        title = self._html_search_regex('<meta itemprop="name" content="(.+)">', webpage, 'title')
+
+        track_paths = re.findall(r'<a href="(.+)" class="link-wrap js-trackrow-albumpage-link" itemprop="url">', webpage)
+        entries = [
+            self.url_result(compat_urlparse.urljoin(url, path), ie=JamendoIE.ie_key())
+            for path in track_paths
+        ]
+        return {
+            '_type': 'playlist',
+            'id': album_id,
+            'title': title,
+            'entries': entries
+        }

From 938163379dead120c05c75949899a29c31d8579c Mon Sep 17 00:00:00 2001
From: Thor77 <thor77@thor77.org>
Date: Sun, 16 Oct 2016 14:58:31 +0200
Subject: [PATCH 2/9] Use _html_search_meta

instead of _html_search_regex
---
 youtube_dl/extractor/jamendo.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/youtube_dl/extractor/jamendo.py b/youtube_dl/extractor/jamendo.py
index b562903bc..f7a3088fc 100644
--- a/youtube_dl/extractor/jamendo.py
+++ b/youtube_dl/extractor/jamendo.py
@@ -27,8 +27,9 @@ class JamendoIE(InfoExtractor):
         track_id = url_data.group('id')
         webpage = self._download_webpage(url, track_id)
 
-        thumbnail = self._html_search_regex(r'<meta itemprop="image" content="(.+)">', webpage, 'thumbnail', fatal=False)
-        title = self._html_search_regex('<meta itemprop="name" content="(.+)">', webpage, 'title')
+        thumbnail = self._html_search_meta(
+            'image', webpage, 'thumbnail', fatal=False)
+        title = self._html_search_meta('name', webpage, 'title')
 
         return {
             'id': track_id,
@@ -79,7 +80,7 @@ class JamendoAlbumIE(InfoExtractor):
         album_id = url_data.group('id')
         webpage = self._download_webpage(url, album_id)
 
-        title = self._html_search_regex('<meta itemprop="name" content="(.+)">', webpage, 'title')
+        title = self._html_search_meta('name', webpage, 'title')
 
         track_paths = re.findall(r'<a href="(.+)" class="link-wrap js-trackrow-albumpage-link" itemprop="url">', webpage)
         entries = [

From a57de1577eb7bf48ee1c886bddc3c609eed85609 Mon Sep 17 00:00:00 2001
From: Thor77 <thor77@thor77.org>
Date: Tue, 18 Oct 2016 13:11:17 +0200
Subject: [PATCH 3/9] Add mp31, ogg and flac-format

---
 youtube_dl/extractor/jamendo.py | 39 +++++++++++++++++++++++++++------
 1 file changed, 32 insertions(+), 7 deletions(-)

diff --git a/youtube_dl/extractor/jamendo.py b/youtube_dl/extractor/jamendo.py
index f7a3088fc..3bcbab41e 100644
--- a/youtube_dl/extractor/jamendo.py
+++ b/youtube_dl/extractor/jamendo.py
@@ -11,14 +11,14 @@ class JamendoIE(InfoExtractor):
     _VALID_URL = r'https?://(?:www\.)?jamendo\.com/track/(?P<id>[0-9]+)/(?P<display_id>[\w-]+)'
     _TEST = {
         'url': 'https://www.jamendo.com/track/196219/stories-from-emona-i',
-        'md5': '697564d8b10c60af35edda4fafb3fbfd',
+        'md5': '6e9e82ed6db98678f171c25a8ed09ffd',
         'info_dict': {
             'id': '196219',
             'display_id': 'stories-from-emona-i',
-            'ext': 'mp3',
+            'ext': 'flac',
             'title': 'Stories from Emona I',
             'thumbnail': 're:^https?://.*\.jpg',
-            'url': 'https://mp3d.jamendo.com/download/track/196219/mp32'
+            'url': 'https://flac.jamendo.com/download/track/196219/flac/'
         }
     }
 
@@ -30,14 +30,39 @@ class JamendoIE(InfoExtractor):
         thumbnail = self._html_search_meta(
             'image', webpage, 'thumbnail', fatal=False)
         title = self._html_search_meta('name', webpage, 'title')
-
+        formats = [
+            {
+                'format_id': 'mp31',
+                'url': 'https://mp3l.jamendo.com/download/track/%s/mp31/'
+                % track_id,
+                'ext': 'mp3'
+            },
+            {
+                'format_id': 'mp32',
+                'url': 'https://mp3d.jamendo.com/download/track/%s/mp32/'
+                % track_id,
+                'ext': 'mp3'
+            },
+            {
+                'format_id': 'ogg',
+                'url': 'https://ogg.jamendo.com/download/track/%s/ogg1/'
+                % track_id,
+                'ext': 'ogg'
+            },
+            {
+                'format_id': 'flac',
+                'url': 'https://flac.jamendo.com/download/track/%s/flac/'
+                % track_id,
+                'ext': 'flac'
+            }
+        ]
+        self._check_formats(formats, video_id=track_id)
         return {
             'id': track_id,
             'display_id': url_data.group('display_id'),
-            'ext': 'mp3',
-            'title': title,
             'thumbnail': thumbnail,
-            'url': 'https://mp3d.jamendo.com/download/track/%s/mp32' % track_id
+            'title': title,
+            'formats': formats
         }
 
 

From dac87a3e02e052cbcd08918e10d1916a74a0c053 Mon Sep 17 00:00:00 2001
From: Thor77 <thor77@thor77.org>
Date: Mon, 24 Oct 2016 17:33:44 +0200
Subject: [PATCH 4/9] Use API- instead of download-urls

---
 youtube_dl/extractor/jamendo.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/youtube_dl/extractor/jamendo.py b/youtube_dl/extractor/jamendo.py
index 3bcbab41e..85568fbe6 100644
--- a/youtube_dl/extractor/jamendo.py
+++ b/youtube_dl/extractor/jamendo.py
@@ -18,7 +18,7 @@ class JamendoIE(InfoExtractor):
             'ext': 'flac',
             'title': 'Stories from Emona I',
             'thumbnail': 're:^https?://.*\.jpg',
-            'url': 'https://flac.jamendo.com/download/track/196219/flac/'
+            'url': 'https://flac.jamendo.com/?trackid=196219&format=flac'
         }
     }
 
@@ -33,25 +33,25 @@ class JamendoIE(InfoExtractor):
         formats = [
             {
                 'format_id': 'mp31',
-                'url': 'https://mp3l.jamendo.com/download/track/%s/mp31/'
+                'url': 'https://mp3l.jamendo.com/?trackid=%s&format=mp31'
                 % track_id,
                 'ext': 'mp3'
             },
             {
                 'format_id': 'mp32',
-                'url': 'https://mp3d.jamendo.com/download/track/%s/mp32/'
+                'url': 'https://mp3d.jamendo.com/?trackid=%s&format=mp32'
                 % track_id,
                 'ext': 'mp3'
             },
             {
                 'format_id': 'ogg',
-                'url': 'https://ogg.jamendo.com/download/track/%s/ogg1/'
+                'url': 'https://ogg.jamendo.com/?trackid=%s&format=ogg1'
                 % track_id,
                 'ext': 'ogg'
             },
             {
                 'format_id': 'flac',
-                'url': 'https://flac.jamendo.com/download/track/%s/flac/'
+                'url': 'https://flac.jamendo.com/?trackid=%s&format=flac'
                 % track_id,
                 'ext': 'flac'
             }
@@ -77,7 +77,7 @@ class JamendoAlbumIE(InfoExtractor):
         'playlist_mincount': 2,
         'playlist': [
             {
-                'url': 'https://mp3d.jamendo.com/download/track/1032333/mp32',
+                'url': 'https://mp3d.jamendo.com/?trackid=1032333&format=mp32',
                 'md5': '84a1dfcc15c78943d9f736c0fc60191b',
                 'info_dict': {
                     'id': '1032333',
@@ -86,7 +86,7 @@ class JamendoAlbumIE(InfoExtractor):
                 }
             },
             {
-                'url': 'https://mp3d.jamendo.com/download/track/1032330/mp32',
+                'url': 'https://mp3d.jamendo.com/?trackid=1032330&format=mp32',
                 'md5': '6a3f03c8bc01bc2f6eedef277ecaf310',
                 'info_dict': {
                     'id': '1032330',

From 7acc21487fde1c0198beec5e42b031b2a92a80b0 Mon Sep 17 00:00:00 2001
From: Thor77 <thor77@thor77.org>
Date: Mon, 24 Oct 2016 17:35:35 +0200
Subject: [PATCH 5/9] Fix JamendoAlbum-test assuming mp3-format

---
 youtube_dl/extractor/jamendo.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/youtube_dl/extractor/jamendo.py b/youtube_dl/extractor/jamendo.py
index 85568fbe6..52c1b939e 100644
--- a/youtube_dl/extractor/jamendo.py
+++ b/youtube_dl/extractor/jamendo.py
@@ -77,20 +77,20 @@ class JamendoAlbumIE(InfoExtractor):
         'playlist_mincount': 2,
         'playlist': [
             {
-                'url': 'https://mp3d.jamendo.com/?trackid=1032333&format=mp32',
-                'md5': '84a1dfcc15c78943d9f736c0fc60191b',
+                'url': 'https://flac.jamendo.com/?trackid=1032333&format=flac',
+                'md5': 'e1a2fcb42bda30dfac990212924149a8',
                 'info_dict': {
                     'id': '1032333',
-                    'ext': 'mp3',
+                    'ext': 'flac',
                     'title': 'Warmachine'
                 }
             },
             {
-                'url': 'https://mp3d.jamendo.com/?trackid=1032330&format=mp32',
-                'md5': '6a3f03c8bc01bc2f6eedef277ecaf310',
+                'url': 'https://flac.jamendo.com/?trackid=1032330&format=flac',
+                'md5': '1f358d7b2f98edfe90fd55dac0799d50',
                 'info_dict': {
                     'id': '1032330',
-                    'ext': 'mp3',
+                    'ext': 'flac',
                     'title': 'Without Your Ghost'
                 }
             }

From 11a6449f539e3102e229233a54b12b20d2a56e28 Mon Sep 17 00:00:00 2001
From: Thor77 <thor77@thor77.org>
Date: Mon, 24 Oct 2016 17:58:58 +0200
Subject: [PATCH 6/9] Don't test urls

---
 youtube_dl/extractor/jamendo.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/youtube_dl/extractor/jamendo.py b/youtube_dl/extractor/jamendo.py
index 52c1b939e..7b1951b79 100644
--- a/youtube_dl/extractor/jamendo.py
+++ b/youtube_dl/extractor/jamendo.py
@@ -17,8 +17,7 @@ class JamendoIE(InfoExtractor):
             'display_id': 'stories-from-emona-i',
             'ext': 'flac',
             'title': 'Stories from Emona I',
-            'thumbnail': 're:^https?://.*\.jpg',
-            'url': 'https://flac.jamendo.com/?trackid=196219&format=flac'
+            'thumbnail': 're:^https?://.*\.jpg'
         }
     }
 
@@ -77,7 +76,6 @@ class JamendoAlbumIE(InfoExtractor):
         'playlist_mincount': 2,
         'playlist': [
             {
-                'url': 'https://flac.jamendo.com/?trackid=1032333&format=flac',
                 'md5': 'e1a2fcb42bda30dfac990212924149a8',
                 'info_dict': {
                     'id': '1032333',
@@ -86,7 +84,6 @@ class JamendoAlbumIE(InfoExtractor):
                 }
             },
             {
-                'url': 'https://flac.jamendo.com/?trackid=1032330&format=flac',
                 'md5': '1f358d7b2f98edfe90fd55dac0799d50',
                 'info_dict': {
                     'id': '1032330',

From 4a61b0ce1b20ff3e4c6ba1babae8784657fb35f2 Mon Sep 17 00:00:00 2001
From: Thor77 <thor77@thor77.org>
Date: Mon, 24 Oct 2016 18:01:13 +0200
Subject: [PATCH 7/9] Use display_id for console output

---
 youtube_dl/extractor/jamendo.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/youtube_dl/extractor/jamendo.py b/youtube_dl/extractor/jamendo.py
index 7b1951b79..d854503dc 100644
--- a/youtube_dl/extractor/jamendo.py
+++ b/youtube_dl/extractor/jamendo.py
@@ -24,7 +24,8 @@ class JamendoIE(InfoExtractor):
     def _real_extract(self, url):
         url_data = self._VALID_URL_RE.match(url)
         track_id = url_data.group('id')
-        webpage = self._download_webpage(url, track_id)
+        display_id = url_data.group('display_id')
+        webpage = self._download_webpage(url, display_id)
 
         thumbnail = self._html_search_meta(
             'image', webpage, 'thumbnail', fatal=False)
@@ -55,10 +56,10 @@ class JamendoIE(InfoExtractor):
                 'ext': 'flac'
             }
         ]
-        self._check_formats(formats, video_id=track_id)
+        self._check_formats(formats, video_id=display_id)
         return {
             'id': track_id,
-            'display_id': url_data.group('display_id'),
+            'display_id': display_id,
             'thumbnail': thumbnail,
             'title': title,
             'formats': formats
@@ -100,7 +101,7 @@ class JamendoAlbumIE(InfoExtractor):
     def _real_extract(self, url):
         url_data = self._VALID_URL_RE.match(url)
         album_id = url_data.group('id')
-        webpage = self._download_webpage(url, album_id)
+        webpage = self._download_webpage(url, url_data.group('display_id'))
 
         title = self._html_search_meta('name', webpage, 'title')
 

From dc6091a1fa4e823e1c0581fccaf14a618e0baa7d Mon Sep 17 00:00:00 2001
From: Thor77 <thor77@thor77.org>
Date: Mon, 24 Oct 2016 18:13:03 +0200
Subject: [PATCH 8/9] Reduce code-duplication by using namedtuple for
 formatdata

---
 youtube_dl/extractor/jamendo.py | 39 ++++++++++++++-------------------
 1 file changed, 16 insertions(+), 23 deletions(-)

diff --git a/youtube_dl/extractor/jamendo.py b/youtube_dl/extractor/jamendo.py
index d854503dc..0e146df05 100644
--- a/youtube_dl/extractor/jamendo.py
+++ b/youtube_dl/extractor/jamendo.py
@@ -2,9 +2,12 @@
 from __future__ import unicode_literals
 
 import re
+from collections import namedtuple
 
-from .common import InfoExtractor
 from ..compat import compat_urlparse
+from .common import InfoExtractor
+
+FormatData = namedtuple('FormatData', ['format_id', 'sub_domain', 'ext'])
 
 
 class JamendoIE(InfoExtractor):
@@ -30,31 +33,21 @@ class JamendoIE(InfoExtractor):
         thumbnail = self._html_search_meta(
             'image', webpage, 'thumbnail', fatal=False)
         title = self._html_search_meta('name', webpage, 'title')
+
+        url_template = 'https://%s.jamendo.com/?trackid=%s&format=%s&from=app-97dab294'
+        format_data = [
+            FormatData(format_id='mp31', sub_domain='mp3l', ext='mp3'),
+            FormatData(format_id='mp32', sub_domain='mp3d', ext='mp3'),
+            FormatData(format_id='ogg1', sub_domain='ogg', ext='ogg'),
+            FormatData(format_id='flac', sub_domain='flac', ext='flac'),
+        ]
         formats = [
             {
-                'format_id': 'mp31',
-                'url': 'https://mp3l.jamendo.com/?trackid=%s&format=mp31'
-                % track_id,
-                'ext': 'mp3'
-            },
-            {
-                'format_id': 'mp32',
-                'url': 'https://mp3d.jamendo.com/?trackid=%s&format=mp32'
-                % track_id,
-                'ext': 'mp3'
-            },
-            {
-                'format_id': 'ogg',
-                'url': 'https://ogg.jamendo.com/?trackid=%s&format=ogg1'
-                % track_id,
-                'ext': 'ogg'
-            },
-            {
-                'format_id': 'flac',
-                'url': 'https://flac.jamendo.com/?trackid=%s&format=flac'
-                % track_id,
-                'ext': 'flac'
+                'format_id': fd.format_id,
+                'url': url_template % (fd.sub_domain, track_id, fd.format_id),
+                'ext': fd.ext
             }
+            for fd in format_data
         ]
         self._check_formats(formats, video_id=display_id)
         return {

From d92e1efa63c795d2df2b4564a47d01a0124f82d5 Mon Sep 17 00:00:00 2001
From: Thor77 <thor77@thor77.org>
Date: Mon, 24 Oct 2016 18:24:22 +0200
Subject: [PATCH 9/9] Add quality to formats

---
 youtube_dl/extractor/jamendo.py | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/youtube_dl/extractor/jamendo.py b/youtube_dl/extractor/jamendo.py
index 0e146df05..4aacd10f4 100644
--- a/youtube_dl/extractor/jamendo.py
+++ b/youtube_dl/extractor/jamendo.py
@@ -7,7 +7,8 @@ from collections import namedtuple
 from ..compat import compat_urlparse
 from .common import InfoExtractor
 
-FormatData = namedtuple('FormatData', ['format_id', 'sub_domain', 'ext'])
+FormatData = namedtuple('FormatData', [
+    'format_id', 'sub_domain', 'ext', 'quality'])
 
 
 class JamendoIE(InfoExtractor):
@@ -36,16 +37,21 @@ class JamendoIE(InfoExtractor):
 
         url_template = 'https://%s.jamendo.com/?trackid=%s&format=%s&from=app-97dab294'
         format_data = [
-            FormatData(format_id='mp31', sub_domain='mp3l', ext='mp3'),
-            FormatData(format_id='mp32', sub_domain='mp3d', ext='mp3'),
-            FormatData(format_id='ogg1', sub_domain='ogg', ext='ogg'),
-            FormatData(format_id='flac', sub_domain='flac', ext='flac'),
+            FormatData(
+                format_id='mp31', sub_domain='mp3l', ext='mp3', quality=0),
+            FormatData(
+                format_id='mp32', sub_domain='mp3d', ext='mp3', quality=1),
+            FormatData(
+                format_id='ogg1', sub_domain='ogg', ext='ogg', quality=2),
+            FormatData(
+                format_id='flac', sub_domain='flac', ext='flac', quality=3),
         ]
         formats = [
             {
                 'format_id': fd.format_id,
                 'url': url_template % (fd.sub_domain, track_id, fd.format_id),
-                'ext': fd.ext
+                'ext': fd.ext,
+                'quality': fd.quality
             }
             for fd in format_data
         ]