projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
43ff1a3
)
added --playpath/-y support to RTMP downloads (via 'play_path' entry in 'info_dict')
author
Michael Walter
<michael.walter@gmail.com>
Sun, 7 Apr 2013 13:17:36 +0000
(15:17 +0200)
committer
Michael Walter
<michael.walter@gmail.com>
Sun, 7 Apr 2013 13:17:36 +0000
(15:17 +0200)
youtube_dl/FileDownloader.py
patch
|
blob
|
history
diff --git
a/youtube_dl/FileDownloader.py
b/youtube_dl/FileDownloader.py
index 7c5a52be15fa449396fb931bb5911f108ec38493..e801db00a2d1a0de4460ef59696d4769cc2d0779 100644
(file)
--- a/
youtube_dl/FileDownloader.py
+++ b/
youtube_dl/FileDownloader.py
@@
-629,7
+629,7
@@
class FileDownloader(object):
except (IOError, OSError):
self.report_warning(u'Unable to remove downloaded video file')
except (IOError, OSError):
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)
tmpfilename = self.temp_name(filename)
self.report_destination(filename)
tmpfilename = self.temp_name(filename)
@@
-648,6
+648,8
@@
class FileDownloader(object):
basic_args += ['-W', player_url]
if page_url is not None:
basic_args += ['--pageUrl', page_url]
basic_args += ['-W', player_url]
if page_url is not None:
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)]
if self.params.get('verbose', False):
try:
args = basic_args + [[], ['-e', '-k', '1']][self.params.get('continuedl', False)]
if self.params.get('verbose', False):
try:
@@
-702,7
+704,8
@@
class FileDownloader(object):
if url.startswith('rtmp'):
return self._download_with_rtmpdump(filename, url,
info_dict.get('player_url', None),
if url.startswith('rtmp'):
return self._download_with_rtmpdump(filename, url,
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)
stream = None
tmpfilename = self.temp_name(filename)
stream = None