From 0005945383c8fb9936048992c8e5765c1489d6e5 Mon Sep 17 00:00:00 2001 From: Kelly Brazil Date: Sun, 9 Jun 2024 10:31:06 -0700 Subject: [PATCH] doc update --- jc/parsers/ss.py | 8 +++++--- man/jc.1 | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/jc/parsers/ss.py b/jc/parsers/ss.py index f105cc21..1be92ffb 100644 --- a/jc/parsers/ss.py +++ b/jc/parsers/ss.py @@ -415,6 +415,8 @@ def parse(data, raw=False, quiet=False): contains_colon = ['nl', 'p_raw', 'raw', 'udp', 'tcp', 'v_str', 'icmp6'] raw_output = [] + ONE_SPACE_PATTERN = r'[ ]{1,}' + TWO_SPACE_PATTERN = r'[ ]{2,}' # Clear any blank lines cleandata = list(filter(None, data.splitlines())) @@ -423,7 +425,7 @@ def parse(data, raw=False, quiet=False): header_text = cleandata[0].lower() # get the position of Recv-Q since sometimes it doesn't leave enough space - # to parse. need at least two spaces between main fields do differentiate + # to parse. need at least two spaces between main fields to differentiate # from opt fields, which are only separated by one space recv_q_position = header_text.find('recv-q') @@ -445,10 +447,10 @@ def parse(data, raw=False, quiet=False): # fix weird ss bug where first two columns have no space between them sometimes entry = entry[:5] + ' ' + entry[5:] - entry_list = re.split(r'[ ]{1,}', entry.strip()) + entry_list = re.split(ONE_SPACE_PATTERN, entry.strip()) if len(entry_list) > len(header_list) or extra_opts == True: - entry_list = re.split(r'[ ]{2,}', entry.strip()) + entry_list = re.split(TWO_SPACE_PATTERN, entry.strip()) extra_opts = True if entry_list[0] in contains_colon and ':' in entry_list[4]: diff --git a/man/jc.1 b/man/jc.1 index a179db0f..51083396 100644 --- a/man/jc.1 +++ b/man/jc.1 @@ -1,4 +1,4 @@ -.TH jc 1 2024-06-07 1.25.3 "JSON Convert" +.TH jc 1 2024-06-09 1.25.3 "JSON Convert" .SH NAME \fBjc\fP \- JSON Convert JSONifies the output of many CLI tools, file-types, and strings