depau/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-11-26 12:11:52 +00:00
Code Issues Releases Wiki Activity

accept playlist filename as commandline argument; refractor threading code

Browse source
This commit is contained in:
Ravi 2011-07-12 20:52:57 -04:00
parent 23d09bfa5d
commit 167b0a9025
1 changed files with 30 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
youtube-dl
View file

@ -307,7 +307,6 @@ class FileDownloader(object):
self._num_downloads = 0 self._num_downloads = 0
self._screen_file = [sys.stdout, sys.stderr][params.get('logtostderr', False)] self._screen_file = [sys.stdout, sys.stderr][params.get('logtostderr', False)]
self.params = params self.params = params
self.queue=Queue.Queue
@staticmethod @staticmethod
def pmkdir(filename): def pmkdir(filename):
@ -607,7 +606,6 @@ class FileDownloader(object):
# Extract information from URL and process it # Extract information from URL and process it
ie.extract(url) ie.extract(url)
#parallel downloader needs dummy at the end to signal end of queue #parallel downloader needs dummy at the end to signal end of queue
#for the thread to exit #for the thread to exit
for i in xrange(self.params.get('parallel')): for i in xrange(self.params.get('parallel')):
@ -666,16 +664,12 @@ class FileDownloader(object):
if (self.params.get('playlistfile') != None): if (self.params.get('playlistfile') != None):
self.params.get('playlistfile').write(filename+"\n") self.params.get('playlistfile').write(filename+"\n")
self.params.get('playlistfile').flush() self.params.get('playlistfile').flush()
if self.params.get('parallel') > 0: if self.params.get('parallel') > 0:
downloadqueue.put({'filename':filename,'url':url,'player_url':player_url,'params':self.params}) downloadqueue.put({'filename':filename,'url':url,'player_url':player_url,'params':self.params})
return False return False
else: else:
self._do_real_download(filename, url, player_url) self._do_real_download(filename, url, player_url)
def _do_real_download(self, filename, url, player_url): def _do_real_download(self, filename, url, player_url):
# Check file already present # Check file already present
if self.params.get('continuedl', False) and os.path.isfile(filename) and not self.params.get('nopart', False): if self.params.get('continuedl', False) and os.path.isfile(filename) and not self.params.get('nopart', False):
@ -809,23 +803,16 @@ class FileDownloader(object):
return True return True
class FileDownloadHelper(threading.Thread): def threadedFileDownloader():
"""File Downloader that does threaded download if needed. """File Downloader that does threaded download if needed.
Download parameters are added to downloadqueue in FileDownloader class, Download parameters are added to downloadqueue in FileDownloader class,
which each thread waits on and calls FileDownloader._do_real_download which each thread waits on and calls FileDownloader._do_real_download
Individual threads are created in main function. Individual threads are created in main function.
""" """
def __init__(self):
threading.Thread.__init__(self)
def run(self):
while True: while True:
d = downloadqueue.get() d = downloadqueue.get()
if (d['filename'] == None): if (d['filename'] == None):
break break
self.params=d['params']
fd=FileDownloader(d['params']) fd=FileDownloader(d['params'])
fd._do_real_download(d['filename'],d['url'],d['player_url']) fd._do_real_download(d['filename'],d['url'],d['player_url'])
downloadqueue.task_done() downloadqueue.task_done()
@ -2796,7 +2783,7 @@ if __name__ == '__main__':
parser.add_option('-P','--parallel', parser.add_option('-P','--parallel',
type="int",dest='parallel',help='Number of parallel downloads',default=0) type="int",dest='parallel',help='Number of parallel downloads',default=0)
parser.add_option('-s', '--save-playlist', parser.add_option('-s', '--save-playlist',
action='store_true', dest='saveplaylist', help='Save file list to a playlist file') action='store', dest='saveplaylist', help='Save file list to a playlist file')
@ -2967,8 +2954,12 @@ if __name__ == '__main__':
generic_ie = GenericIE() generic_ie = GenericIE()
playlistfile = None playlistfile = None
if ( opts.saveplaylist): if (opts.saveplaylist != None):
playlistfile=open("playlist.m3u","w") if(opts.saveplaylist.find(".") == -1 ):
playlist_filename = opts.saveplaylist + ".m3u"
else:
playlist_filename = opts.saveplaylist
playlistfile=open(playlist_filename,"w")
# File downloader # File downloader
fd = FileDownloader({ fd = FileDownloader({
@ -3040,10 +3031,10 @@ if __name__ == '__main__':
threads = [] threads = []
if downloadparallel > 0: if downloadparallel > 0:
for threadcount in xrange(downloadparallel): for threadcount in xrange(downloadparallel):
d=FileDownloadHelper() t = threading.Thread(target=threadedFileDownloader)
d.setDaemon(True) t.setDaemon(True)
d.start() t.start()
threads.append(d) threads.append(t)
# Maybe do nothing # Maybe do nothing
if len(all_urls) < 1: if len(all_urls) < 1:
@ -3055,14 +3046,8 @@ if __name__ == '__main__':
#wait for download threads to terminate #wait for download threads to terminate
if downloadparallel > 0: if downloadparallel > 0:
for threadcount in xrange(downloadparallel): for t in threads:
while True: t.join(2**32)
if( not threads[threadcount].isAlive()):
break
time.sleep(1)
for threadcount in xrange(downloadparallel):
threads[threadcount].join()
# Dump cookie jar if requested # Dump cookie jar if requested
if opts.cookiefile is not None: if opts.cookiefile is not None: