diff options
| author | Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com> | 2013-07-23 14:27:13 +0200 |
|---|---|---|
| committer | Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com> | 2013-07-23 14:29:29 +0200 |
| commit | 70fa830e4d3ecebd99447319e861cd6b8af9ff72 (patch) | |
| tree | 561a2825e87cbc430b7aea25ac0d01ad41ed0a7a | |
| parent | a7af0ebaf5fd643d42787d55157f2c767bd73404 (diff) | |
| download | youtube-dl-70fa830e4d3ecebd99447319e861cd6b8af9ff72.tar.gz youtube-dl-70fa830e4d3ecebd99447319e861cd6b8af9ff72.tar.xz youtube-dl-70fa830e4d3ecebd99447319e861cd6b8af9ff72.zip | |
CollegeHumorIE: support Youtube videos and embed urls (fixes #1094)
| -rw-r--r-- | youtube_dl/extractor/collegehumor.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/youtube_dl/extractor/collegehumor.py b/youtube_dl/extractor/collegehumor.py index 5ad170d4f..4a0b0af5a 100644 --- a/youtube_dl/extractor/collegehumor.py +++ b/youtube_dl/extractor/collegehumor.py @@ -10,7 +10,7 @@ from ..utils import ( class CollegeHumorIE(InfoExtractor): - _VALID_URL = r'^(?:https?://)?(?:www\.)?collegehumor\.com/video/(?P<videoid>[0-9]+)/(?P<shorttitle>.*)$' + _VALID_URL = r'^(?:https?://)?(?:www\.)?collegehumor\.com/(video|embed)/(?P<videoid>[0-9]+)/(?P<shorttitle>.*)$' _TEST = { u'url': u'http://www.collegehumor.com/video/6902724/comic-con-cosplay-catastrophe', @@ -43,6 +43,9 @@ class CollegeHumorIE(InfoExtractor): mdoc = xml.etree.ElementTree.fromstring(metaXml) try: videoNode = mdoc.findall('./video')[0] + youtubeIdNode = videoNode.find('./youtubeID') + if youtubeIdNode is not None: + return self.url_result(youtubeIdNode.text, 'Youtube') info['description'] = videoNode.findall('./description')[0].text info['title'] = videoNode.findall('./caption')[0].text info['thumbnail'] = videoNode.findall('./thumbnail')[0].text |