projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[gameone] simplify playlist extractor
[youtube-dl]
/
youtube_dl
/
extractor
/
canalc2.py
diff --git
a/youtube_dl/extractor/canalc2.py
b/youtube_dl/extractor/canalc2.py
index 50832217a8ad5fe52b4cfa62731171b6dfaadcd6..c4fefefe43b250c13c3a711cf397e1a3caa046a7 100644
(file)
--- a/
youtube_dl/extractor/canalc2.py
+++ b/
youtube_dl/extractor/canalc2.py
@@
-1,24
+1,29
@@
# coding: utf-8
# coding: utf-8
+from __future__ import unicode_literals
+
import re
from .common import InfoExtractor
class Canalc2IE(InfoExtractor):
import re
from .common import InfoExtractor
class Canalc2IE(InfoExtractor):
-
_
IE_NAME = 'canalc2.tv'
- _VALID_URL = r'http://.*?\.canalc2\.tv/video\.asp\?
idVideo=(\d+)&voir=oui
'
+ IE_NAME = 'canalc2.tv'
+ _VALID_URL = r'http://.*?\.canalc2\.tv/video\.asp\?
.*?idVideo=(?P<id>\d+)
'
_TEST = {
_TEST = {
- u'url': u'http://www.canalc2.tv/video.asp?idVideo=12163&voir=oui',
- u'file': u'12163.mp4',
- u'md5': u'060158428b650f896c542dfbb3d6487f',
- u'info_dict': {
- u'title': u'Terrasses du Numérique'
+ 'url': 'http://www.canalc2.tv/video.asp?idVideo=12163&voir=oui',
+ 'md5': '060158428b650f896c542dfbb3d6487f',
+ 'info_dict': {
+ 'id': '12163',
+ 'ext': 'mp4',
+ 'title': 'Terrasses du Numérique'
}
}
def _real_extract(self, url):
}
}
def _real_extract(self, url):
- video_id = re.match(self._VALID_URL, url).group(1)
+ video_id = re.match(self._VALID_URL, url).group('id')
+ # We need to set the voir field for getting the file name
+ url = 'http://www.canalc2.tv/video.asp?idVideo=%s&voir=oui' % video_id
webpage = self._download_webpage(url, video_id)
file_name = self._search_regex(
r"so\.addVariable\('file','(.*?)'\);",
webpage = self._download_webpage(url, video_id)
file_name = self._search_regex(
r"so\.addVariable\('file','(.*?)'\);",
@@
-26,10
+31,11
@@
class Canalc2IE(InfoExtractor):
video_url = 'http://vod-flash.u-strasbg.fr:8080/' + file_name
title = self._html_search_regex(
video_url = 'http://vod-flash.u-strasbg.fr:8080/' + file_name
title = self._html_search_regex(
- r'class="evenement8">(.*?)</a>', webpage, u'title')
-
- return {'id': video_id,
- 'ext': 'mp4',
- 'url': video_url,
- 'title': title,
- }
+ r'class="evenement8">(.*?)</a>', webpage, 'title')
+
+ return {
+ 'id': video_id,
+ 'ext': 'mp4',
+ 'url': video_url,
+ 'title': title,
+ }