depau/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-12-23 09:17:48 +00:00
Code Issues Releases Wiki Activity

[mtv] extract mgid extraction and query building into separate methods

Browse source
This commit is contained in:
remitamine 2015-12-31 22:10:00 +01:00
parent b26afec81f
commit c1e90619bd
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
youtube_dl/extractor/mtv.py
View file

@ -167,14 +167,16 @@ class MTVServicesInfoExtractor(InfoExtractor):
'description': description, 'description': description,
} }
def _get_feed_query(self, uri):
data = {'uri': uri}
if self._LANG:
data['lang'] = self._LANG
return compat_urllib_parse.urlencode(data)
def _get_videos_info(self, uri): def _get_videos_info(self, uri):
video_id = self._id_from_uri(uri) video_id = self._id_from_uri(uri)
feed_url = self._get_feed_url(uri) feed_url = self._get_feed_url(uri)
data = compat_urllib_parse.urlencode({'uri': uri}) info_url = feed_url + '?' + self._get_feed_query(uri)
info_url = feed_url + '?'
if self._LANG:
info_url += 'lang=%s&' % self._LANG
info_url += data
return self._get_videos_info_from_url(info_url, video_id) return self._get_videos_info_from_url(info_url, video_id)
def _get_videos_info_from_url(self, url, video_id): def _get_videos_info_from_url(self, url, video_id):
@ -184,9 +186,7 @@ class MTVServicesInfoExtractor(InfoExtractor):
return self.playlist_result( return self.playlist_result(
[self._get_video_info(item) for item in idoc.findall('.//item')]) [self._get_video_info(item) for item in idoc.findall('.//item')])
def _real_extract(self, url): def _extract_mgid(self, webpage):
title = url_basename(url)
webpage = self._download_webpage(url, title)
try: try:
# the url can be http://media.mtvnservices.com/fb/{mgid}.swf # the url can be http://media.mtvnservices.com/fb/{mgid}.swf
# or http://media.mtvnservices.com/{mgid} # or http://media.mtvnservices.com/{mgid}
@ -207,7 +207,12 @@ class MTVServicesInfoExtractor(InfoExtractor):
'sm4:video:embed', webpage, 'sm4 embed', default='') 'sm4:video:embed', webpage, 'sm4 embed', default='')
mgid = self._search_regex( mgid = self._search_regex(
r'embed/(mgid:.+?)["\'&?/]', sm4_embed, 'mgid') r'embed/(mgid:.+?)["\'&?/]', sm4_embed, 'mgid')
return mgid
def _real_extract(self, url):
title = url_basename(url)
webpage = self._download_webpage(url, title)
mgid = self._extract_mgid(webpage)
videos_info = self._get_videos_info(mgid) videos_info = self._get_videos_info(mgid)
return videos_info return videos_info