diff options
| author | Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com> | 2013-12-23 10:37:27 +0100 |
|---|---|---|
| committer | Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com> | 2013-12-23 10:37:27 +0100 |
| commit | 933605d7e8c00df065f04024c3206a3352058484 (patch) | |
| tree | 48be10ef964cf467e8a8d4667279cb0847e79073 | |
| parent | b3d9ef88ec55335db93601f4b2ec9ad30eca93ec (diff) | |
| download | youtube-dl-933605d7e8c00df065f04024c3206a3352058484.tar.xz | |
YoutubeDL: rename `_fd_progress_hooks` back to `_progress_hooks`
In the future it may report more things.
| -rw-r--r-- | test/test_download.py | 2 | ||||
| -rw-r--r-- | 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: |