sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-18 00:59:12 +03:00
Code Activity

samba-tool visualize: simplify --color-scheme calculations

Browse Source 
If you ask for a --color-scheme, you are implicitly asking for --color.
That was documented in --help, but not followed here.

Now --color=no --color-scheme=ansi will use colour for the graph, but not
for other output. This might be useful when the graph is going to a
different place than everything else (`-o foo.txt > bar.txt`).

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Douglas Bagnall
2022-09-14 18:23:16 +12:00
committed by Andrew Bartlett
parent 07cbb10dc0
commit a64e6c9639
1 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
python/samba/netcmd/visualize.py
View File

@ -21,7 +21,6 @@ import os
import sys
from collections import defaultdict
import subprocess
import tempfile
import samba.getopt as options
from samba import dsdb
@ -31,6 +30,8 @@ from samba.samdb import SamDB
from samba.graph import dot_graph
from samba.graph import distance_matrix, COLOUR_SETS
from samba.graph import full_matrix
from samba.colour import is_colour_wanted
from ldb import SCOPE_BASE, SCOPE_SUBTREE, LdbError
import time
import re
@ -152,26 +153,23 @@ class GraphCommand(Command):
"""Heuristics to work out the colour scheme for distance matrices.
Returning None means no colour, otherwise it sould be a colour
from graph.COLOUR_SETS"""
if self.requested_colour in ('no', 'never', 'none'):
if color_scheme is not None:
# --color-scheme implies --color=yes for *this* purpose.
return color_scheme
if output in ('-', None):
output = self.outf
want_colour = is_colour_wanted(output, hint=self.requested_colour)
if not want_colour:
return None
if self.requested_colour in ('auto', 'tty', 'if-tty', None):
if os.environ.get('NO_COLOR'):
return None
if color_scheme is not None:
# --color-scheme usually implies --color=yes.
return color_scheme
if isinstance(output, str) and output != '-':
return None
if not self.outf.isatty():
return None
if color_scheme is None:
if '256color' in os.environ.get('TERM', ''):
return 'xterm-256color-heatmap'
return 'ansi'
return color_scheme
# if we got to here, we are using colour according to the
# --color/NO_COLOR rules, but no colour scheme has been
# specified, so we choose some defaults.
if '256color' in os.environ.get('TERM', ''):
return 'xterm-256color-heatmap'
return 'ansi'
def get_dnstr_site(dn):