Merge remote-tracking branch 'origin/master' into fork_master
New tests - merged with md5 correctionpull/580/head
Filippo Valsorda
12 years ago
commit
8192ebe1f8
@ -1,6 +0,0 @@
|
|||||||
#!/usr/bin/env python
|
|
||||||
|
|
||||||
import youtube_dl
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
|
||||||
youtube_dl.main()
|
|
||||||
@ -0,0 +1,128 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
|
||||||
|
import io # for python 2
|
||||||
|
import json
|
||||||
|
import os
|
||||||
|
import sys
|
||||||
|
import unittest
|
||||||
|
|
||||||
|
# Allow direct execution
|
||||||
|
import os
|
||||||
|
sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
|
||||||
|
|
||||||
|
import youtube_dl.InfoExtractors
|
||||||
|
|
||||||
|
HEADER = u'''#!/usr/bin/env python
|
||||||
|
|
||||||
|
# DO NOT EDIT THIS FILE BY HAND!
|
||||||
|
# It is auto-generated from tests.json and gentests.py.
|
||||||
|
|
||||||
|
import hashlib
|
||||||
|
import io
|
||||||
|
import os
|
||||||
|
import json
|
||||||
|
import unittest
|
||||||
|
import sys
|
||||||
|
|
||||||
|
# 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.InfoExtractors
|
||||||
|
|
||||||
|
def _file_md5(fn):
|
||||||
|
with open(fn, 'rb') as f:
|
||||||
|
return hashlib.md5(f.read()).hexdigest()
|
||||||
|
|
||||||
|
def md5_for_file(filename, block_size=2**20):
|
||||||
|
with open(filename) as f:
|
||||||
|
md5 = hashlib.md5()
|
||||||
|
while True:
|
||||||
|
data = f.read(block_size)
|
||||||
|
if not data:
|
||||||
|
break
|
||||||
|
md5.update(data)
|
||||||
|
return md5.hexdigest()
|
||||||
|
_file_md5 = md5_for_file
|
||||||
|
|
||||||
|
|
||||||
|
try:
|
||||||
|
_skip_unless = unittest.skipUnless
|
||||||
|
except AttributeError: # Python 2.6
|
||||||
|
def _skip_unless(cond, reason='No reason given'):
|
||||||
|
def resfunc(f):
|
||||||
|
def wfunc(*args, **kwargs):
|
||||||
|
if cond:
|
||||||
|
return f(*args, **kwargs)
|
||||||
|
else:
|
||||||
|
print('Skipped test')
|
||||||
|
return
|
||||||
|
return wfunc
|
||||||
|
return resfunc
|
||||||
|
_skip = lambda *args, **kwargs: _skip_unless(False, *args, **kwargs)
|
||||||
|
|
||||||
|
class DownloadTest(unittest.TestCase):
|
||||||
|
PARAMETERS_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)), "parameters.json")
|
||||||
|
|
||||||
|
def setUp(self):
|
||||||
|
# Clear old files
|
||||||
|
self.tearDown()
|
||||||
|
|
||||||
|
with io.open(self.PARAMETERS_FILE, encoding='utf-8') as pf:
|
||||||
|
self.parameters = json.load(pf)
|
||||||
|
'''
|
||||||
|
|
||||||
|
FOOTER = u'''
|
||||||
|
|
||||||
|
if __name__ == '__main__':
|
||||||
|
unittest.main()
|
||||||
|
'''
|
||||||
|
|
||||||
|
DEF_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'tests.json')
|
||||||
|
TEST_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'test_download.py')
|
||||||
|
|
||||||
|
def gentests():
|
||||||
|
with io.open(DEF_FILE, encoding='utf-8') as deff:
|
||||||
|
defs = json.load(deff)
|
||||||
|
with io.open(TEST_FILE, 'w', encoding='utf-8') as testf:
|
||||||
|
testf.write(HEADER)
|
||||||
|
spaces = ' ' * 4
|
||||||
|
write = lambda l: testf.write(spaces + l + '\n')
|
||||||
|
|
||||||
|
for d in defs:
|
||||||
|
name = d['name']
|
||||||
|
ie = getattr(youtube_dl.InfoExtractors, name + 'IE')
|
||||||
|
testf.write('\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")')
|
||||||
|
elif 'skip' in d:
|
||||||
|
write('@_skip(' + repr(d['skip']) + ')')
|
||||||
|
write('def test_' + name + '(self):')
|
||||||
|
write(' filename = ' + repr(d['file']))
|
||||||
|
write(' fd = FileDownloader(self.parameters)')
|
||||||
|
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')
|
||||||
|
write('def tearDown(self):')
|
||||||
|
for d in defs:
|
||||||
|
if d['file']:
|
||||||
|
write(' if os.path.exists(' + repr(d['file']) + '):')
|
||||||
|
write(' os.remove(' + repr(d['file']) + ')')
|
||||||
|
else:
|
||||||
|
write(' # No file specified for ' + d['name'])
|
||||||
|
testf.write('\n')
|
||||||
|
testf.write(FOOTER)
|
||||||
|
|
||||||
|
if __name__ == '__main__':
|
||||||
|
gentests()
|
||||||
@ -0,0 +1,63 @@
|
|||||||
|
[
|
||||||
|
{
|
||||||
|
"name": "Youtube",
|
||||||
|
"size": 1993883,
|
||||||
|
"url": "http://www.youtube.com/watch?v=BaW_jenozKc",
|
||||||
|
"file": "BaW_jenozKc.mp4"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Dailymotion",
|
||||||
|
"md5": "d363a50e9eb4f22ce90d08d15695bb47",
|
||||||
|
"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",
|
||||||
|
"url": "http://blip.tv/cbr/cbr-exclusive-gotham-city-imposters-bats-vs-jokerz-short-3-5796352",
|
||||||
|
"file": "5779306.m4v"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "XVideos",
|
||||||
|
"md5": "aecab2ea59b7996110a7e409f0c55da3",
|
||||||
|
"url": "http://www.xvideos.com/video939581/funny_porns_by_s_-1",
|
||||||
|
"file": "939581.flv"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Vimeo",
|
||||||
|
"md5": "1ab4dedc01f771cb2a65e91caa801aaf",
|
||||||
|
"url": "http://vimeo.com/14160053",
|
||||||
|
"file": ""
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Soundcloud",
|
||||||
|
"md5": "c1b9b9ea8bfd620b96b2628664576e1c",
|
||||||
|
"url": "http://soundcloud.com/ethmusic/lostin-powers-she-so-heavy",
|
||||||
|
"file": "n6FLbx6ZzMiu.mp3"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "StanfordOpenClassroom",
|
||||||
|
"md5": "8aac7873a07dcfaed66b1559ab128514",
|
||||||
|
"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",
|
||||||
|
"url": "http://video.xnxx.com/video1135332/lida_naked_funny_actress_5_",
|
||||||
|
"file": "1135332.flv"
|
||||||
|
}
|
||||||
|
]
|
||||||
Loading…
Reference in New Issue