dbrun
/
youtube-dl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[adultswim] Simplify (closes #2952)

This commit is contained in:
Jaime Marquínez Ferrándiz 2014-07-17 09:27:06 +02:00
parent b1d65c3369
commit ca14211e93
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
youtube_dl/extractor/adultswim.py
View File

@ -57,8 +57,6 @@ class AdultSwimIE(InfoExtractor):
] ]
} }
_available_formats = ['150', '640', '3500']
_video_extensions = { _video_extensions = {
'3500': 'flv', '3500': 'flv',
'640': 'mp4', '640': 'mp4',
@ -78,7 +76,7 @@ class AdultSwimIE(InfoExtractor):
webpage = self._download_webpage(url, video_path) webpage = self._download_webpage(url, video_path)
episode_id = self._html_search_regex(r'<link rel="video_src" href="http://i\.adultswim\.com/adultswim/adultswimtv/tools/swf/viralplayer.swf\?id=([0-9a-f]+?)"\s*/?\s*>', webpage, 'episode_id') episode_id = self._html_search_regex(r'<link rel="video_src" href="http://i\.adultswim\.com/adultswim/adultswimtv/tools/swf/viralplayer.swf\?id=([0-9a-f]+?)"\s*/?\s*>', webpage, 'episode_id')
title = self._html_search_regex(r'<meta property="og:title" content="\s*(.*?)\s*"\s*/?\s*>', webpage, 'title') title = self._og_search_title(webpage)
index_url = 'http://asfix.adultswim.com/asfix-svc/episodeSearch/getEpisodesByIDs?networkName=AS&ids=%s' % episode_id index_url = 'http://asfix.adultswim.com/asfix-svc/episodeSearch/getEpisodesByIDs?networkName=AS&ids=%s' % episode_id
idoc = self._download_xml(index_url, title, 'Downloading episode index', 'Unable to download episode index') idoc = self._download_xml(index_url, title, 'Downloading episode index', 'Unable to download episode index')