Merge tag 'upstream/2016.06.25'

[youtubedl] / youtube_dl / extractor / audiomack.py

diff --git a/youtube_dl/extractor/audiomack.py b/youtube_dl/extractor/audiomack.py
index 693ba22c6dde0dd1760531108353ab48b1ed0fa1..f3bd4d4447f559a8bd924f7d796a1a9faf24b9d3 100644 (file)
--- a/youtube_dl/extractor/audiomack.py
+++ b/youtube_dl/extractor/audiomack.py
@@ -6,6 +6,7 @@ import time
 
 from .common import InfoExtractor
 from .soundcloud import SoundcloudIE
 
 from .common import InfoExtractor
 from .soundcloud import SoundcloudIE

+from ..compat import compat_str

 from ..utils import (
     ExtractorError,
     url_basename,
 from ..utils import (
     ExtractorError,
     url_basename,


@@ -30,14 +31,14 @@ class AudiomackIE(InfoExtractor):
         # audiomack wrapper around soundcloud song
         {
             'add_ie': ['Soundcloud'],
         # audiomack wrapper around soundcloud song
         {
             'add_ie': ['Soundcloud'],

-            'url': 'http://www.audiomack.com/song/xclusiveszone/take-kare',
+            'url': 'http://www.audiomack.com/song/hip-hop-daily/black-mamba-freestyle',

             'info_dict': {
             'info_dict': {

-                'id': '172419696',
+                'id': '258901379',

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

-                'description': 'md5:1fc3272ed7a635cce5be1568c2822997',
-                'title': 'Young Thug ft Lil Wayne - Take Kare',
-                'uploader': 'Young Thug World',
-                'upload_date': '20141016',
+                'description': 'mamba day freestyle for the legend Kobe Bryant ',
+                'title': 'Black Mamba Freestyle [Prod. By Danny Wolf]',
+                'uploader': 'ILOVEMAKONNEN',
+                'upload_date': '20160414',

             }
         },
     ]
             }
         },
     ]


@@ -56,7 +57,7 @@ class AudiomackIE(InfoExtractor):
 
         # API is inconsistent with errors
         if 'url' not in api_response or not api_response['url'] or 'error' in api_response:
 
         # API is inconsistent with errors
         if 'url' not in api_response or not api_response['url'] or 'error' in api_response:

-            raise ExtractorError('Invalid url %s', url)
+            raise ExtractorError('Invalid url %s' % url)

 
         # Audiomack wraps a lot of soundcloud tracks in their branded wrapper
         # if so, pass the work off to the soundcloud extractor
 
         # Audiomack wraps a lot of soundcloud tracks in their branded wrapper
         # if so, pass the work off to the soundcloud extractor


@@ -136,7 +137,7 @@ class AudiomackAlbumIE(InfoExtractor):
                         result[resultkey] = api_response[apikey]
                 song_id = url_basename(api_response['url']).rpartition('.')[0]
                 result['entries'].append({
                         result[resultkey] = api_response[apikey]
                 song_id = url_basename(api_response['url']).rpartition('.')[0]
                 result['entries'].append({

-                    'id': api_response.get('id', song_id),
+                    'id': compat_str(api_response.get('id', song_id)),

                     'uploader': api_response.get('artist'),
                     'title': api_response.get('title', song_id),
                     'url': api_response['url'],
                     'uploader': api_response.get('artist'),
                     'title': api_response.get('title', song_id),
                     'url': api_response['url'],