mirror of
				https://github.com/yt-dlp/yt-dlp.git
				synced 2025-10-31 14:45:14 +00:00 
			
		
		
		
	[mplayer] Modernize
This commit is contained in:
		| @@ -1,7 +1,10 @@ | |||||||
|  | from __future__ import unicode_literals | ||||||
|  |  | ||||||
| import os | import os | ||||||
| import subprocess | import subprocess | ||||||
|  |  | ||||||
| from .common import FileDownloader | from .common import FileDownloader | ||||||
|  | from ..compat import compat_subprocess_get_DEVNULL | ||||||
| from ..utils import ( | from ..utils import ( | ||||||
|     encodeFilename, |     encodeFilename, | ||||||
| ) | ) | ||||||
| @@ -13,19 +16,23 @@ class MplayerFD(FileDownloader): | |||||||
|         self.report_destination(filename) |         self.report_destination(filename) | ||||||
|         tmpfilename = self.temp_name(filename) |         tmpfilename = self.temp_name(filename) | ||||||
|  |  | ||||||
|         args = ['mplayer', '-really-quiet', '-vo', 'null', '-vc', 'dummy', '-dumpstream', '-dumpfile', tmpfilename, url] |         args = [ | ||||||
|  |             'mplayer', '-really-quiet', '-vo', 'null', '-vc', 'dummy', | ||||||
|  |             '-dumpstream', '-dumpfile', tmpfilename, url] | ||||||
|         # Check for mplayer first |         # Check for mplayer first | ||||||
|         try: |         try: | ||||||
|             subprocess.call(['mplayer', '-h'], stdout=(open(os.path.devnull, 'w')), stderr=subprocess.STDOUT) |             subprocess.call( | ||||||
|  |                 ['mplayer', '-h'], | ||||||
|  |                 stdout=compat_subprocess_get_DEVNULL(), stderr=subprocess.STDOUT) | ||||||
|         except (OSError, IOError): |         except (OSError, IOError): | ||||||
|             self.report_error(u'MMS or RTSP download detected but "%s" could not be run' % args[0]) |             self.report_error('MMS or RTSP download detected but "%s" could not be run' % args[0]) | ||||||
|             return False |             return False | ||||||
|  |  | ||||||
|         # Download using mplayer. |         # Download using mplayer. | ||||||
|         retval = subprocess.call(args) |         retval = subprocess.call(args) | ||||||
|         if retval == 0: |         if retval == 0: | ||||||
|             fsize = os.path.getsize(encodeFilename(tmpfilename)) |             fsize = os.path.getsize(encodeFilename(tmpfilename)) | ||||||
|             self.to_screen(u'\r[%s] %s bytes' % (args[0], fsize)) |             self.to_screen('\r[%s] %s bytes' % (args[0], fsize)) | ||||||
|             self.try_rename(tmpfilename, filename) |             self.try_rename(tmpfilename, filename) | ||||||
|             self._hook_progress({ |             self._hook_progress({ | ||||||
|                 'downloaded_bytes': fsize, |                 'downloaded_bytes': fsize, | ||||||
| @@ -35,6 +42,6 @@ class MplayerFD(FileDownloader): | |||||||
|             }) |             }) | ||||||
|             return True |             return True | ||||||
|         else: |         else: | ||||||
|             self.to_stderr(u"\n") |             self.to_stderr('\n') | ||||||
|             self.report_error(u'mplayer exited with code %d' % retval) |             self.report_error('mplayer exited with code %d' % retval) | ||||||
|             return False |             return False | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Philipp Hagemeister
					Philipp Hagemeister