projects
/
pyutils.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More messing with the project file.
[pyutils.git]
/
src
/
pyutils
/
text_utils.py
diff --git
a/src/pyutils/text_utils.py
b/src/pyutils/text_utils.py
index 37d721b7bb027a0dff77d144eb7669328bd3ec20..66f6f22dcd5dc8dcbd57777947002936e50e01f6 100644
(file)
--- a/
src/pyutils/text_utils.py
+++ b/
src/pyutils/text_utils.py
@@
-25,7
+25,7
@@
import re
import sys
from collections import defaultdict
from dataclasses import dataclass
import sys
from collections import defaultdict
from dataclasses import dataclass
-from typing import Dict, Generator, List, Literal, Optional, Tuple
+from typing import Dict, Generator, List, Literal, Optional, Tuple
, Union
from pyutils import string_utils
from pyutils.ansi import fg, reset
from pyutils import string_utils
from pyutils.ansi import fg, reset
@@
-52,37
+52,26
@@
def get_console_rows_columns() -> RowsColumns:
"""
from pyutils.exec_utils import cmd
"""
from pyutils.exec_utils import cmd
- rows:
Optional[str
] = os.environ.get('LINES', None)
- cols:
Optional[str
] = os.environ.get('COLUMNS', None)
+ rows:
Union[Optional[str], int
] = os.environ.get('LINES', None)
+ cols:
Union[Optional[str], int
] = os.environ.get('COLUMNS', None)
if not rows or not cols:
if not rows or not cols:
- logger.debug('Rows: %s, cols: %s, trying stty.', rows, cols)
try:
try:
- rows, cols = cmd(
- "stty size",
- timeout_seconds=1.0,
- ).split()
+ size = os.get_terminal_size()
+ rows = size.lines
+ cols = size.columns
except Exception:
rows = None
cols = None
except Exception:
rows = None
cols = None
- if
rows is None
:
- logger.debug('Rows: %s, cols: %s, t
put rows
.', rows, cols)
+ if
not rows or not cols
:
+ logger.debug('Rows: %s, cols: %s, t
rying stty
.', rows, cols)
try:
try:
- rows = cmd(
- "
tput rows
",
+ rows
, cols
= cmd(
+ "
stty size
",
timeout_seconds=1.0,
timeout_seconds=1.0,
- )
+ )
.split()
except Exception:
rows = None
except Exception:
rows = None
-
- if cols is None:
- logger.debug('Rows: %s, cols: %s, tput cols.', rows, cols)
- try:
- cols = cmd(
- "tput cols",
- timeout_seconds=1.0,
- )
- except Exception:
cols = None
if not rows or not cols:
cols = None
if not rows or not cols: