dbrun
/
youtube-dl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

switch long info_dict fields checking to md5

This commit is contained in:
Filippo Valsorda 2013-06-09 15:03:54 +02:00
parent 78d3442b12
commit ee55fcbe12
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/test_download.py
View File

@ -38,8 +38,7 @@ def _try_rm(filename):
if ose.errno != errno.ENOENT: if ose.errno != errno.ENOENT:
raise raise
def crc32(value): md5 = lambda s: hashlib.md5(s.encode('utf-8')).hexdigest()
return '%08x' % (binascii.crc32(value.encode('utf8')) & 0xffffffff)
class FileDownloader(youtube_dl.FileDownloader): class FileDownloader(youtube_dl.FileDownloader):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
@ -127,13 +126,13 @@ def generator(test_case):
with io.open(tc['file'] + '.info.json', encoding='utf-8') as infof: with io.open(tc['file'] + '.info.json', encoding='utf-8') as infof:
info_dict = json.load(infof) info_dict = json.load(infof)
for (info_field, value) in tc.get('info_dict', {}).items(): for (info_field, value) in tc.get('info_dict', {}).items():
if isinstance(value, compat_str) and value.startswith('crc32:'): if isinstance(value, compat_str) and value.startswith('md5:'):
self.assertEqual(value, 'crc32:' + crc32(info_dict.get(info_field))) self.assertEqual(value, 'md5:' + md5(info_dict.get(info_field)))
else: else:
self.assertEqual(value, info_dict.get(info_field)) self.assertEqual(value, info_dict.get(info_field))
# If checkable fields are missing from the test case, print the info_dict # 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 'crc32:' + crc32(value)) test_info_dict = dict((key, value if not isinstance(value, compat_str) or len(value) < 250 else 'md5:' + md5(value))
for key, value in info_dict.items() for key, value in info_dict.items()
if value and key in ('title', 'description', 'uploader', 'upload_date', 'uploader_id', 'location')) if value and key in ('title', 'description', 'uploader', 'upload_date', 'uploader_id', 'location'))
if not all(key in tc.get('info_dict', {}).keys() for key in test_info_dict.keys()): if not all(key in tc.get('info_dict', {}).keys() for key in test_info_dict.keys()):

4
test/tests.json
View File

@ -29,7 +29,7 @@
"info_dict": { "info_dict": {
"upload_date": "20090102", "upload_date": "20090102",
"title": "The Electric Company | \"Short I\" | PBS KIDS GO!", "title": "The Electric Company | \"Short I\" | PBS KIDS GO!",
"description": "crc32:5ef3bc57", "description": "md5:2439a8ef6d5a70e380c22f5ad323e5a8",
"uploader": "PBS", "uploader": "PBS",
"uploader_id": "PBS" "uploader_id": "PBS"
} }
@ -41,7 +41,7 @@
"file": "5779306.m4v", "file": "5779306.m4v",
"info_dict": { "info_dict": {
"upload_date": "20111205", "upload_date": "20111205",
"description": "crc32:fa658d49", "description": "md5:9bc31f227219cde65e47eeec8d2dc596",
"uploader": "Comic Book Resources - CBR TV", "uploader": "Comic Book Resources - CBR TV",
"title": "CBR EXCLUSIVE: \"Gotham City Imposters\" Bats VS Jokerz Short 3" "title": "CBR EXCLUSIVE: \"Gotham City Imposters\" Bats VS Jokerz Short 3"
} }