浏览代码

added --playpath/-y support to RTMP downloads (via 'play_path' entry in 'info_dict')

Michael Walter 12 年之前
父节点
当前提交
adb029ed81
共有 1 个文件被更改,包括 5 次插入2 次删除
  1. 5 2
      youtube_dl/FileDownloader.py

+ 5 - 2
youtube_dl/FileDownloader.py

@@ -629,7 +629,7 @@ class FileDownloader(object):
             except (IOError, OSError):
             except (IOError, OSError):
                 self.report_warning(u'Unable to remove downloaded video file')
                 self.report_warning(u'Unable to remove downloaded video file')
 
 
-    def _download_with_rtmpdump(self, filename, url, player_url, page_url):
+    def _download_with_rtmpdump(self, filename, url, player_url, page_url, play_path):
         self.report_destination(filename)
         self.report_destination(filename)
         tmpfilename = self.temp_name(filename)
         tmpfilename = self.temp_name(filename)
 
 
@@ -648,6 +648,8 @@ class FileDownloader(object):
             basic_args += ['-W', player_url]
             basic_args += ['-W', player_url]
         if page_url is not None:
         if page_url is not None:
             basic_args += ['--pageUrl', page_url]
             basic_args += ['--pageUrl', page_url]
+        if play_path is not None:
+            basic_args += ['-y', play_path]
         args = basic_args + [[], ['-e', '-k', '1']][self.params.get('continuedl', False)]
         args = basic_args + [[], ['-e', '-k', '1']][self.params.get('continuedl', False)]
         if self.params.get('verbose', False):
         if self.params.get('verbose', False):
             try:
             try:
@@ -702,7 +704,8 @@ class FileDownloader(object):
         if url.startswith('rtmp'):
         if url.startswith('rtmp'):
             return self._download_with_rtmpdump(filename, url,
             return self._download_with_rtmpdump(filename, url,
                                                 info_dict.get('player_url', None),
                                                 info_dict.get('player_url', None),
-                                                info_dict.get('page_url', None))
+                                                info_dict.get('page_url', None),
+                                                info_dict.get('play_path', None))
 
 
         tmpfilename = self.temp_name(filename)
         tmpfilename = self.temp_name(filename)
         stream = None
         stream = None