commit
						9248cb0549
					
				
					 8 changed files with 157 additions and 35 deletions
				
			
		
							
								
								
									
										9
									
								
								.travis.yml
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										9
									
								
								.travis.yml
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,9 @@
 | 
			
		|||
language: python
 | 
			
		||||
#specify the python version
 | 
			
		||||
python:
 | 
			
		||||
  - "2.6"
 | 
			
		||||
  - "2.7"
 | 
			
		||||
#command to install the setup
 | 
			
		||||
install:
 | 
			
		||||
# command to run tests
 | 
			
		||||
script: nosetests test --nocapture
 | 
			
		||||
							
								
								
									
										5
									
								
								Makefile
									
										
									
									
									
								
							
							
						
						
									
										5
									
								
								Makefile
									
										
									
									
									
								
							| 
						 | 
				
			
			@ -45,3 +45,8 @@ youtube-dl.bash-completion: README.md
 | 
			
		|||
 | 
			
		||||
LATEST_VERSION: youtube_dl/__init__.py
 | 
			
		||||
	python -m youtube_dl --version > LATEST_VERSION
 | 
			
		||||
 | 
			
		||||
test:
 | 
			
		||||
	nosetests2 --nocapture test
 | 
			
		||||
 | 
			
		||||
.PHONY: default compile update update-latest update-readme test clean
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										1
									
								
								test/parameters.json
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								test/parameters.json
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1 @@
 | 
			
		|||
{"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}
 | 
			
		||||
| 
						 | 
				
			
			@ -1,29 +0,0 @@
 | 
			
		|||
# -*- coding: utf-8 -*-
 | 
			
		||||
 | 
			
		||||
# Various small unit tests
 | 
			
		||||
 | 
			
		||||
import os,sys
 | 
			
		||||
sys.path.append(os.path.dirname(os.path.dirname(__file__)))
 | 
			
		||||
 | 
			
		||||
import youtube_dl
 | 
			
		||||
 | 
			
		||||
def test_simplify_title():
 | 
			
		||||
	assert youtube_dl._simplify_title(u'abc') == u'abc'
 | 
			
		||||
	assert youtube_dl._simplify_title(u'abc_d-e') == u'abc_d-e'
 | 
			
		||||
 | 
			
		||||
	assert youtube_dl._simplify_title(u'123') == u'123'
 | 
			
		||||
 | 
			
		||||
	assert u'/' not in youtube_dl._simplify_title(u'abc/de')
 | 
			
		||||
	assert u'abc' in youtube_dl._simplify_title(u'abc/de')
 | 
			
		||||
	assert u'de' in youtube_dl._simplify_title(u'abc/de')
 | 
			
		||||
	assert u'/' not in youtube_dl._simplify_title(u'abc/de///')
 | 
			
		||||
 | 
			
		||||
	assert u'\\' not in youtube_dl._simplify_title(u'abc\\de')
 | 
			
		||||
	assert u'abc' in youtube_dl._simplify_title(u'abc\\de')
 | 
			
		||||
	assert u'de' in youtube_dl._simplify_title(u'abc\\de')
 | 
			
		||||
 | 
			
		||||
	assert youtube_dl._simplify_title(u'ä') == u'ä'
 | 
			
		||||
	assert youtube_dl._simplify_title(u'кириллица') == u'кириллица'
 | 
			
		||||
 | 
			
		||||
	# Strip underlines
 | 
			
		||||
	assert youtube_dl._simplify_title(u'\'a_') == u'a'
 | 
			
		||||
							
								
								
									
										93
									
								
								test/test_download.py
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										93
									
								
								test/test_download.py
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,93 @@
 | 
			
		|||
#!/usr/bin/env python2
 | 
			
		||||
import unittest
 | 
			
		||||
import hashlib
 | 
			
		||||
import os
 | 
			
		||||
import json
 | 
			
		||||
 | 
			
		||||
from youtube_dl.FileDownloader import FileDownloader
 | 
			
		||||
from youtube_dl.InfoExtractors  import YoutubeIE, DailymotionIE
 | 
			
		||||
from youtube_dl.InfoExtractors import  MetacafeIE, BlipTVIE
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class DownloadTest(unittest.TestCase):
 | 
			
		||||
	PARAMETERS_FILE = "test/parameters.json"
 | 
			
		||||
	#calculated with md5sum:
 | 
			
		||||
	#md5sum (GNU coreutils) 8.19
 | 
			
		||||
 | 
			
		||||
	YOUTUBE_SIZE = 1993883
 | 
			
		||||
	YOUTUBE_URL = "http://www.youtube.com/watch?v=BaW_jenozKc"
 | 
			
		||||
	YOUTUBE_FILE = "BaW_jenozKc.mp4"
 | 
			
		||||
 | 
			
		||||
	DAILYMOTION_MD5 = "d363a50e9eb4f22ce90d08d15695bb47"
 | 
			
		||||
	DAILYMOTION_URL = "http://www.dailymotion.com/video/x33vw9_tutoriel-de-youtubeur-dl-des-video_tech"
 | 
			
		||||
	DAILYMOTION_FILE = "x33vw9.mp4"
 | 
			
		||||
 | 
			
		||||
	METACAFE_SIZE = 5754305
 | 
			
		||||
	METACAFE_URL = "http://www.metacafe.com/watch/yt-_aUehQsCQtM/the_electric_company_short_i_pbs_kids_go/"
 | 
			
		||||
	METACAFE_FILE = "_aUehQsCQtM.flv"
 | 
			
		||||
 | 
			
		||||
	BLIP_MD5 = "93c24d2f4e0782af13b8a7606ea97ba7"
 | 
			
		||||
	BLIP_URL = "http://blip.tv/cbr/cbr-exclusive-gotham-city-imposters-bats-vs-jokerz-short-3-5796352"
 | 
			
		||||
	BLIP_FILE = "5779306.m4v"
 | 
			
		||||
 | 
			
		||||
	XVIDEO_MD5 = ""
 | 
			
		||||
	XVIDEO_URL = ""
 | 
			
		||||
	XVIDEO_FILE = ""
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
	def test_youtube(self):
 | 
			
		||||
		#let's download a file from youtube
 | 
			
		||||
		with open(DownloadTest.PARAMETERS_FILE) as f:
 | 
			
		||||
			fd = FileDownloader(json.load(f))
 | 
			
		||||
		fd.add_info_extractor(YoutubeIE())
 | 
			
		||||
		fd.download([DownloadTest.YOUTUBE_URL])
 | 
			
		||||
		self.assertTrue(os.path.exists(DownloadTest.YOUTUBE_FILE))
 | 
			
		||||
		self.assertEqual(os.path.getsize(DownloadTest.YOUTUBE_FILE), DownloadTest.YOUTUBE_SIZE)
 | 
			
		||||
 | 
			
		||||
	def test_dailymotion(self):
 | 
			
		||||
		with open(DownloadTest.PARAMETERS_FILE) as f:
 | 
			
		||||
			fd = FileDownloader(json.load(f))
 | 
			
		||||
		fd.add_info_extractor(DailymotionIE())
 | 
			
		||||
		fd.download([DownloadTest.DAILYMOTION_URL])
 | 
			
		||||
		self.assertTrue(os.path.exists(DownloadTest.DAILYMOTION_FILE))
 | 
			
		||||
		md5_down_file = md5_for_file(DownloadTest.DAILYMOTION_FILE)
 | 
			
		||||
		self.assertEqual(md5_down_file, DownloadTest.DAILYMOTION_MD5)
 | 
			
		||||
 | 
			
		||||
	def test_metacafe(self):
 | 
			
		||||
		#this emulate a skip,to be 2.6 compatible
 | 
			
		||||
		with open(DownloadTest.PARAMETERS_FILE) as f:
 | 
			
		||||
			fd = FileDownloader(json.load(f))
 | 
			
		||||
		fd.add_info_extractor(MetacafeIE())
 | 
			
		||||
		fd.add_info_extractor(YoutubeIE())
 | 
			
		||||
		fd.download([DownloadTest.METACAFE_URL])
 | 
			
		||||
		self.assertTrue(os.path.exists(DownloadTest.METACAFE_FILE))
 | 
			
		||||
		self.assertEqual(os.path.getsize(DownloadTest.METACAFE_FILE), DownloadTest.METACAFE_SIZE)
 | 
			
		||||
 | 
			
		||||
	def test_blip(self):
 | 
			
		||||
		with open(DownloadTest.PARAMETERS_FILE) as f:
 | 
			
		||||
			fd = FileDownloader(json.load(f))
 | 
			
		||||
		fd.add_info_extractor(BlipTVIE())
 | 
			
		||||
		fd.download([DownloadTest.BLIP_URL])
 | 
			
		||||
		self.assertTrue(os.path.exists(DownloadTest.BLIP_FILE))
 | 
			
		||||
		md5_down_file = md5_for_file(DownloadTest.BLIP_FILE)
 | 
			
		||||
		self.assertEqual(md5_down_file, DownloadTest.BLIP_MD5)
 | 
			
		||||
 | 
			
		||||
	def tearDown(self):
 | 
			
		||||
		if os.path.exists(DownloadTest.YOUTUBE_FILE):
 | 
			
		||||
			os.remove(DownloadTest.YOUTUBE_FILE)
 | 
			
		||||
		if os.path.exists(DownloadTest.DAILYMOTION_FILE):
 | 
			
		||||
			os.remove(DownloadTest.DAILYMOTION_FILE)
 | 
			
		||||
		if os.path.exists(DownloadTest.METACAFE_FILE):
 | 
			
		||||
			os.remove(DownloadTest.METACAFE_FILE)
 | 
			
		||||
		if os.path.exists(DownloadTest.BLIP_FILE):
 | 
			
		||||
			os.remove(DownloadTest.BLIP_FILE)
 | 
			
		||||
 | 
			
		||||
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()
 | 
			
		||||
							
								
								
									
										44
									
								
								test/test_utils.py
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										44
									
								
								test/test_utils.py
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,44 @@
 | 
			
		|||
# -*- coding: utf-8 -*-
 | 
			
		||||
 | 
			
		||||
# Various small unit tests
 | 
			
		||||
 | 
			
		||||
import unittest
 | 
			
		||||
 | 
			
		||||
#from youtube_dl.utils import htmlentity_transform
 | 
			
		||||
from youtube_dl.utils import timeconvert
 | 
			
		||||
from youtube_dl.utils import sanitize_filename
 | 
			
		||||
from youtube_dl.utils import unescapeHTML
 | 
			
		||||
from youtube_dl.utils import orderedSet
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class TestUtil(unittest.TestCase):
 | 
			
		||||
	def test_timeconvert(self):
 | 
			
		||||
		self.assertTrue(timeconvert('') is None)
 | 
			
		||||
		self.assertTrue(timeconvert('bougrg') is None)
 | 
			
		||||
 | 
			
		||||
	def test_sanitize_filename(self):
 | 
			
		||||
		self.assertEqual(sanitize_filename(u'abc'), u'abc')
 | 
			
		||||
		self.assertEqual(sanitize_filename(u'abc_d-e'), u'abc_d-e')
 | 
			
		||||
 | 
			
		||||
		self.assertEqual(sanitize_filename(u'123'), u'123')
 | 
			
		||||
 | 
			
		||||
		self.assertEqual(u'abc_de', sanitize_filename(u'abc/de'))
 | 
			
		||||
		self.assertTrue(u'de' in sanitize_filename(u'abc/de'))
 | 
			
		||||
		self.assertFalse(u'/' in sanitize_filename(u'abc/de///'))
 | 
			
		||||
 | 
			
		||||
		self.assertEqual(u'abc_de', sanitize_filename(u'abc\\de'))
 | 
			
		||||
		self.assertEqual(u'abc_de', sanitize_filename(u'abc\\de'))
 | 
			
		||||
		self.assertTrue(u'de' in  sanitize_filename(u'abc\\de'))
 | 
			
		||||
 | 
			
		||||
		self.assertEqual(sanitize_filename(u'ä'), u'ä')
 | 
			
		||||
		self.assertEqual(sanitize_filename(u'кириллица'), u'кириллица')
 | 
			
		||||
 | 
			
		||||
	def test_ordered_set(self):
 | 
			
		||||
		self.assertEqual(orderedSet([1,1,2,3,4,4,5,6,7,3,5]), [1,2,3,4,5,6,7])
 | 
			
		||||
		self.assertEqual(orderedSet([]), [])
 | 
			
		||||
		self.assertEqual(orderedSet([1]), [1])
 | 
			
		||||
		#keep the list ordered
 | 
			
		||||
		self.assertEqual(orderedSet([135,1,1,1]), [135,1])
 | 
			
		||||
 | 
			
		||||
	def test_unescape_html(self):
 | 
			
		||||
		self.assertEqual(unescapeHTML(u"%20;"), u"%20;")
 | 
			
		||||
										
											Binary file not shown.
										
									
								
							| 
						 | 
				
			
			@ -13,7 +13,7 @@ import urllib2
 | 
			
		|||
 | 
			
		||||
if os.name == 'nt':
 | 
			
		||||
	import ctypes
 | 
			
		||||
	
 | 
			
		||||
 | 
			
		||||
from utils import *
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -173,7 +173,6 @@ class FileDownloader(object):
 | 
			
		|||
		if not self.params.get('quiet', False):
 | 
			
		||||
			terminator = [u'\n', u''][skip_eol]
 | 
			
		||||
			output = message + terminator
 | 
			
		||||
 | 
			
		||||
			if 'b' not in self._screen_file.mode or sys.version_info[0] < 3: # Python 2 lies about the mode of sys.stdout/sys.stderr
 | 
			
		||||
				output = output.encode(preferredencoding(), 'ignore')
 | 
			
		||||
			self._screen_file.write(output)
 | 
			
		||||
| 
						 | 
				
			
			@ -357,7 +356,7 @@ class FileDownloader(object):
 | 
			
		|||
				raise MaxDownloadsReached()
 | 
			
		||||
 | 
			
		||||
		filename = self.prepare_filename(info_dict)
 | 
			
		||||
		
 | 
			
		||||
 | 
			
		||||
		# Forced printings
 | 
			
		||||
		if self.params.get('forcetitle', False):
 | 
			
		||||
			print info_dict['title'].encode(preferredencoding(), 'xmlcharrefreplace')
 | 
			
		||||
| 
						 | 
				
			
			@ -399,10 +398,10 @@ class FileDownloader(object):
 | 
			
		|||
			except (OSError, IOError):
 | 
			
		||||
				self.trouble(u'ERROR: Cannot write description file ' + descfn)
 | 
			
		||||
				return
 | 
			
		||||
				
 | 
			
		||||
 | 
			
		||||
		if self.params.get('writesubtitles', False) and 'subtitles' in info_dict and info_dict['subtitles']:
 | 
			
		||||
			# subtitles download errors are already managed as troubles in relevant IE
 | 
			
		||||
			# that way it will silently go on when used with unsupporting IE 
 | 
			
		||||
			# that way it will silently go on when used with unsupporting IE
 | 
			
		||||
			try:
 | 
			
		||||
				srtfn = filename.rsplit('.', 1)[0] + u'.srt'
 | 
			
		||||
				self.report_writesubtitles(srtfn)
 | 
			
		||||
| 
						 | 
				
			
			@ -448,7 +447,7 @@ class FileDownloader(object):
 | 
			
		|||
				except (ContentTooShortError, ), err:
 | 
			
		||||
					self.trouble(u'ERROR: content too short (expected %s bytes and served %s)' % (err.expected, err.downloaded))
 | 
			
		||||
					return
 | 
			
		||||
	
 | 
			
		||||
 | 
			
		||||
			if success:
 | 
			
		||||
				try:
 | 
			
		||||
					self.post_process(filename, info_dict)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue