Merge tag 'upstream/2015.11.27.1'

[youtubedl] / youtube_dl / extractor / audiomack.py

diff --git a/youtube_dl/extractor/audiomack.py b/youtube_dl/extractor/audiomack.py
index 8bfe502143a2cbf9c076bdabaad3e7ad5d2090b6..693ba22c6dde0dd1760531108353ab48b1ed0fa1 100644 (file)
--- a/youtube_dl/extractor/audiomack.py
+++ b/youtube_dl/extractor/audiomack.py
@@ -88,16 +88,21 @@ class AudiomackAlbumIE(InfoExtractor):
         # Album playlist ripped from fakeshoredrive with no metadata
         {
             'url': 'http://www.audiomack.com/album/fakeshoredrive/ppp-pistol-p-project',
         # Album playlist ripped from fakeshoredrive with no metadata
         {
             'url': 'http://www.audiomack.com/album/fakeshoredrive/ppp-pistol-p-project',

+            'info_dict': {
+                'title': 'PPP (Pistol P Project)',
+                'id': '837572',
+            },

             'playlist': [{
                 'info_dict': {
             'playlist': [{
                 'info_dict': {

-                    'title': '9.-heaven-or-hell-chimaca-ft-zuse-prod-by-dj-fu',
-                    'id': '9.-heaven-or-hell-chimaca-ft-zuse-prod-by-dj-fu',
+                    'title': 'PPP (Pistol P Project) - 9. Heaven or Hell (CHIMACA) ft Zuse (prod by DJ FU)',
+                    'id': '837577',

                     'ext': 'mp3',
                     'ext': 'mp3',

+                    'uploader': 'Lil Herb a.k.a. G Herbo',

                 }
             }],
             'params': {
                 }
             }],
             'params': {

-                'playliststart': 8,
-                'playlistend': 8,
+                'playliststart': 9,
+                'playlistend': 9,

             }
         }
     ]
             }
         }
     ]