depau/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-11-17 15:55:56 +00:00
Code Issues Releases Wiki Activity

[YoutubeDL] improve --console-title output to go to tty

Browse source
This commit is contained in:
kikuyan 2021-06-30 16:58:25 +09:00
parent 43eef1dcd8
commit a3da97129e
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
youtube_dl/YoutubeDL.py
View file

@ -357,6 +357,7 @@ class YoutubeDL(object):
self._num_downloads = 0 self._num_downloads = 0
self._screen_file = [sys.stdout, sys.stderr][params.get('logtostderr', False)] self._screen_file = [sys.stdout, sys.stderr][params.get('logtostderr', False)]
self._err_file = sys.stderr self._err_file = sys.stderr
self._tty_file = None # for --console-title
self._apple_terminal = None self._apple_terminal = None
self.params = { self.params = {
# Default parameters # Default parameters
@ -422,6 +423,17 @@ class YoutubeDL(object):
'Parameter outtmpl is bytes, but should be a unicode string. ' 'Parameter outtmpl is bytes, but should be a unicode string. '
'Put from __future__ import unicode_literals at the top of your code file or consider switching to Python 3.x.') 'Put from __future__ import unicode_literals at the top of your code file or consider switching to Python 3.x.')
if (self.params.get('consoletitle', False)
and not self.params.get('simulate', False)
and compat_os_name != 'nt' and 'TERM' in os.environ):
if self._screen_file.isatty():
self._tty_file = self._screen_file
elif self._err_file != self._screen_file and self._err_file.isatty():
self._tty_file = self._err_file
else:
self.report_warning('Could not find a tty for output, ignoring --console-title. Either stdout or stderr must be a tty.')
self.params['consoletitle'] = False
self._setup_opener() self._setup_opener()
if auto_init: if auto_init:
@ -541,7 +553,7 @@ class YoutubeDL(object):
# already of type unicode() # already of type unicode()
ctypes.windll.kernel32.SetConsoleTitleW(ctypes.c_wchar_p(message)) ctypes.windll.kernel32.SetConsoleTitleW(ctypes.c_wchar_p(message))
elif 'TERM' in os.environ: elif 'TERM' in os.environ:
self._write_string('\033]0;%s\007' % message, self._screen_file) self._write_string('\033]0;%s\007' % message, self._tty_file)
def save_console_title(self): def save_console_title(self):
if not self.params.get('consoletitle', False): if not self.params.get('consoletitle', False):
@ -551,12 +563,12 @@ class YoutubeDL(object):
if compat_os_name != 'nt' and 'TERM' in os.environ: if compat_os_name != 'nt' and 'TERM' in os.environ:
if not (sys.platform == 'darwin' and compat_getenv('TERM_PROGRAM') == 'Apple_Terminal'): if not (sys.platform == 'darwin' and compat_getenv('TERM_PROGRAM') == 'Apple_Terminal'):
# Save the title on stack # Save the title on stack
self._write_string('\033[22;0t', self._screen_file) self._write_string('\033[22;0t', self._tty_file)
else: else:
# macOS Terminal app # macOS Terminal app
window_title = None window_title = None
try: try:
ttyname = os.ttyname(self._screen_file.fileno()) ttyname = os.ttyname(self._tty_file.fileno())
scpt = [ scpt = [
'tell app "Terminal"', 'tell app "Terminal"',
'repeat with win in (every window)', 'repeat with win in (every window)',
@ -592,9 +604,9 @@ class YoutubeDL(object):
if compat_os_name != 'nt' and 'TERM' in os.environ: if compat_os_name != 'nt' and 'TERM' in os.environ:
if self._apple_terminal is None: if self._apple_terminal is None:
# Restore the title from stack # Restore the title from stack
self._write_string('\033[23;0t', self._screen_file) self._write_string('\033[23;0t', self._tty_file)
else: else:
self._write_string('\033]0;%s\007' % self._apple_terminal, self._screen_file) self._write_string('\033]0;%s\007' % self._apple_terminal, self._tty_file)
def __enter__(self): def __enter__(self):
self.save_console_title() self.save_console_title()