projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[rtve] Detect videos that are no longer available
[youtube-dl]
/
youtube_dl
/
downloader
/
mplayer.py
diff --git
a/youtube_dl/downloader/mplayer.py
b/youtube_dl/downloader/mplayer.py
index 7dd6e76d0f7688d500e4969c7876192c06828499..72cef30eaf3718ad8932814a627042cc0bdff361 100644
(file)
--- a/
youtube_dl/downloader/mplayer.py
+++ b/
youtube_dl/downloader/mplayer.py
@@
-1,30
+1,34
@@
+from __future__ import unicode_literals
+
import os
import subprocess
from .common import FileDownloader
from ..utils import (
import os
import subprocess
from .common import FileDownloader
from ..utils import (
+ check_executable,
encodeFilename,
)
class MplayerFD(FileDownloader):
def real_download(self, filename, info_dict):
encodeFilename,
)
class MplayerFD(FileDownloader):
def real_download(self, filename, info_dict):
+ url = info_dict['url']
self.report_destination(filename)
tmpfilename = self.temp_name(filename)
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
# Check for mplayer first
- try:
- subprocess.call(['mplayer', '-h'], 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] )
+ if not check_executable('mplayer', ['-h']):
+ 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)
if retval == 0:
fsize = os.path.getsize(encodeFilename(tmpfilename))
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,
self.try_rename(tmpfilename, filename)
self._hook_progress({
'downloaded_bytes': fsize,
@@
-34,6
+38,6
@@
class MplayerFD(FileDownloader):
})
return True
else:
})
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
return False