about summary refs log tree commit diff
path: root/youtube_dl/extractor/soundgasm.py
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2015-02-23 21:27:24 +0600
committerSergey M․ <dstftw@gmail.com>2015-02-23 21:27:24 +0600
commit3cc57f96455ce14cc5c72264a25b8d434174f7dd (patch)
tree6773b0180e1a2565e2f15c1a67f740f784031388 /youtube_dl/extractor/soundgasm.py
parenta65d4e7f1458a681f250d6e2e0190644b50d6793 (diff)
downloadyoutube-dl-3cc57f96455ce14cc5c72264a25b8d434174f7dd.tar.gz
youtube-dl-3cc57f96455ce14cc5c72264a25b8d434174f7dd.tar.xz
youtube-dl-3cc57f96455ce14cc5c72264a25b8d434174f7dd.zip
[soundgasm:profile] Simplify
Diffstat (limited to 'youtube_dl/extractor/soundgasm.py')
-rw-r--r--youtube_dl/extractor/soundgasm.py30
1 files changed, 8 insertions, 22 deletions
diff --git a/youtube_dl/extractor/soundgasm.py b/youtube_dl/extractor/soundgasm.py
index e568ff18c..e11d999f3 100644
--- a/youtube_dl/extractor/soundgasm.py
+++ b/youtube_dl/extractor/soundgasm.py
@@ -41,36 +41,22 @@ class SoundgasmIE(InfoExtractor):
         }
 
 class SoundgasmProfileIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?soundgasm\.net/u/(?P<id>[0-9a-zA-Z_\-]+)/?$'
+    _VALID_URL = r'https?://(?:www\.)?soundgasm\.net/u/(?P<id>[^/]+)'
     _TEST = {
         'url': 'http://soundgasm.net/u/ytdl',
-        'playlist_count': 1,
         'info_dict': {
-            '_type': 'playlist',
             'id': 'ytdl',
-            'title': 'ytdl'
-        }
+        },
+        'playlist_count': 1,
     }
 
     def _real_extract(self, url):
         profile_id = self._match_id(url)
-        webpage = self._download_webpage(url, profile_id)
 
-        ids = re.findall(r'''<a\s+href=".+?/u/%s/([^/]+)">''' % re.escape(profile_id), webpage)
-        ids = [clean_html(id) for id in ids]
-
-        entries = []
-        for id in ids:
-            entries.append({
-                '_type': 'url',
-                'url': ('http://soundgasm.net/u/%s/%s' % (profile_id, id))
-            })
+        webpage = self._download_webpage(url, profile_id)
 
-        info_dict = {
-            '_type': 'playlist',
-            'id': profile_id,
-            'title': profile_id,
-            'entries': entries
-        }
+        entries = [
+            self.url_result(audio_url, 'Soundgasm')
+            for audio_url in re.findall(r'href="([^"]+/u/%s/[^"]+)' % profile_id, webpage)]
 
-        return info_dict;
+        return self.playlist_result(entries, profile_id)