From b3d9ef88ec55335db93601f4b2ec9ad30eca93ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaime=20Marqui=CC=81nez=20Ferra=CC=81ndiz?= Date: Mon, 23 Dec 2013 10:23:13 +0100 Subject: [PATCH 1/3] =?UTF-8?q?YoutubeDL:=20only=20set=20the=20=E2=80=98fo?= =?UTF-8?q?rmats=E2=80=99=20field=20of=20the=20info=5Fdict=20if=20it=20was?= =?UTF-8?q?=20already=20set=20before?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It caused a circular reference error, when trying to dump it to json (for example with the test video for myvideo.de or any other video without formats) --- youtube_dl/YoutubeDL.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py index 04771c637..adeef23af 100644 --- a/youtube_dl/YoutubeDL.py +++ b/youtube_dl/YoutubeDL.py @@ -688,7 +688,12 @@ class YoutubeDL(object): ext_ord) 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): self.list_formats(info_dict) return From 933605d7e8c00df065f04024c3206a3352058484 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaime=20Marqui=CC=81nez=20Ferra=CC=81ndiz?= Date: Mon, 23 Dec 2013 10:37:27 +0100 Subject: [PATCH 2/3] YoutubeDL: rename `_fd_progress_hooks` back to `_progress_hooks` In the future it may report more things. --- test/test_download.py | 2 +- youtube_dl/YoutubeDL.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/test_download.py b/test/test_download.py index f242b3528..d0be8d27c 100644 --- a/test/test_download.py +++ b/test/test_download.py @@ -90,7 +90,7 @@ def generator(test_case): def _hook(status): if status['status'] == 'finished': finished_hook_called.add(status['filename']) - ydl.add_downloader_progress_hook(_hook) + ydl.add_progress_hook(_hook) def get_tc_filename(tc): return tc.get('file') or ydl.prepare_filename(tc.get('info_dict', {})) diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py index adeef23af..ac4627c4e 100644 --- a/youtube_dl/YoutubeDL.py +++ b/youtube_dl/YoutubeDL.py @@ -167,7 +167,7 @@ class YoutubeDL(object): self._ies = [] self._ies_instances = {} self._pps = [] - self._fd_progress_hooks = [] + self._progress_hooks = [] self._download_retcode = 0 self._num_downloads = 0 self._screen_file = [sys.stdout, sys.stderr][params.get('logtostderr', False)] @@ -246,9 +246,9 @@ class YoutubeDL(object): self._pps.append(pp) pp.set_downloader(self) - def add_downloader_progress_hook(self, ph): - """Add the progress hook to the file downloader""" - self._fd_progress_hooks.append(ph) + def add_progress_hook(self, ph): + """Add the progress hook (currently only for the file downloader)""" + self._progress_hooks.append(ph) def _bidi_workaround(self, message): if not hasattr(self, '_output_channel'): @@ -888,7 +888,7 @@ class YoutubeDL(object): else: try: 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) success = fd.download(filename, info_dict) except (compat_urllib_error.URLError, compat_http_client.HTTPException, socket.error) as err: From 9d8d675e0e739504978642f132ec3f68d6690892 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaime=20Marqui=CC=81nez=20Ferra=CC=81ndiz?= Date: Mon, 23 Dec 2013 10:40:28 +0100 Subject: [PATCH 3/3] [subtitles-tests] Fix youtube test It returns now a single info_dict --- test/test_subtitles.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/test/test_subtitles.py b/test/test_subtitles.py index 23a653124..263b5ac69 100644 --- a/test/test_subtitles.py +++ b/test/test_subtitles.py @@ -36,10 +36,6 @@ class TestYoutubeSubtitles(BaseTestSubtitles): url = 'QRS8MkLhQmM' IE = YoutubeIE - def getSubtitles(self): - info_dict = self.getInfoDict() - return info_dict[0]['subtitles'] - def test_youtube_no_writesubtitles(self): self.DL.params['writesubtitles'] = False subtitles = self.getSubtitles()