From: Philipp Hagemeister Date: Sat, 22 Feb 2014 16:14:47 +0000 (+0100) Subject: Merge remote-tracking branch 'soult/br' X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=1052d2bfeca49900df67d15886eea31f671cdc8c;hp=7928024f5747eee6435c22df8395da4ed0aef4cd;p=youtube-dl Merge remote-tracking branch 'soult/br' --- diff --git a/devscripts/release.sh b/devscripts/release.sh index 323acf8cf..72e708c7f 100755 --- a/devscripts/release.sh +++ b/devscripts/release.sh @@ -14,9 +14,9 @@ set -e -skip_tests=false -if [ "$1" = '--skip-test' ]; then - skip_tests=true +skip_tests=true +if [ "$1" = '--run-tests' ]; then + skip_tests=false shift fi diff --git a/test/test_download.py b/test/test_download.py index 7587a18aa..ff571c48f 100644 --- a/test/test_download.py +++ b/test/test_download.py @@ -18,6 +18,7 @@ from test.helper import ( import hashlib import io import json +import re import socket import youtube_dl.YoutubeDL @@ -137,12 +138,21 @@ def generator(test_case): with io.open(info_json_fn, encoding='utf-8') as infof: info_dict = json.load(infof) for (info_field, expected) in tc.get('info_dict', {}).items(): - if isinstance(expected, compat_str) and expected.startswith('md5:'): - got = 'md5:' + md5(info_dict.get(info_field)) - else: + if isinstance(expected, compat_str) and expected.startswith('re:'): got = info_dict.get(info_field) - self.assertEqual(expected, got, - u'invalid value for field %s, expected %r, got %r' % (info_field, expected, got)) + match_str = expected[len('re:'):] + match_rex = re.compile(match_str) + + self.assertTrue( + isinstance(got, compat_str) and match_rex.match(got), + u'field %s (value: %r) should match %r' % (info_field, got, match_str)) + else: + if isinstance(expected, compat_str) and expected.startswith('md5:'): + got = 'md5:' + md5(info_dict.get(info_field)) + else: + got = info_dict.get(info_field) + self.assertEqual(expected, got, + u'invalid value for field %s, expected %r, got %r' % (info_field, expected, got)) # If checkable fields are missing from the test case, print the info_dict test_info_dict = dict((key, value if not isinstance(value, compat_str) or len(value) < 250 else 'md5:' + md5(value)) diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py index 989482a9b..3badcc238 100644 --- a/youtube_dl/extractor/__init__.py +++ b/youtube_dl/extractor/__init__.py @@ -187,6 +187,7 @@ from .rutube import ( RutubeMovieIE, RutubePersonIE, ) +from .savefrom import SaveFromIE from .servingsys import ServingSysIE from .sina import SinaIE from .slashdot import SlashdotIE @@ -225,6 +226,7 @@ from .tinypic import TinyPicIE from .toutv import TouTvIE from .traileraddict import TrailerAddictIE from .trilulilu import TriluliluIE +from .trutube import TruTubeIE from .tube8 import Tube8IE from .tudou import TudouIE from .tumblr import TumblrIE diff --git a/youtube_dl/extractor/canalc2.py b/youtube_dl/extractor/canalc2.py index 3d8d7f9d2..c4fefefe4 100644 --- a/youtube_dl/extractor/canalc2.py +++ b/youtube_dl/extractor/canalc2.py @@ -1,4 +1,6 @@ # coding: utf-8 +from __future__ import unicode_literals + import re from .common import InfoExtractor @@ -9,11 +11,12 @@ class Canalc2IE(InfoExtractor): _VALID_URL = r'http://.*?\.canalc2\.tv/video\.asp\?.*?idVideo=(?P\d+)' _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' } } @@ -28,10 +31,11 @@ class Canalc2IE(InfoExtractor): video_url = 'http://vod-flash.u-strasbg.fr:8080/' + file_name title = self._html_search_regex( - r'class="evenement8">(.*?)', webpage, u'title') - - return {'id': video_id, - 'ext': 'mp4', - 'url': video_url, - 'title': title, - } + r'class="evenement8">(.*?)', webpage, 'title') + + return { + 'id': video_id, + 'ext': 'mp4', + 'url': video_url, + 'title': title, + } diff --git a/youtube_dl/extractor/savefrom.py b/youtube_dl/extractor/savefrom.py new file mode 100644 index 000000000..198a08c1c --- /dev/null +++ b/youtube_dl/extractor/savefrom.py @@ -0,0 +1,37 @@ +# coding: utf-8 +from __future__ import unicode_literals + +import os.path +import re + +from .common import InfoExtractor + + +class SaveFromIE(InfoExtractor): + IE_NAME = 'savefrom.net' + _VALID_URL = r'https?://[^.]+\.savefrom\.net/\#url=(?P.*)$' + + _TEST = { + 'url': 'http://en.savefrom.net/#url=http://youtube.com/watch?v=UlVRAPW2WJY&utm_source=youtube.com&utm_medium=short_domains&utm_campaign=ssyoutube.com', + 'info_dict': { + 'id': 'UlVRAPW2WJY', + 'ext': 'mp4', + 'title': 'About Team Radical MMA | MMA Fighting', + 'upload_date': '20120816', + 'uploader': 'Howcast', + 'uploader_id': 'Howcast', + 'description': 'md5:4f0aac94361a12e1ce57d74f85265175', + }, + 'params': { + 'skip_download': True + } + } + + def _real_extract(self, url): + mobj = re.match(self._VALID_URL, url) + video_id = os.path.splitext(url.split('/')[-1])[0] + return { + '_type': 'url', + 'id': video_id, + 'url': mobj.group('url'), + } diff --git a/youtube_dl/extractor/spankwire.py b/youtube_dl/extractor/spankwire.py index 3362b3db8..2007a0013 100644 --- a/youtube_dl/extractor/spankwire.py +++ b/youtube_dl/extractor/spankwire.py @@ -1,6 +1,5 @@ from __future__ import unicode_literals -import os import re from .common import InfoExtractor @@ -8,23 +7,27 @@ from ..utils import ( compat_urllib_parse_urlparse, compat_urllib_request, compat_urllib_parse, + unified_strdate, + str_to_int, + int_or_none, ) -from ..aes import ( - aes_decrypt_text -) +from ..aes import aes_decrypt_text class SpankwireIE(InfoExtractor): - _VALID_URL = r'^(?:https?://)?(?:www\.)?(?Pspankwire\.com/[^/]*/video(?P[0-9]+)/?)' + _VALID_URL = r'https?://(?:www\.)?(?Pspankwire\.com/[^/]*/video(?P[0-9]+)/?)' _TEST = { 'url': 'http://www.spankwire.com/Buckcherry-s-X-Rated-Music-Video-Crazy-Bitch/video103545/', - 'file': '103545.mp4', - 'md5': '1b3f55e345500552dbc252a3e9c1af43', + 'md5': '8bbfde12b101204b39e4b9fe7eb67095', 'info_dict': { - "uploader": "oreusz", - "title": "Buckcherry`s X Rated Music Video Crazy Bitch", - "description": "Crazy Bitch X rated music video.", - "age_limit": 18, + 'id': '103545', + 'ext': 'mp4', + 'title': 'Buckcherry`s X Rated Music Video Crazy Bitch', + 'description': 'Crazy Bitch X rated music video.', + 'uploader': 'oreusz', + 'uploader_id': '124697', + 'upload_date': '20070508', + 'age_limit': 18, } } @@ -37,13 +40,26 @@ class SpankwireIE(InfoExtractor): req.add_header('Cookie', 'age_verified=1') webpage = self._download_webpage(req, video_id) - video_title = self._html_search_regex(r'

([^<]+)', webpage, 'title') - video_uploader = self._html_search_regex( - r'by:\s*]*>(.+?)', webpage, 'uploader', fatal=False) - thumbnail = self._html_search_regex( - r'flashvars\.image_url = "([^"]+)', webpage, 'thumbnail', fatal=False) + title = self._html_search_regex(r'

