瀏覽代碼

[YoutubeDL] clarify hook documentation

Philipp Hagemeister 10 年之前
父節點
當前提交
ee69b99af6
共有 1 個文件被更改,包括 6 次插入4 次删除
  1. 6 4
      youtube_dl/YoutubeDL.py

+ 6 - 4
youtube_dl/YoutubeDL.py

@@ -198,11 +198,12 @@ class YoutubeDL(object):
                        postprocessor.
                        postprocessor.
     progress_hooks:    A list of functions that get called on download
     progress_hooks:    A list of functions that get called on download
                        progress, with a dictionary with the entries
                        progress, with a dictionary with the entries
-                       * filename: The final filename
-                       * status: One of "downloading" and "finished"
-
-                       The dict may also have some of the following entries:
+                       * status: One of "downloading" and "finished".
+                                 Check this first and ignore unknown values.
 
 
+                       If status is one of "downloading" or "finished", the
+                       following properties may also be present:
+                       * filename: The final filename (always present)
                        * downloaded_bytes: Bytes on disk
                        * downloaded_bytes: Bytes on disk
                        * total_bytes: Size of the whole file, None if unknown
                        * total_bytes: Size of the whole file, None if unknown
                        * tmpfilename: The filename we're currently writing to
                        * tmpfilename: The filename we're currently writing to
@@ -1251,6 +1252,7 @@ class YoutubeDL(object):
                     if self.params.get('verbose'):
                     if self.params.get('verbose'):
                         self.to_stdout('[debug] Invoking downloader on %r' % info.get('url'))
                         self.to_stdout('[debug] Invoking downloader on %r' % info.get('url'))
                     return fd.download(name, info)
                     return fd.download(name, info)
+
                 if info_dict.get('requested_formats') is not None:
                 if info_dict.get('requested_formats') is not None:
                     downloaded = []
                     downloaded = []
                     success = True
                     success = True