projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[youtube] Don't confirm age when initializing
[youtube-dl]
/
youtube_dl
/
extractor
/
hotnewhiphop.py
diff --git
a/youtube_dl/extractor/hotnewhiphop.py
b/youtube_dl/extractor/hotnewhiphop.py
index 80b48b1b3605a18fa11547ab890897b6b47ccaa5..651784b73940032fd65c9675043f045b0bcf4ff2 100644
(file)
--- a/
youtube_dl/extractor/hotnewhiphop.py
+++ b/
youtube_dl/extractor/hotnewhiphop.py
@@
-1,12
+1,13
@@
from __future__ import unicode_literals
from __future__ import unicode_literals
-import re
import base64
from .common import InfoExtractor
import base64
from .common import InfoExtractor
-from ..
utils
import (
+from ..
compat
import (
compat_urllib_parse,
compat_urllib_request,
compat_urllib_parse,
compat_urllib_request,
+)
+from ..utils import (
ExtractorError,
HEADRequest,
)
ExtractorError,
HEADRequest,
)
@@
-16,25
+17,24
@@
class HotNewHipHopIE(InfoExtractor):
_VALID_URL = r'http://www\.hotnewhiphop\.com/.*\.(?P<id>.*)\.html'
_TEST = {
'url': 'http://www.hotnewhiphop.com/freddie-gibbs-lay-it-down-song.1435540.html',
_VALID_URL = r'http://www\.hotnewhiphop\.com/.*\.(?P<id>.*)\.html'
_TEST = {
'url': 'http://www.hotnewhiphop.com/freddie-gibbs-lay-it-down-song.1435540.html',
- 'file': '1435540.mp3',
'md5': '2c2cd2f76ef11a9b3b581e8b232f3d96',
'info_dict': {
'md5': '2c2cd2f76ef11a9b3b581e8b232f3d96',
'info_dict': {
+ 'id': '1435540',
+ 'ext': 'mp3',
'title': 'Freddie Gibbs - Lay It Down'
}
}
def _real_extract(self, url):
'title': 'Freddie Gibbs - Lay It Down'
}
}
def _real_extract(self, url):
- m = re.match(self._VALID_URL, url)
- video_id = m.group('id')
-
- webpage_src = self._download_webpage(url, video_id)
+ video_id = self._match_id(url)
+ webpage = self._download_webpage(url, video_id)
video_url_base64 = self._search_regex(
video_url_base64 = self._search_regex(
- r'data-path="(.*?)"', webpage
_src, u'video URL', fatal=Fals
e)
+ r'data-path="(.*?)"', webpage
, 'video URL', default=Non
e)
if video_url_base64 is None:
video_url = self._search_regex(
if video_url_base64 is None:
video_url = self._search_regex(
- r'"contentUrl" content="(.*?)"', webpage
_src, u'video
URL')
+ r'"contentUrl" content="(.*?)"', webpage
, 'content
URL')
return self.url_result(video_url, ie='Youtube')
reqdata = compat_urllib_parse.urlencode([
return self.url_result(video_url, ie='Youtube')
reqdata = compat_urllib_parse.urlencode([
@@
-59,11
+59,11
@@
class HotNewHipHopIE(InfoExtractor):
if video_url.endswith('.html'):
raise ExtractorError('Redirect failed')
if video_url.endswith('.html'):
raise ExtractorError('Redirect failed')
- video_title = self._og_search_title(webpage
_src
).strip()
+ video_title = self._og_search_title(webpage).strip()
return {
'id': video_id,
'url': video_url,
'title': video_title,
return {
'id': video_id,
'url': video_url,
'title': video_title,
- 'thumbnail': self._og_search_thumbnail(webpage
_src
),
+ 'thumbnail': self._og_search_thumbnail(webpage),
}
}