w/youtube-dl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

[compat] Allow overriding by only COLUMNS or LINES in compat_get_terminal_size

Browse source 
Now the semantic of this function is identical to
shutil.get_terminal_size() in Python 3.3+. The new behavior also
corresponds to the old get_term_width(), which is removed in
003c69a84b
This commit is contained in:
Yen Chi Hsuan 2015-09-13 20:04:27 +08:00 committed by Jaime Marquínez Ferrándiz
parent 5495937f46
commit 13118a50b8
1 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
youtube_dl/compat.py
View file

@ -416,7 +416,7 @@ if hasattr(shutil, 'get_terminal_size'): # Python >= 3.3
else: else:
_terminal_size = collections.namedtuple('terminal_size', ['columns', 'lines']) _terminal_size = collections.namedtuple('terminal_size', ['columns', 'lines'])
def compat_get_terminal_size(): def compat_get_terminal_size(fallback=(80, 24)):
columns = compat_getenv('COLUMNS', None) columns = compat_getenv('COLUMNS', None)
if columns: if columns:
columns = int(columns) columns = int(columns)
@ -428,14 +428,20 @@ else:
else: else:
lines = None lines = None
try: if columns <= 0 or lines <= 0:
sp = subprocess.Popen( try:
['stty', 'size'], sp = subprocess.Popen(
stdout=subprocess.PIPE, stderr=subprocess.PIPE) ['stty', 'size'],
out, err = sp.communicate() stdout=subprocess.PIPE, stderr=subprocess.PIPE)
lines, columns = map(int, out.split()) out, err = sp.communicate()
except Exception: _columns, _lines = map(int, out.split())
pass except Exception:
_columns, _lines = _terminal_size(*fallback)
if columns <= 0:
columns = _columns
if lines <= 0:
lines = _lines
return _terminal_size(columns, lines) return _terminal_size(columns, lines)
try: try: