From: Georgi Valkov <georgi.t.valkov@gmail.com>
Date: Tue, 23 Aug 2011 14:03:28 +0000 (+0300)
Subject: Use `stty size` to find terminal width if we're on linux and COLUMNS is not exported
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=6a4f0a114d88965c171d0117db68be64b4db9acd;p=youtube-dl

Use `stty size` to find terminal width if we're on linux and COLUMNS is not exported
---

diff --git a/youtube-dl b/youtube-dl
index 34a60afff..251254765 100755
--- a/youtube-dl
+++ b/youtube-dl
@@ -2744,11 +2744,21 @@ def parseOpts():
 
 		return "".join(opts)
 
+	def _find_term_columns():
+		columns = os.environ.get('COLUMNS', None)
+		if columns: return int(columns)
+
+		if sys.platform.startswith('linux'):
+			try: columns = os.popen('stty size', 'r').read().split()[1]
+			except: pass
+
+		if columns: return int(columns)
+
 	max_width = 80
 	max_help_position = 80
 
 	# No need to wrap help messages if we're on a wide console
-	columns = os.environ.get('COLUMNS', None)
+	columns = _find_term_columns()
 	if columns: max_width = columns
 
 	fmt = optparse.IndentedHelpFormatter(width=max_width, max_help_position=max_help_position)