X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fmixcloud.py;h=1831c6749401405c5a39ca60f4347df03bfe3631;hb=9868ea493626a3a81d30d084fd00d22982a0f86a;hp=55cc33a3e4b94014f9d4642eff1d1a3d6dc26d05;hpb=4e40de6e2a62b56044a98828bc2df9b93e3dc665;p=youtube-dl.git
diff --git a/youtube_dl/extractor/mixcloud.py b/youtube_dl/extractor/mixcloud.py
index 55cc33a3e..1831c6749 100644
--- a/youtube_dl/extractor/mixcloud.py
+++ b/youtube_dl/extractor/mixcloud.py
@@ -3,11 +3,13 @@ from __future__ import unicode_literals
import re
from .common import InfoExtractor
-from ..utils import (
+from ..compat import (
compat_urllib_parse,
+)
+from ..utils import (
ExtractorError,
HEADRequest,
- int_or_none,
+ str_to_int,
parse_iso8601,
)
@@ -16,7 +18,7 @@ class MixcloudIE(InfoExtractor):
_VALID_URL = r'^(?:https?://)?(?:www\.)?mixcloud\.com/([^/]+)/([^/]+)'
IE_NAME = 'mixcloud'
- _TEST = {
+ _TESTS = [{
'url': 'http://www.mixcloud.com/dholbach/cryptkeeper/',
'info_dict': {
'id': 'dholbach-cryptkeeper',
@@ -31,7 +33,20 @@ class MixcloudIE(InfoExtractor):
'view_count': int,
'like_count': int,
},
- }
+ }, {
+ 'url': 'http://www.mixcloud.com/gillespeterson/caribou-7-inch-vinyl-mix-chat/',
+ 'info_dict': {
+ 'id': 'gillespeterson-caribou-7-inch-vinyl-mix-chat',
+ 'ext': 'm4a',
+ 'title': 'Electric Relaxation vol. 3',
+ 'description': 'md5:2b8aec6adce69f9d41724647c65875e8',
+ 'uploader': 'Daniel Drumz',
+ 'uploader_id': 'gillespeterson',
+ 'thumbnail': 're:https?://.*\.jpg',
+ 'view_count': int,
+ 'like_count': int,
+ },
+ }]
def _get_url(self, track_id, template_url):
server_count = 30
@@ -58,7 +73,7 @@ class MixcloudIE(InfoExtractor):
webpage = self._download_webpage(url, track_id)
preview_url = self._search_regex(
- r'\s(?:data-preview-url|m-preview)="(.+?)"', webpage, 'preview url')
+ r'\s(?:data-preview-url|m-preview)="([^"]+)"', webpage, 'preview url')
song_url = preview_url.replace('/previews/', '/c/originals/')
template_url = re.sub(r'(stream\d*)', 'stream%d', song_url)
final_song_url = self._get_url(track_id, template_url)
@@ -83,15 +98,17 @@ class MixcloudIE(InfoExtractor):
uploader_id = self._search_regex(
r'\s+"profile": "([^"]+)",', webpage, 'uploader id', fatal=False)
description = self._og_search_description(webpage)
- like_count = int_or_none(self._search_regex(
- r'([0-9]+)<'],
webpage, 'like count', fatal=False))
- view_count = int_or_none(self._search_regex(
- r'([0-9,.]+)'],
webpage, 'play count', fatal=False))
timestamp = parse_iso8601(self._search_regex(
r'