X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fchannel9.py;h=4f000292b7c4273c40df11252852986df08f5e01;hb=b27295d2ab6e9e720a1ed26477841ddb224848bf;hp=1fce59dbad059cf7690c989dcea48882979e087a;hpb=adc267eebf294e9aa27c8df97307a25cd0adf83f;p=youtube-dl diff --git a/youtube_dl/extractor/channel9.py b/youtube_dl/extractor/channel9.py index 1fce59dba..4f000292b 100644 --- a/youtube_dl/extractor/channel9.py +++ b/youtube_dl/extractor/channel9.py @@ -1,4 +1,3 @@ -# encoding: utf-8 from __future__ import unicode_literals import re @@ -16,14 +15,15 @@ class Channel9IE(InfoExtractor): ''' IE_DESC = 'Channel 9' IE_NAME = 'channel9' - _VALID_URL = r'^https?://(?:www\.)?channel9\.msdn\.com/(?P.+)/?' + _VALID_URL = r'https?://(?:www\.)?channel9\.msdn\.com/(?P.+)/?' _TESTS = [ { 'url': 'http://channel9.msdn.com/Events/TechEd/Australia/2013/KOS002', - 'file': 'Events_TechEd_Australia_2013_KOS002.mp4', 'md5': 'bbd75296ba47916b754e73c3a4bbdf10', 'info_dict': { + 'id': 'Events/TechEd/Australia/2013/KOS002', + 'ext': 'mp4', 'title': 'Developer Kick-Off Session: Stuff We Love', 'description': 'md5:c08d72240b7c87fcecafe2692f80e35f', 'duration': 4576, @@ -36,9 +36,10 @@ class Channel9IE(InfoExtractor): }, { 'url': 'http://channel9.msdn.com/posts/Self-service-BI-with-Power-BI-nuclear-testing', - 'file': 'posts_Self-service-BI-with-Power-BI-nuclear-testing.mp4', 'md5': 'b43ee4529d111bc37ba7ee4f34813e68', 'info_dict': { + 'id': 'posts/Self-service-BI-with-Power-BI-nuclear-testing', + 'ext': 'mp4', 'title': 'Self-service BI with Power BI - nuclear testing', 'description': 'md5:d1e6ecaafa7fb52a2cacdf9599829f5b', 'duration': 1540,