python/jc
1
0
Fork 0
mirror of https://github.com/kellyjonbrazil/jc.git synced 2025-07-15 01:24:29 +02:00
Code Issues Releases Activity

fixes for multiple consecutive newlines and trailing newlines in filenames

Browse Source
This commit is contained in:
Kelly Brazil
2020-02-24 16:38:29 -08:00
parent 964868c8af
commit 116e07f161
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
jc/parsers/ls.py
View File

@ -246,18 +246,17 @@ def parse(data, raw=False, quiet=False):
parsed_line = entry.split(maxsplit=8) parsed_line = entry.split(maxsplit=8)
if new_section \ if not re.match('^[-dclpsbDCMnP?]([-r][-w][-xsS]){2}([-r][-w][-xtT])[+]?', entry) \
and not re.match('^[-dclpsbDCMnP?]([-r][-w][-xsS]){2}([-r][-w][-xtT])[+]?', entry) \
and entry.endswith(':'): and entry.endswith(':'):
parent = entry[:-1] parent = entry[:-1]
new_section = False new_section = True
# fixup to remove trailing \n in previous entry
raw_output[-1]['filename'] = raw_output[-1]['filename'][:-1]
continue continue
if re.match('^total [0-9]+', entry): if re.match('^total [0-9]+', entry):
continue new_section = False
if entry == '':
new_section = True
continue continue
# fixup for filenames with newlines # fixup for filenames with newlines