([^<]+)', webpage, 'title') description = self._html_search_regex( r'([^<]+)<', webpage, 'description', fatal=False) + thumbnail = self._html_search_regex( + r'flashvars\.image_url = "([^"]+)', webpage, 'thumbnail', fatal=False) + + uploader = self._html_search_regex( + r'by:\s*]*>(.+?)', webpage, 'uploader', fatal=False) + uploader_id = self._html_search_regex( + r'by:\s* on (.+?) at \d+:\d+', webpage, 'upload date', fatal=False) + if upload_date: + upload_date = unified_strdate(upload_date) + + view_count = self._html_search_regex( + r'
([^<]+) views
', webpage, 'view count', fatal=False) + if view_count: + view_count = str_to_int(view_count) + comment_count = int_or_none(self._html_search_regex( + r'\s*(\d+) Comments', webpage, 'comment count', fatal=False)) video_urls = list(map(compat_urllib_parse.unquote , re.findall(r'flashvars\.quality_[0-9]{3}p = "([^"]+)', webpage))) if webpage.find('flashvars\.encrypted = "true"') != -1: @@ -53,16 +69,13 @@ class SpankwireIE(InfoExtractor): formats = [] for video_url in video_urls: path = compat_urllib_parse_urlparse(video_url).path - extension = os.path.splitext(path)[1][1:] format = path.split('/')[4].split('_')[:2] resolution, bitrate_str = format format = "-".join(format) - height = int(resolution.rstrip('P')) - tbr = int(bitrate_str.rstrip('K')) - + height = int(resolution.rstrip('Pp')) + tbr = int(bitrate_str.rstrip('Kk')) formats.append({ 'url': video_url, - 'ext': extension, 'resolution': resolution, 'format': format, 'tbr': tbr, @@ -75,10 +88,14 @@ class SpankwireIE(InfoExtractor): return { 'id': video_id, - 'uploader': video_uploader, - 'title': video_title, - 'thumbnail': thumbnail, + 'title': title, 'description': description, + 'thumbnail': thumbnail, + 'uploader': uploader, + 'uploader_id': uploader_id, + 'upload_date': upload_date, + 'view_count': view_count, + 'comment_count': comment_count, 'formats': formats, 'age_limit': age_limit, } diff --git a/youtube_dl/extractor/trutube.py b/youtube_dl/extractor/trutube.py new file mode 100644 index 000000000..1166836de --- /dev/null +++ b/youtube_dl/extractor/trutube.py @@ -0,0 +1,47 @@ +from __future__ import unicode_literals + +import re + +from .common import InfoExtractor +from ..utils import ( + ExtractorError, +) + + +class TruTubeIE(InfoExtractor): + _VALID_URL = r'https?://(?:www\.)?trutube\.tv/video/(?P[0-9]+)/.*' + _TEST = { + 'url': 'http://trutube.tv/video/14880/Ramses-II-Proven-To-Be-A-Red-Headed-Caucasoid-', + 'md5': 'c5b6e301b0a2040b074746cbeaa26ca1', + 'info_dict': { + 'id': '14880', + 'ext': 'flv', + 'title': 'Ramses II - Proven To Be A Red Headed Caucasoid', + 'thumbnail': 're:^http:.*\.jpg$', + } + } + + def _real_extract(self, url): + mobj = re.match(self._VALID_URL, url) + video_id = mobj.group('id') + + webpage = self._download_webpage(url, video_id) + video_title = self._og_search_title(webpage).strip() + thumbnail = self._search_regex( + r"var splash_img = '([^']+)';", webpage, 'thumbnail', fatal=False) + + all_formats = re.finditer( + r"var (?P[a-z]+)_video_file\s*=\s*'(?P[^']+)';", webpage) + formats = [{ + 'format_id': m.group('key'), + 'quality': -i, + 'url': m.group('url'), + } for i, m in enumerate(all_formats)] + self._sort_formats(formats) + + return { + 'id': video_id, + 'title': video_title, + 'formats': formats, + 'thumbnail': thumbnail, + } diff --git a/youtube_dl/extractor/worldstarhiphop.py b/youtube_dl/extractor/worldstarhiphop.py index 3237596a3..fc9237a3f 100644 --- a/youtube_dl/extractor/worldstarhiphop.py +++ b/youtube_dl/extractor/worldstarhiphop.py @@ -22,8 +22,8 @@ class WorldStarHipHopIE(InfoExtractor): webpage_src = self._download_webpage(url, video_id) m_vevo_id = re.search(r'videoId=(.*?)&?', - webpage_src) - + webpage_src) + if m_vevo_id is not None: self.to_screen(u'Vevo video detected:') return self.url_result('vevo:%s' % m_vevo_id.group(1), ie='Vevo') diff --git a/youtube_dl/version.py b/youtube_dl/version.py index c2660a316..290d54f05 100644 --- a/youtube_dl/version.py +++ b/youtube_dl/version.py @@ -1,2 +1,2 @@ -__version__ = '2014.02.21' +__version__ = '2014.02.22'