diff options
author | mc2avr <mc2avr@googlemail.com> | 2013-05-23 21:42:03 +0200 |
---|---|---|
committer | mc2avr <mc2avr@googlemail.com> | 2013-05-23 21:42:03 +0200 |
commit | f2cd958c0a09bca580a955c60c19e177f6ff45b8 (patch) | |
tree | 90769eda0f694d3cc5f7b83882cb2b829ee8f14e /youtube_dl/FileDownloader.py | |
parent | 51d2453c7ade642e7f2253ed2211824bd0a2a9ff (diff) |
add ZDFIE and _download_with_mplayer(mms://,rtsp://)
Diffstat (limited to 'youtube_dl/FileDownloader.py')
-rw-r--r-- | youtube_dl/FileDownloader.py | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/youtube_dl/FileDownloader.py b/youtube_dl/FileDownloader.py index 49f3a8712..2c35a05d8 100644 --- a/youtube_dl/FileDownloader.py +++ b/youtube_dl/FileDownloader.py @@ -810,6 +810,39 @@ class FileDownloader(object): self.report_error(u'rtmpdump exited with code %d' % retval) return False + def _download_with_mplayer(self, filename, url): + self.report_destination(filename) + tmpfilename = self.temp_name(filename) + +# args = ['mmsclient', url] # doesn't work anymore +# args = ['wpro', url, '-O', tmpfilename] # dont work + args = ['mplayer', '-really-quiet', '-vo', 'null', '-vc', 'dummy', '-dumpstream', '-dumpfile', tmpfilename, url] + # Check for mplayer first + try: + subprocess.call(args[0], stdout=(open(os.path.devnull, 'w')), stderr=subprocess.STDOUT) + except (OSError, IOError): + self.report_error(u'MMS or RTSP download detected but "%s" could not be run' % args[0] ) + return False + + # Download using mplayer. + retval = subprocess.call(args) + if retval == 0: + fsize = os.path.getsize(encodeFilename(tmpfilename)) + self.to_screen(u'\r[%s] %s bytes' % (args[0], fsize)) + self.try_rename(tmpfilename, filename) + self._hook_progress({ + 'downloaded_bytes': fsize, + 'total_bytes': fsize, + 'filename': filename, + 'status': 'finished', + }) + return True + else: + self.to_stderr(u"\n") + self.report_error(u'%s exited with code %d' % (args[0], retval)) + return False + + def _do_download(self, filename, info_dict): url = info_dict['url'] @@ -830,6 +863,10 @@ class FileDownloader(object): info_dict.get('play_path', None), info_dict.get('tc_url', None)) + # Attempt to download using mplayer + if url.startswith('mms') or url.startswith('rtsp'): + return self._download_with_mplayer(filename, url) + tmpfilename = self.temp_name(filename) stream = None |