diff options
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rwxr-xr-x | test/gentests.py | 32 | ||||
| -rw-r--r-- | test/parameters.json | 41 | ||||
| -rw-r--r-- | test/test_download.py | 158 | ||||
| -rw-r--r-- | test/tests.json | 27 | ||||
| -rw-r--r-- | youtube_dl/FileDownloader.py | 7 | ||||
| -rw-r--r-- | youtube_dl/InfoExtractors.py | 2 | ||||
| -rw-r--r-- | youtube_dl/__init__.py | 2 |
8 files changed, 170 insertions, 101 deletions
diff --git a/.travis.yml b/.travis.yml index c6c758fd5..0aabce6a7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ python: - "2.6" - "2.7" # - "3.3" -script: nosetests test --nocapture +script: nosetests test --verbose notifications: email: - filippo.valsorda@gmail.com diff --git a/test/gentests.py b/test/gentests.py index 9352d6d94..0ea5d9f21 100755 --- a/test/gentests.py +++ b/test/gentests.py @@ -23,13 +23,28 @@ import os import json import unittest import sys +import socket # Allow direct execution import os sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) -from youtube_dl.FileDownloader import FileDownloader +import youtube_dl.FileDownloader import youtube_dl.InfoExtractors +from youtube_dl.utils import * + +# General configuration (from __init__, not very elegant...) +jar = compat_cookiejar.CookieJar() +cookie_processor = compat_urllib_request.HTTPCookieProcessor(jar) +proxy_handler = compat_urllib_request.ProxyHandler() +opener = compat_urllib_request.build_opener(proxy_handler, cookie_processor, YoutubeDLHandler()) +compat_urllib_request.install_opener(opener) +socket.setdefaulttimeout(300) # 5 minutes should be enough (famous last words) + +class FileDownloader(youtube_dl.FileDownloader): + def __init__(self, *args, **kwargs): + youtube_dl.FileDownloader.__init__(self, *args, **kwargs) + self.to_stderr = self.to_screen def _file_md5(fn): with open(fn, 'rb') as f: @@ -76,12 +91,12 @@ def gentests(): with io.open(TEST_FILE, 'w', encoding='utf-8') as testf: testf.write(HEADER) spaces = ' ' * 4 - write = lambda l: testf.write(spaces + l + '\n') + write = lambda l: testf.write(spaces + l + u'\n') for d in defs: name = d['name'] ie = getattr(youtube_dl.InfoExtractors, name + 'IE') - testf.write('\n') + testf.write(u'\n') write('@_skip_unless(youtube_dl.InfoExtractors.' + name + 'IE._WORKING, "IE marked as not _WORKING")') if not d['file']: write('@_skip("No output file specified")') @@ -89,19 +104,20 @@ def gentests(): write('@_skip(' + repr(d['skip']) + ')') write('def test_' + name + '(self):') write(' filename = ' + repr(d['file'])) - write(' fd = FileDownloader(self.parameters)') + write(' params = self.parameters') + for p in d.get('params', {}): + write(' params["' + p + '"] = ' + repr(d['params'][p])) + write(' fd = FileDownloader(params)') write(' fd.add_info_extractor(youtube_dl.InfoExtractors.' + name + 'IE())') for ien in d.get('addIEs', []): write(' fd.add_info_extractor(youtube_dl.InfoExtractors.' + ien + 'IE())') write(' fd.download([' + repr(d['url']) + '])') write(' self.assertTrue(os.path.exists(filename))') - if 'size' in d: - write(' self.assertEqual(os.path.getsize(filename), ' + repr(d['size']) + ')') if 'md5' in d: write(' md5_for_file = _file_md5(filename)') write(' self.assertEqual(md5_for_file, ' + repr(d['md5']) + ')') - testf.write('\n\n') + testf.write(u'\n\n') write('def tearDown(self):') for d in defs: if d['file']: @@ -109,7 +125,7 @@ def gentests(): write(' os.remove(' + repr(d['file']) + ')') else: write(' # No file specified for ' + d['name']) - testf.write('\n') + testf.write(u'\n') testf.write(FOOTER) if __name__ == '__main__': diff --git a/test/parameters.json b/test/parameters.json index cc2b017eb..c2082df10 100644 --- a/test/parameters.json +++ b/test/parameters.json @@ -1 +1,40 @@ -{"username": null, "listformats": null, "skip_download": false, "usenetrc": false, "max_downloads": null, "noprogress": false, "forcethumbnail": false, "forceformat": false, "format_limit": null, "ratelimit": null, "nooverwrites": false, "forceurl": false, "writeinfojson": false, "simulate": false, "playliststart": 1, "continuedl": true, "password": null, "prefer_free_formats": false, "nopart": false, "retries": 10, "updatetime": true, "consoletitle": false, "verbose": true, "forcefilename": false, "ignoreerrors": false, "logtostderr": false, "format": null, "subtitleslang": null, "quiet": false, "outtmpl": "%(id)s.%(ext)s", "rejecttitle": null, "playlistend": -1, "writedescription": false, "forcetitle": false, "forcedescription": false, "writesubtitles": false, "matchtitle": null}
\ No newline at end of file +{ + "consoletitle": false, + "continuedl": true, + "forcedescription": false, + "forcefilename": false, + "forceformat": false, + "forcethumbnail": false, + "forcetitle": false, + "forceurl": false, + "format": null, + "format_limit": null, + "ignoreerrors": false, + "listformats": null, + "logtostderr": false, + "matchtitle": null, + "max_downloads": null, + "nooverwrites": false, + "nopart": false, + "noprogress": false, + "outtmpl": "%(id)s.%(ext)s", + "password": null, + "playlistend": -1, + "playliststart": 1, + "prefer_free_formats": false, + "quiet": false, + "ratelimit": null, + "rejecttitle": null, + "retries": 10, + "simulate": false, + "skip_download": false, + "subtitleslang": null, + "test": true, + "updatetime": true, + "usenetrc": false, + "username": null, + "verbose": true, + "writedescription": false, + "writeinfojson": false, + "writesubtitles": false +}
\ No newline at end of file diff --git a/test/test_download.py b/test/test_download.py index 6926dd04e..f45c500c8 100644 --- a/test/test_download.py +++ b/test/test_download.py @@ -9,13 +9,28 @@ import os import json import unittest import sys +import socket # Allow direct execution import os sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) -from youtube_dl.FileDownloader import FileDownloader +import youtube_dl.FileDownloader import youtube_dl.InfoExtractors +from youtube_dl.utils import * + +# General configuration (from __init__, not very elegant...) +jar = compat_cookiejar.CookieJar() +cookie_processor = compat_urllib_request.HTTPCookieProcessor(jar) +proxy_handler = compat_urllib_request.ProxyHandler() +opener = compat_urllib_request.build_opener(proxy_handler, cookie_processor, YoutubeDLHandler()) +compat_urllib_request.install_opener(opener) +socket.setdefaulttimeout(300) # 5 minutes should be enough (famous last words) + +class FileDownloader(youtube_dl.FileDownloader): + def __init__(self, *args, **kwargs): + youtube_dl.FileDownloader.__init__(self, *args, **kwargs) + self.to_stderr = self.to_screen def _file_md5(fn): with open(fn, 'rb') as f: @@ -48,137 +63,134 @@ class DownloadTest(unittest.TestCase): @_skip_unless(youtube_dl.InfoExtractors.YoutubeIE._WORKING, "IE marked as not _WORKING") def test_Youtube(self): - filename = 'BaW_jenozKc.mp4' - fd = FileDownloader(self.parameters) + filename = u'BaW_jenozKc.mp4' + params = self.parameters + fd = FileDownloader(params) fd.add_info_extractor(youtube_dl.InfoExtractors.YoutubeIE()) - fd.download(['http://www.youtube.com/watch?v=BaW_jenozKc']) + fd.download([u'http://www.youtube.com/watch?v=BaW_jenozKc']) self.assertTrue(os.path.exists(filename)) - self.assertEqual(os.path.getsize(filename), 1993883) @_skip_unless(youtube_dl.InfoExtractors.DailymotionIE._WORKING, "IE marked as not _WORKING") def test_Dailymotion(self): - filename = 'x33vw9.mp4' - fd = FileDownloader(self.parameters) + filename = u'x33vw9.mp4' + params = self.parameters + fd = FileDownloader(params) fd.add_info_extractor(youtube_dl.InfoExtractors.DailymotionIE()) - fd.download(['http://www.dailymotion.com/video/x33vw9_tutoriel-de-youtubeur-dl-des-video_tech']) + fd.download([u'http://www.dailymotion.com/video/x33vw9_tutoriel-de-youtubeur-dl-des-video_tech']) self.assertTrue(os.path.exists(filename)) md5_for_file = _file_md5(filename) - self.assertEqual(md5_for_file, 'd363a50e9eb4f22ce90d08d15695bb47') + self.assertEqual(md5_for_file, u'392c4b85a60a90dc4792da41ce3144eb') @_skip_unless(youtube_dl.InfoExtractors.MetacafeIE._WORKING, "IE marked as not _WORKING") def test_Metacafe(self): - filename = '_aUehQsCQtM.flv' - fd = FileDownloader(self.parameters) + filename = u'_aUehQsCQtM.flv' + params = self.parameters + fd = FileDownloader(params) fd.add_info_extractor(youtube_dl.InfoExtractors.MetacafeIE()) fd.add_info_extractor(youtube_dl.InfoExtractors.YoutubeIE()) - fd.download(['http://www.metacafe.com/watch/yt-_aUehQsCQtM/the_electric_company_short_i_pbs_kids_go/']) + fd.download([u'http://www.metacafe.com/watch/yt-_aUehQsCQtM/the_electric_company_short_i_pbs_kids_go/']) self.assertTrue(os.path.exists(filename)) - self.assertEqual(os.path.getsize(filename), 5754305) @_skip_unless(youtube_dl.InfoExtractors.BlipTVIE._WORKING, "IE marked as not _WORKING") def test_BlipTV(self): - filename = '5779306.m4v' - fd = FileDownloader(self.parameters) + filename = u'5779306.m4v' + params = self.parameters + fd = FileDownloader(params) fd.add_info_extractor(youtube_dl.InfoExtractors.BlipTVIE()) - fd.download(['http://blip.tv/cbr/cbr-exclusive-gotham-city-imposters-bats-vs-jokerz-short-3-5796352']) + fd.download([u'http://blip.tv/cbr/cbr-exclusive-gotham-city-imposters-bats-vs-jokerz-short-3-5796352']) self.assertTrue(os.path.exists(filename)) md5_for_file = _file_md5(filename) - self.assertEqual(md5_for_file, '4962f94441605832eb1008eb820ef47a') + self.assertEqual(md5_for_file, u'b2d849efcf7ee18917e4b4d9ff37cafe') @_skip_unless(youtube_dl.InfoExtractors.XVideosIE._WORKING, "IE marked as not _WORKING") def test_XVideos(self): - filename = '939581.flv' - fd = FileDownloader(self.parameters) + filename = u'939581.flv' + params = self.parameters + fd = FileDownloader(params) fd.add_info_extractor(youtube_dl.InfoExtractors.XVideosIE()) - fd.download(['http://www.xvideos.com/video939581/funny_porns_by_s_-1']) + fd.download([u'http://www.xvideos.com/video939581/funny_porns_by_s_-1']) self.assertTrue(os.path.exists(filename)) md5_for_file = _file_md5(filename) - self.assertEqual(md5_for_file, 'aecab2ea59b7996110a7e409f0c55da3') + self.assertEqual(md5_for_file, u'1d0c835822f0a71a7bf011855db929d0') @_skip_unless(youtube_dl.InfoExtractors.VimeoIE._WORKING, "IE marked as not _WORKING") - @_skip("No output file specified") def test_Vimeo(self): - filename = '' - fd = FileDownloader(self.parameters) + filename = u'14160053.mp4' + params = self.parameters + fd = FileDownloader(params) fd.add_info_extractor(youtube_dl.InfoExtractors.VimeoIE()) - fd.download(['http://vimeo.com/14160053']) + fd.download([u'http://vimeo.com/14160053']) self.assertTrue(os.path.exists(filename)) md5_for_file = _file_md5(filename) - self.assertEqual(md5_for_file, '1ab4dedc01f771cb2a65e91caa801aaf') + self.assertEqual(md5_for_file, u'60540a4ec7cc378ec84b919c0aed5023') @_skip_unless(youtube_dl.InfoExtractors.SoundcloudIE._WORKING, "IE marked as not _WORKING") def test_Soundcloud(self): - filename = '62986583.mp3' - fd = FileDownloader(self.parameters) + filename = u'62986583.mp3' + params = self.parameters + fd = FileDownloader(params) fd.add_info_extractor(youtube_dl.InfoExtractors.SoundcloudIE()) - fd.download(['http://soundcloud.com/ethmusic/lostin-powers-she-so-heavy']) + fd.download([u'http://soundcloud.com/ethmusic/lostin-powers-she-so-heavy']) self.assertTrue(os.path.exists(filename)) md5_for_file = _file_md5(filename) - self.assertEqual(md5_for_file, 'c1b9b9ea8bfd620b96b2628664576e1c') + self.assertEqual(md5_for_file, u'ebef0a451b909710ed1d7787dddbf0d7') @_skip_unless(youtube_dl.InfoExtractors.StanfordOpenClassroomIE._WORKING, "IE marked as not _WORKING") def test_StanfordOpenClassroom(self): - filename = 'PracticalUnix_intro-environment.mp4' - fd = FileDownloader(self.parameters) + filename = u'PracticalUnix_intro-environment.mp4' + params = self.parameters + fd = FileDownloader(params) fd.add_info_extractor(youtube_dl.InfoExtractors.StanfordOpenClassroomIE()) - fd.download(['http://openclassroom.stanford.edu/MainFolder/VideoPage.php?course=PracticalUnix&video=intro-environment&speed=100']) - self.assertTrue(os.path.exists(filename)) - md5_for_file = _file_md5(filename) - self.assertEqual(md5_for_file, '8aac7873a07dcfaed66b1559ab128514') - - @_skip_unless(youtube_dl.InfoExtractors.CollegeHumorIE._WORKING, "IE marked as not _WORKING") - @_skip("No output file specified") - def test_CollegeHumor(self): - filename = '' - fd = FileDownloader(self.parameters) - fd.add_info_extractor(youtube_dl.InfoExtractors.CollegeHumorIE()) - fd.download(['http://www.collegehumor.com/video/6830834/mitt-romney-style-gangnam-style-parody']) + fd.download([u'http://openclassroom.stanford.edu/MainFolder/VideoPage.php?course=PracticalUnix&video=intro-environment&speed=100']) self.assertTrue(os.path.exists(filename)) md5_for_file = _file_md5(filename) - self.assertEqual(md5_for_file, '') + self.assertEqual(md5_for_file, u'544a9468546059d4e80d76265b0443b8') @_skip_unless(youtube_dl.InfoExtractors.XNXXIE._WORKING, "IE marked as not _WORKING") def test_XNXX(self): - filename = '1135332.flv' - fd = FileDownloader(self.parameters) + filename = u'1135332.flv' + params = self.parameters + fd = FileDownloader(params) fd.add_info_extractor(youtube_dl.InfoExtractors.XNXXIE()) - fd.download(['http://video.xnxx.com/video1135332/lida_naked_funny_actress_5_']) + fd.download([u'http://video.xnxx.com/video1135332/lida_naked_funny_actress_5_']) self.assertTrue(os.path.exists(filename)) md5_for_file = _file_md5(filename) - self.assertEqual(md5_for_file, 'c5c67df477eb0d9b058200351448ba4c') + self.assertEqual(md5_for_file, u'0831677e2b4761795f68d417e0b7b445') @_skip_unless(youtube_dl.InfoExtractors.YoukuIE._WORKING, "IE marked as not _WORKING") def test_Youku(self): - filename = 'XNDgyMDQ2NTQw_part00.flv' - fd = FileDownloader(self.parameters) + filename = u'XNDgyMDQ2NTQw_part00.flv' + params = self.parameters + params["test"] = False + fd = FileDownloader(params) fd.add_info_extractor(youtube_dl.InfoExtractors.YoukuIE()) - fd.download(['http://v.youku.com/v_show/id_XNDgyMDQ2NTQw.html']) + fd.download([u'http://v.youku.com/v_show/id_XNDgyMDQ2NTQw.html']) self.assertTrue(os.path.exists(filename)) md5_for_file = _file_md5(filename) - self.assertEqual(md5_for_file, 'ffe3f2e435663dc2d1eea34faeff5b5b') + self.assertEqual(md5_for_file, u'ffe3f2e435663dc2d1eea34faeff5b5b') def tearDown(self): - if os.path.exists('BaW_jenozKc.mp4'): - os.remove('BaW_jenozKc.mp4') - if os.path.exists('x33vw9.mp4'): - os.remove('x33vw9.mp4') - if os.path.exists('_aUehQsCQtM.flv'): - os.remove('_aUehQsCQtM.flv') - if os.path.exists('5779306.m4v'): - os.remove('5779306.m4v') - if os.path.exists('939581.flv'): - os.remove('939581.flv') - # No file specified for Vimeo - if os.path.exists('62986583.mp3'): - os.remove('62986583.mp3') - if os.path.exists('PracticalUnix_intro-environment.mp4'): - os.remove('PracticalUnix_intro-environment.mp4') - # No file specified for CollegeHumor - if os.path.exists('1135332.flv'): - os.remove('1135332.flv') - if os.path.exists('XNDgyMDQ2NTQw_part00.flv'): - os.remove('XNDgyMDQ2NTQw_part00.flv') + if os.path.exists(u'BaW_jenozKc.mp4'): + os.remove(u'BaW_jenozKc.mp4') + if os.path.exists(u'x33vw9.mp4'): + os.remove(u'x33vw9.mp4') + if os.path.exists(u'_aUehQsCQtM.flv'): + os.remove(u'_aUehQsCQtM.flv') + if os.path.exists(u'5779306.m4v'): + os.remove(u'5779306.m4v') + if os.path.exists(u'939581.flv'): + os.remove(u'939581.flv') + if os.path.exists(u'14160053.mp4'): + os.remove(u'14160053.mp4') + if os.path.exists(u'62986583.mp3'): + os.remove(u'62986583.mp3') + if os.path.exists(u'PracticalUnix_intro-environment.mp4'): + os.remove(u'PracticalUnix_intro-environment.mp4') + if os.path.exists(u'1135332.flv'): + os.remove(u'1135332.flv') + if os.path.exists(u'XNDgyMDQ2NTQw_part00.flv'): + os.remove(u'XNDgyMDQ2NTQw_part00.flv') diff --git a/test/tests.json b/test/tests.json index cb29f2053..34992a321 100644 --- a/test/tests.json +++ b/test/tests.json @@ -1,62 +1,54 @@ [ { "name": "Youtube", - "size": 1993883, "url": "http://www.youtube.com/watch?v=BaW_jenozKc", "file": "BaW_jenozKc.mp4" }, { "name": "Dailymotion", - "md5": "d363a50e9eb4f22ce90d08d15695bb47", + "md5": "392c4b85a60a90dc4792da41ce3144eb", "url": "http://www.dailymotion.com/video/x33vw9_tutoriel-de-youtubeur-dl-des-video_tech", "file": "x33vw9.mp4" }, { "name": "Metacafe", - "size": 5754305, "addIEs": ["Youtube"], "url": "http://www.metacafe.com/watch/yt-_aUehQsCQtM/the_electric_company_short_i_pbs_kids_go/", "file": "_aUehQsCQtM.flv" }, { "name": "BlipTV", - "md5": "4962f94441605832eb1008eb820ef47a", + "md5": "b2d849efcf7ee18917e4b4d9ff37cafe", "url": "http://blip.tv/cbr/cbr-exclusive-gotham-city-imposters-bats-vs-jokerz-short-3-5796352", "file": "5779306.m4v" }, { "name": "XVideos", - "md5": "aecab2ea59b7996110a7e409f0c55da3", + "md5": "1d0c835822f0a71a7bf011855db929d0", "url": "http://www.xvideos.com/video939581/funny_porns_by_s_-1", "file": "939581.flv" }, { "name": "Vimeo", - "md5": "1ab4dedc01f771cb2a65e91caa801aaf", + "md5": "60540a4ec7cc378ec84b919c0aed5023", "url": "http://vimeo.com/14160053", - "file": "" + "file": "14160053.mp4" }, { "name": "Soundcloud", - "md5": "c1b9b9ea8bfd620b96b2628664576e1c", + "md5": "ebef0a451b909710ed1d7787dddbf0d7", "url": "http://soundcloud.com/ethmusic/lostin-powers-she-so-heavy", "file": "62986583.mp3" }, { "name": "StanfordOpenClassroom", - "md5": "8aac7873a07dcfaed66b1559ab128514", + "md5": "544a9468546059d4e80d76265b0443b8", "url": "http://openclassroom.stanford.edu/MainFolder/VideoPage.php?course=PracticalUnix&video=intro-environment&speed=100", "file": "PracticalUnix_intro-environment.mp4" }, { - "name": "CollegeHumor", - "md5": "", - "url": "http://www.collegehumor.com/video/6830834/mitt-romney-style-gangnam-style-parody", - "file": "" - }, - { "name": "XNXX", - "md5": "c5c67df477eb0d9b058200351448ba4c", + "md5": "0831677e2b4761795f68d417e0b7b445", "url": "http://video.xnxx.com/video1135332/lida_naked_funny_actress_5_", "file": "1135332.flv" }, @@ -64,6 +56,7 @@ "name": "Youku", "url": "http://v.youku.com/v_show/id_XNDgyMDQ2NTQw.html", "file": "XNDgyMDQ2NTQw_part00.flv", - "md5": "ffe3f2e435663dc2d1eea34faeff5b5b" + "md5": "ffe3f2e435663dc2d1eea34faeff5b5b", + "params": { "test": false } } ] diff --git a/youtube_dl/FileDownloader.py b/youtube_dl/FileDownloader.py index c471cc160..b43acd19b 100644 --- a/youtube_dl/FileDownloader.py +++ b/youtube_dl/FileDownloader.py @@ -10,6 +10,7 @@ import socket import subprocess import sys import time +import traceback if os.name == 'nt': import ctypes @@ -78,6 +79,7 @@ class FileDownloader(object): writeinfojson: Write the video description to a .info.json file writesubtitles: Write the video subtitles to a .srt file subtitleslang: Language of the subtitles to download + test: Download only first bytes to test the downloader. """ params = None @@ -216,6 +218,8 @@ class FileDownloader(object): """ if message is not None: self.to_stderr(message) + if self.params.get('verbose'): + self.to_stderr(u''.join(traceback.format_list(traceback.extract_stack()))) if not self.params.get('ignoreerrors', False): raise DownloadError(message) self._download_retcode = 1 @@ -594,6 +598,9 @@ class FileDownloader(object): basic_request = compat_urllib_request.Request(url, None, headers) request = compat_urllib_request.Request(url, None, headers) + if self.params.get('test', False): + request.add_header('Range','bytes=0-10240') + # Establish possible resume length if os.path.isfile(encodeFilename(tmpfilename)): resume_len = os.path.getsize(encodeFilename(tmpfilename)) diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py index 49976c25b..9cfff153b 100644 --- a/youtube_dl/InfoExtractors.py +++ b/youtube_dl/InfoExtractors.py @@ -1072,8 +1072,8 @@ class VimeoIE(InfoExtractor): self.report_extraction(video_id) # Extract the config JSON - config = webpage.split(' = {config:')[1].split(',assets:')[0] try: + config = webpage.split(' = {config:')[1].split(',assets:')[0] config = json.loads(config) except: self._downloader.trouble(u'ERROR: unable to extract info section') diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py index 8e46dfea9..d7e1a91ad 100644 --- a/youtube_dl/__init__.py +++ b/youtube_dl/__init__.py @@ -229,6 +229,7 @@ def parseOpts(): general.add_option('--list-extractors', action='store_true', dest='list_extractors', help='List all supported extractors and the URLs they would handle', default=False) + general.add_option('--test', action='store_true', dest='test', default=False, help=optparse.SUPPRESS_HELP) selection.add_option('--playlist-start', dest='playliststart', metavar='NUMBER', help='playlist video to start at (default is %default)', default=1) @@ -551,6 +552,7 @@ def _real_main(): 'max_downloads': opts.max_downloads, 'prefer_free_formats': opts.prefer_free_formats, 'verbose': opts.verbose, + 'test': opts.test, }) if opts.verbose: |