projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8333034
)
[soundgasm] PEP8 and add a display_id (#3155)
author
Philipp Hagemeister
<phihag@phihag.de>
Wed, 25 Jun 2014 21:47:38 +0000
(23:47 +0200)
committer
Philipp Hagemeister
<phihag@phihag.de>
Wed, 25 Jun 2014 21:47:38 +0000
(23:47 +0200)
youtube_dl/extractor/soundgasm.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/soundgasm.py
b/youtube_dl/extractor/soundgasm.py
index b9d4c6a567333642a2ef417432d54e83a2cd171c..a4f8ce6c3c8cce1854e5695783908a7804af0cac 100644
(file)
--- a/
youtube_dl/extractor/soundgasm.py
+++ b/
youtube_dl/extractor/soundgasm.py
@@
-5,6
+5,7
@@
import re
from .common import InfoExtractor
from .common import InfoExtractor
+
class SoundgasmIE(InfoExtractor):
_VALID_URL = r'https?://(?:www\.)?soundgasm\.net/u/(?P<user>[0-9a-zA-Z_\-]+)/(?P<title>[0-9a-zA-Z_\-]+)'
_TEST = {
class SoundgasmIE(InfoExtractor):
_VALID_URL = r'https?://(?:www\.)?soundgasm\.net/u/(?P<user>[0-9a-zA-Z_\-]+)/(?P<title>[0-9a-zA-Z_\-]+)'
_TEST = {
@@
-20,14
+21,19
@@
class SoundgasmIE(InfoExtractor):
def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url)
def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url)
+ display_id = mobj.group('title')
audio_title = mobj.group('user') + '_' + mobj.group('title')
audio_title = mobj.group('user') + '_' + mobj.group('title')
- webpage = self._download_webpage(url, '')
- audio_url = self._html_search_regex(r'(?s)m4a\:\s"([^"]+)"', webpage, 'audio URL')
+ webpage = self._download_webpage(url, display_id)
+ audio_url = self._html_search_regex(
+ r'(?s)m4a\:\s"([^"]+)"', webpage, 'audio URL')
audio_id = re.split('\/|\.', audio_url)[-2]
audio_id = re.split('\/|\.', audio_url)[-2]
- description = self._html_search_regex(r'(?s)<li>Description:\s(.*?)<\/li>', webpage, 'description', fatal=False, flags=re.DOTALL)
+ description = self._html_search_regex(
+ r'(?s)<li>Description:\s(.*?)<\/li>', webpage, 'description',
+ fatal=False)
return {
'id': audio_id,
return {
'id': audio_id,
+ 'display_id': display_id,
'url': audio_url,
'title': audio_title,
'description': description
'url': audio_url,
'title': audio_title,
'description': description