summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJaime Marquínez Ferrándiz <[email protected]>2013-08-22 13:19:35 +0200
committerJaime Marquínez Ferrándiz <[email protected]>2013-08-22 13:19:35 +0200
commitf527115b5f89450e2b05c2b88e98a5bdb5b1c2fc (patch)
tree2d629090b21ad74c5d488a1fa18f89eaa5f2caf3
parent75e1b46add074004ae9f7a8638bcc8d849e825f0 (diff)
downloadyoutube-dl-f527115b5f89450e2b05c2b88e98a5bdb5b1c2fc.tar.gz
youtube-dl-f527115b5f89450e2b05c2b88e98a5bdb5b1c2fc.zip
Rename utv.py to unistra.py and extract more info
There are other sites that could be named utv, which would conflict if they are added
-rw-r--r--youtube_dl/extractor/__init__.py2
-rw-r--r--youtube_dl/extractor/unistra.py32
-rw-r--r--youtube_dl/extractor/utv.py22
3 files changed, 33 insertions, 23 deletions
diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py
index 583051169..b4db8f0bf 100644
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@ -75,7 +75,7 @@ from .tudou import TudouIE
from .tumblr import TumblrIE
from .tutv import TutvIE
from .ustream import UstreamIE
-from .utv import UTVIE
+from .unistra import UnistraIE
from .vbox7 import Vbox7IE
from .veoh import VeohIE
from .vevo import VevoIE
diff --git a/youtube_dl/extractor/unistra.py b/youtube_dl/extractor/unistra.py
new file mode 100644
index 000000000..5ba0a9061
--- /dev/null
+++ b/youtube_dl/extractor/unistra.py
@@ -0,0 +1,32 @@
+import re
+
+from .common import InfoExtractor
+
+class UnistraIE(InfoExtractor):
+ _VALID_URL = r'http://utv.unistra.fr/(?:index|video).php\?id_video\=(\d+)'
+
+ _TEST = {
+ u'url': u'http://utv.unistra.fr/video.php?id_video=154',
+ u'file': u'154.mp4',
+ u'md5': u'736f605cfdc96724d55bb543ab3ced24',
+ u'info_dict': {
+ u'title': u'M!ss Yella',
+ u'description': u'md5:75e8439a3e2981cd5d4b6db232e8fdfc',
+ },
+ }
+
+ def _real_extract(self, url):
+ id = re.match(self._VALID_URL, url).group(1)
+ webpage = self._download_webpage(url, id)
+ file = re.search(r'file: "(.*?)",', webpage).group(1)
+ title = self._html_search_regex(r'<title>UTV - (.*?)</', webpage, u'title')
+
+ video_url = 'http://vod-flash.u-strasbg.fr:8080/' + file
+
+ return {'id': id,
+ 'title': title,
+ 'ext': 'mp4',
+ 'url': video_url,
+ 'description': self._html_search_regex(r'<meta name="Description" content="(.*?)"', webpage, u'description', flags=re.DOTALL),
+ 'thumbnail': self._search_regex(r'image: "(.*?)"', webpage, u'thumbnail'),
+ }
diff --git a/youtube_dl/extractor/utv.py b/youtube_dl/extractor/utv.py
deleted file mode 100644
index 013e86a60..000000000
--- a/youtube_dl/extractor/utv.py
+++ /dev/null
@@ -1,22 +0,0 @@
-import re
-
-from .common import InfoExtractor
-
-class UTVIE(InfoExtractor):
- _VALID_URL = r'http://utv.unistra.fr/index.php\?id_video\=(\d+)'
-
- def _real_extract(self, url):
- id = re.match(self._VALID_URL, url).group(1)
- webpage = self._download_webpage(url, id)
- url = re.search(r'file: "(.*?)",', webpage).group(1)
- title = re.search(r'/utv/\d+/.*/(.*?).mp4', url).group(1)
-
- video_url = 'http://vod-flash.u-strasbg.fr:8080/' + url
-
- track_info = {'id':id,
- 'title' : title,
- 'ext' : 'mp4',
- 'url' : video_url
- }
-
- return [track_info]