[mplayer] Modernize
This commit is contained in:
		
							parent
							
								
									4d2d638df4
								
							
						
					
					
						commit
						80310134e0
					
				@ -1,7 +1,10 @@
 | 
			
		||||
from __future__ import unicode_literals
 | 
			
		||||
 | 
			
		||||
import os
 | 
			
		||||
import subprocess
 | 
			
		||||
 | 
			
		||||
from .common import FileDownloader
 | 
			
		||||
from ..compat import compat_subprocess_get_DEVNULL
 | 
			
		||||
from ..utils import (
 | 
			
		||||
    encodeFilename,
 | 
			
		||||
)
 | 
			
		||||
@ -13,19 +16,23 @@ class MplayerFD(FileDownloader):
 | 
			
		||||
        self.report_destination(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
 | 
			
		||||
        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):
 | 
			
		||||
            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
 | 
			
		||||
 | 
			
		||||
        # 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.to_screen('\r[%s] %s bytes' % (args[0], fsize))
 | 
			
		||||
            self.try_rename(tmpfilename, filename)
 | 
			
		||||
            self._hook_progress({
 | 
			
		||||
                'downloaded_bytes': fsize,
 | 
			
		||||
@ -35,6 +42,6 @@ class MplayerFD(FileDownloader):
 | 
			
		||||
            })
 | 
			
		||||
            return True
 | 
			
		||||
        else:
 | 
			
		||||
            self.to_stderr(u"\n")
 | 
			
		||||
            self.report_error(u'mplayer exited with code %d' % retval)
 | 
			
		||||
            self.to_stderr('\n')
 | 
			
		||||
            self.report_error('mplayer exited with code %d' % retval)
 | 
			
		||||
            return False
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user