about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2014-10-29 20:27:58 +0100
committerPhilipp Hagemeister <phihag@phihag.de>2014-10-29 20:27:58 +0100
commitac645ac7d0ce240e17f5e26f525e22e2aa71407a (patch)
tree7a595ec39c041d4ae41632a1a3becbd72ceb60c7
parent7d11297f3f91e6ddd3f0caa5ad4dca1a40d6c820 (diff)
downloadyoutube-dl-ac645ac7d0ce240e17f5e26f525e22e2aa71407a.tar.gz
youtube-dl-ac645ac7d0ce240e17f5e26f525e22e2aa71407a.tar.xz
youtube-dl-ac645ac7d0ce240e17f5e26f525e22e2aa71407a.zip
[generic] Allow soundcloud embeds with additional attributes
-rw-r--r--youtube_dl/extractor/generic.py14
1 files changed, 13 insertions, 1 deletions
diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py
index 47580328a..a27ec342e 100644
--- a/youtube_dl/extractor/generic.py
+++ b/youtube_dl/extractor/generic.py
@@ -405,6 +405,18 @@ class GenericIE(InfoExtractor):
             'expected_warnings': [
                 r'501.*Not Implemented'
             ],
+        },
+        # Soundcloud embed
+        {
+            'url': 'http://nakedsecurity.sophos.com/2014/10/29/sscc-171-are-you-sure-that-1234-is-a-bad-password-podcast/',
+            'info_dict': {
+                'id': '174391317',
+                'ext': 'mp3',
+                'description': 'md5:ff867d6b555488ad3c52572bb33d432c',
+                'uploader': 'Sophos Security',
+                'title': 'Chet Chat 171 - Oct 29, 2014',
+                'upload_date': '20141029',
+            }
         }
     ]
 
@@ -838,7 +850,7 @@ class GenericIE(InfoExtractor):
 
         # Look for embeded soundcloud player
         mobj = re.search(
-            r'<iframe src="(?P<url>https?://(?:w\.)?soundcloud\.com/player[^"]+)"',
+            r'<iframe\s+(?:[a-zA-Z0-9_-]+="[^"]+"\s+)*src="(?P<url>https?://(?:w\.)?soundcloud\.com/player[^"]+)"',
             webpage)
         if mobj is not None:
             url = unescapeHTML(mobj.group('url'))