aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl
diff options
context:
space:
mode:
authorJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>2014-07-17 09:27:06 +0200
committerJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>2014-07-17 09:27:06 +0200
commitca14211e93f3800893d5519f370348ba2db84ddc (patch)
tree514dfe9cd919245d1e0c714f3d4b7a30fe9a3204 /youtube_dl
parentb1d65c33695feec76a801b7647fe8077869c25ad (diff)
[adultswim] Simplify (closes #2952)
Diffstat (limited to 'youtube_dl')
-rw-r--r--youtube_dl/extractor/adultswim.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/youtube_dl/extractor/adultswim.py b/youtube_dl/extractor/adultswim.py
index ca1bfbdc2..fdaecdec1 100644
--- a/youtube_dl/extractor/adultswim.py
+++ b/youtube_dl/extractor/adultswim.py
@@ -57,8 +57,6 @@ class AdultSwimIE(InfoExtractor):
]
}
- _available_formats = ['150', '640', '3500']
-
_video_extensions = {
'3500': 'flv',
'640': 'mp4',
@@ -78,7 +76,7 @@ class AdultSwimIE(InfoExtractor):
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')
- 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
idoc = self._download_xml(index_url, title, 'Downloading episode index', 'Unable to download episode index')