diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2013-07-23 18:37:09 +0200 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2013-07-23 18:37:09 +0200 |
| commit | a9c0f9bc63dd2a6a132a21f698da6ccb9050fb31 (patch) | |
| tree | 3bd8a262087b8f9e64af5b6dbf43a98059dd7387 | |
| parent | b7cc9f50268f41656746009b6a6e8f5d5bf1cb7a (diff) | |
| parent | 252580c5610cbeae4a3fb6fbd23ed532d6a273a0 (diff) | |
| download | youtube-dl-a9c0f9bc63dd2a6a132a21f698da6ccb9050fb31.tar.gz youtube-dl-a9c0f9bc63dd2a6a132a21f698da6ccb9050fb31.tar.xz youtube-dl-a9c0f9bc63dd2a6a132a21f698da6ccb9050fb31.zip | |
Merge branch 'master' of github.com:rg3/youtube-dl
| -rw-r--r-- | youtube_dl/extractor/collegehumor.py | 5 | ||||
| -rw-r--r-- | youtube_dl/extractor/tf1.py | 1 | ||||
| -rw-r--r-- | youtube_dl/extractor/wat.py | 1 | ||||
| -rw-r--r-- | youtube_dl/extractor/youtube.py | 2 |
4 files changed, 7 insertions, 2 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 diff --git a/youtube_dl/extractor/tf1.py b/youtube_dl/extractor/tf1.py index e0ffeced5..a8af89f83 100644 --- a/youtube_dl/extractor/tf1.py +++ b/youtube_dl/extractor/tf1.py @@ -10,6 +10,7 @@ class TF1IE(InfoExtractor): TF1 uses the wat.tv player, currently it can only download videos with the html5 player enabled, it cannot download HD videos. """ + _WORKING = False _VALID_URL = r'http://videos.tf1.fr/.*-(.*?).html' _TEST = { u'url': u'http://videos.tf1.fr/auto-moto/citroen-grand-c4-picasso-2013-presentation-officielle-8062060.html', diff --git a/youtube_dl/extractor/wat.py b/youtube_dl/extractor/wat.py index 0d1302cd2..0407a2d26 100644 --- a/youtube_dl/extractor/wat.py +++ b/youtube_dl/extractor/wat.py @@ -12,6 +12,7 @@ from ..utils import ( class WatIE(InfoExtractor): + _WORKING = False _VALID_URL=r'http://www.wat.tv/.*-(?P<shortID>.*?)_.*?.html' IE_NAME = 'wat.tv' _TEST = { diff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py index 0d49c0721..39894ae88 100644 --- a/youtube_dl/extractor/youtube.py +++ b/youtube_dl/extractor/youtube.py @@ -731,7 +731,7 @@ class YoutubeChannelIE(InfoExtractor): _VALID_URL = r"^(?:https?://)?(?:youtu\.be|(?:\w+\.)?youtube(?:-nocookie)?\.com)/channel/([0-9A-Za-z_-]+)" _TEMPLATE_URL = 'http://www.youtube.com/channel/%s/videos?sort=da&flow=list&view=0&page=%s&gl=US&hl=en' _MORE_PAGES_INDICATOR = 'yt-uix-load-more' - _MORE_PAGES_URL = 'http://www.youtube.com/channel_ajax?action_load_more_videos=1&flow=list&paging=%s&view=0&sort=da&channel_id=%s' + _MORE_PAGES_URL = 'http://www.youtube.com/c4_browse_ajax?action_load_more_videos=1&flow=list&paging=%s&view=0&sort=da&channel_id=%s' IE_NAME = u'youtube:channel' def extract_videos_from_page(self, page): |