python/jc
1
0
Fork 0
mirror of https://github.com/kellyjonbrazil/jc.git synced 2025-06-17 00:07:37 +02:00
Code Issues Releases Activity

shorten successful yield to a single line

Browse Source
This commit is contained in:
Kelly Brazil
2021-09-16 22:32:46 -07:00
parent 92c7357615
commit 130b3738cc
4 changed files with 21 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
jc/parsers/foo_s.py
View File

@ -34,6 +34,7 @@ Examples:
... ...
""" """
import jc.utils import jc.utils
from jc.utils import stream_success, stream_error
class info(): class info():
@ -95,10 +96,7 @@ def parse(data, raw=False, quiet=False):
# parse the input here # parse the input here
# #
if quiet: yield stream_success(output_line, quiet) if raw else stream_success(_process(output_line), quiet)
output_line.update(jc.utils.stream_success)
yield output_line if raw else _process(output_line)
except Exception as e: except Exception as e:
yield jc.utils.stream_error(e, quiet, line) yield stream_error(e, quiet, line)

8
jc/parsers/ls_s.py
View File

@ -56,6 +56,7 @@ Examples:
""" """
import re import re
import jc.utils import jc.utils
from jc.utils import stream_success, stream_error
from jc.exceptions import ParseError from jc.exceptions import ParseError
@ -166,10 +167,7 @@ def parse(data, raw=False, quiet=False):
output_line['size'] = parsed_line[4] output_line['size'] = parsed_line[4]
output_line['date'] = ' '.join(parsed_line[5:8]) output_line['date'] = ' '.join(parsed_line[5:8])
if quiet: yield stream_success(output_line, quiet) if raw else stream_success(_process(output_line), quiet)
output_line.update(jc.utils.stream_success)
yield output_line if raw else _process(output_line)
except Exception as e: except Exception as e:
yield jc.utils.stream_error(e, quiet, line) yield stream_error(e, quiet, line)

14
jc/parsers/ping_s.py
View File

@ -35,6 +35,7 @@ Examples:
""" """
import string import string
import jc.utils import jc.utils
from jc.utils import stream_success, stream_error
class info(): class info():
@ -191,11 +192,7 @@ def parse(data, raw=False, quiet=False):
'icmp_seq': line.replace('=', ' ').split()[isequence] 'icmp_seq': line.replace('=', ' ').split()[isequence]
} }
if quiet: yield stream_success(output_line, quiet) if raw else stream_success(_process(output_line), quiet)
output_line.update(jc.utils.stream_success)
yield output_line if raw else _process(output_line)
continue continue
# normal responses # normal responses
@ -231,10 +228,7 @@ def parse(data, raw=False, quiet=False):
'duplicate': True if 'DUP!' in line else False 'duplicate': True if 'DUP!' in line else False
} }
if quiet: yield stream_success(output_line, quiet) if raw else stream_success(_process(output_line), quiet)
output_line.update(jc.utils.stream_success)
yield output_line if raw else _process(output_line)
except Exception as e: except Exception as e:
yield jc.utils.stream_error(e, quiet, line) yield stream_error(e, quiet, line)

17
jc/utils.py
View File

@ -173,12 +173,17 @@ def convert_to_bool(value):
return False return False
stream_success = { def stream_success(output_line, quiet):
'_meta': if quiet:
{ output_line.update(
'success': True {
} '_meta':
} {
'success': True
}
}
)
return output_line
def stream_error(e, quiet, line): def stream_error(e, quiet, line):