w/youtube-dl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Philipp Hagemeister 2013-12-23 13:52:15 +01:00
commit 00b2685b9c
3 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
test/test_download.py
View file

@ -90,7 +90,7 @@ def generator(test_case):
def _hook(status): def _hook(status):
if status['status'] == 'finished': if status['status'] == 'finished':
finished_hook_called.add(status['filename']) finished_hook_called.add(status['filename'])
ydl.add_downloader_progress_hook(_hook) ydl.add_progress_hook(_hook)
def get_tc_filename(tc): def get_tc_filename(tc):
return tc.get('file') or ydl.prepare_filename(tc.get('info_dict', {})) return tc.get('file') or ydl.prepare_filename(tc.get('info_dict', {}))

4
test/test_subtitles.py
View file

@ -36,10 +36,6 @@ class TestYoutubeSubtitles(BaseTestSubtitles):
url = 'QRS8MkLhQmM' url = 'QRS8MkLhQmM'
IE = YoutubeIE IE = YoutubeIE
def getSubtitles(self):
info_dict = self.getInfoDict()
return info_dict[0]['subtitles']
def test_youtube_no_writesubtitles(self): def test_youtube_no_writesubtitles(self):
self.DL.params['writesubtitles'] = False self.DL.params['writesubtitles'] = False
subtitles = self.getSubtitles() subtitles = self.getSubtitles()

17
youtube_dl/YoutubeDL.py
View file

@ -167,7 +167,7 @@ class YoutubeDL(object):
self._ies = [] self._ies = []
self._ies_instances = {} self._ies_instances = {}
self._pps = [] self._pps = []
self._fd_progress_hooks = [] self._progress_hooks = []
self._download_retcode = 0 self._download_retcode = 0
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)]
@ -246,9 +246,9 @@ class YoutubeDL(object):
self._pps.append(pp) self._pps.append(pp)
pp.set_downloader(self) pp.set_downloader(self)
def add_downloader_progress_hook(self, ph): def add_progress_hook(self, ph):
"""Add the progress hook to the file downloader""" """Add the progress hook (currently only for the file downloader)"""
self._fd_progress_hooks.append(ph) self._progress_hooks.append(ph)
def _bidi_workaround(self, message): def _bidi_workaround(self, message):
if not hasattr(self, '_output_channel'): if not hasattr(self, '_output_channel'):
@ -688,7 +688,12 @@ class YoutubeDL(object):
ext_ord) ext_ord)
formats = sorted(formats, key=_free_formats_key) formats = sorted(formats, key=_free_formats_key)
info_dict['formats'] = formats if formats[0] is not info_dict:
# only set the 'formats' fields if the original info_dict list them
# otherwise we end up with a circular reference, the first (and unique)
# element in the 'formats' field in info_dict is info_dict itself,
# wich can't be exported to json
info_dict['formats'] = formats
if self.params.get('listformats', None): if self.params.get('listformats', None):
self.list_formats(info_dict) self.list_formats(info_dict)
return return
@ -883,7 +888,7 @@ class YoutubeDL(object):
else: else:
try: try:
fd = get_suitable_downloader(info_dict)(self, self.params) fd = get_suitable_downloader(info_dict)(self, self.params)
for ph in self._fd_progress_hooks: for ph in self._progress_hooks:
fd.add_progress_hook(ph) fd.add_progress_hook(ph)
success = fd.download(filename, info_dict) success = fd.download(filename, info_dict)
except (compat_urllib_error.URLError, compat_http_client.HTTPException, socket.error) as err: except (compat_urllib_error.URLError, compat_http_client.HTTPException, socket.error) as err: