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

fix for no data

Browse Source
This commit is contained in:
Kelly Brazil
2020-06-10 17:20:09 -07:00
parent 35d733b44f
commit d8f2f4c95b
5 changed files with 82 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
changelog.txt
View File

@ -4,6 +4,8 @@ jc changelog
- Update airport_s parser to fix error on parsing empty data - Update airport_s parser to fix error on parsing empty data
- Update arp parser to fix error on parsing empty data - Update arp parser to fix error on parsing empty data
- Update blkid parser to fix error on parsing empty data - Update blkid parser to fix error on parsing empty data
- Update crontab parser to fix error on parsing empty data
- Update crontab_u parser to fix error on parsing empty data
- Add tests to all parsers for no data condition - Add tests to all parsers for no data condition
20200610 v1.11.4 20200610 v1.11.4

65
jc/parsers/crontab.py
View File

@ -132,7 +132,7 @@ import jc.parsers.universal
class info(): class info():
version = '1.2' version = '1.3'
description = 'crontab command and file parser' description = 'crontab command and file parser'
author = 'Kelly Brazil' author = 'Kelly Brazil'
author_email = 'kellyjonbrazil@gmail.com' author_email = 'kellyjonbrazil@gmail.com'
@ -225,44 +225,45 @@ def parse(data, raw=False, quiet=False):
# Clear any blank lines # Clear any blank lines
cleandata = list(filter(None, cleandata)) cleandata = list(filter(None, cleandata))
# Clear any commented lines if cleandata:
for i, line in reversed(list(enumerate(cleandata))): # Clear any commented lines
if line.strip().startswith('#'): for i, line in reversed(list(enumerate(cleandata))):
cleandata.pop(i) if line.strip().startswith('#'):
cleandata.pop(i)
# Pop any variable assignment lines # Pop any variable assignment lines
cron_var = [] cron_var = []
for i, line in reversed(list(enumerate(cleandata))): for i, line in reversed(list(enumerate(cleandata))):
if '=' in line: if '=' in line:
var_line = cleandata.pop(i) var_line = cleandata.pop(i)
var_name = var_line.split('=', maxsplit=1)[0].strip() var_name = var_line.split('=', maxsplit=1)[0].strip()
var_value = var_line.split('=', maxsplit=1)[1].strip() var_value = var_line.split('=', maxsplit=1)[1].strip()
cron_var.append({'name': var_name, cron_var.append({'name': var_name,
'value': var_value}) 'value': var_value})
raw_output['variables'] = cron_var raw_output['variables'] = cron_var
# Pop any shortcut lines # Pop any shortcut lines
shortcut_list = [] shortcut_list = []
for i, line in reversed(list(enumerate(cleandata))): for i, line in reversed(list(enumerate(cleandata))):
if line.strip().startswith('@'): if line.strip().startswith('@'):
shortcut_line = cleandata.pop(i) shortcut_line = cleandata.pop(i)
occurrence = shortcut_line.split(maxsplit=1)[0].strip().lstrip('@') occurrence = shortcut_line.split(maxsplit=1)[0].strip().lstrip('@')
cmd = shortcut_line.split(maxsplit=1)[1].strip() cmd = shortcut_line.split(maxsplit=1)[1].strip()
shortcut_list.append({'occurrence': occurrence, shortcut_list.append({'occurrence': occurrence,
'command': cmd}) 'command': cmd})
# Add header row for parsing # Add header row for parsing
cleandata[:0] = ['minute hour day_of_month month day_of_week command'] cleandata[:0] = ['minute hour day_of_month month day_of_week command']
if len(cleandata) > 1: if len(cleandata) > 1:
cron_list = jc.parsers.universal.simple_table_parse(cleandata) cron_list = jc.parsers.universal.simple_table_parse(cleandata)
raw_output['schedule'] = cron_list raw_output['schedule'] = cron_list
# Add shortcut entries back in # Add shortcut entries back in
for item in shortcut_list: for item in shortcut_list:
raw_output['schedule'].append(item) raw_output['schedule'].append(item)
if raw: if raw:
return raw_output return raw_output

69
jc/parsers/crontab_u.py
View File

@ -133,7 +133,7 @@ import jc.parsers.universal
class info(): class info():
version = '1.1' version = '1.2'
description = 'crontab file parser with user support' description = 'crontab file parser with user support'
author = 'Kelly Brazil' author = 'Kelly Brazil'
author_email = 'kellyjonbrazil@gmail.com' author_email = 'kellyjonbrazil@gmail.com'
@ -226,46 +226,47 @@ def parse(data, raw=False, quiet=False):
# Clear any blank lines # Clear any blank lines
cleandata = list(filter(None, cleandata)) cleandata = list(filter(None, cleandata))
# Clear any commented lines if cleandata:
for i, line in reversed(list(enumerate(cleandata))): # Clear any commented lines
if line.strip().startswith('#'): for i, line in reversed(list(enumerate(cleandata))):
cleandata.pop(i) if line.strip().startswith('#'):
cleandata.pop(i)
# Pop any variable assignment lines # Pop any variable assignment lines
cron_var = [] cron_var = []
for i, line in reversed(list(enumerate(cleandata))): for i, line in reversed(list(enumerate(cleandata))):
if '=' in line: if '=' in line:
var_line = cleandata.pop(i) var_line = cleandata.pop(i)
var_name = var_line.split('=', maxsplit=1)[0].strip() var_name = var_line.split('=', maxsplit=1)[0].strip()
var_value = var_line.split('=', maxsplit=1)[1].strip() var_value = var_line.split('=', maxsplit=1)[1].strip()
cron_var.append({'name': var_name, cron_var.append({'name': var_name,
'value': var_value}) 'value': var_value})
raw_output['variables'] = cron_var raw_output['variables'] = cron_var
# Pop any shortcut lines # Pop any shortcut lines
shortcut_list = [] shortcut_list = []
for i, line in reversed(list(enumerate(cleandata))): for i, line in reversed(list(enumerate(cleandata))):
if line.strip().startswith('@'): if line.strip().startswith('@'):
shortcut_line = cleandata.pop(i) shortcut_line = cleandata.pop(i)
occurrence = shortcut_line.split(maxsplit=1)[0].strip().lstrip('@') occurrence = shortcut_line.split(maxsplit=1)[0].strip().lstrip('@')
usr = shortcut_line.split(maxsplit=2)[1].strip() usr = shortcut_line.split(maxsplit=2)[1].strip()
cmd = shortcut_line.split(maxsplit=2)[2].strip() cmd = shortcut_line.split(maxsplit=2)[2].strip()
shortcut_list.append({'occurrence': occurrence, shortcut_list.append({'occurrence': occurrence,
'user': usr, 'user': usr,
'command': cmd}) 'command': cmd})
# Add header row for parsing # Add header row for parsing
cleandata[:0] = ['minute hour day_of_month month day_of_week user command'] cleandata[:0] = ['minute hour day_of_month month day_of_week user command']
if len(cleandata) > 1: if len(cleandata) > 1:
cron_list = jc.parsers.universal.simple_table_parse(cleandata) cron_list = jc.parsers.universal.simple_table_parse(cleandata)
raw_output['schedule'] = cron_list raw_output['schedule'] = cron_list
# Add shortcut entries back in # Add shortcut entries back in
for item in shortcut_list: for item in shortcut_list:
raw_output['schedule'].append(item) raw_output['schedule'].append(item)
if raw: if raw:
return raw_output return raw_output

6
tests/test_crontab.py
View File

@ -17,6 +17,12 @@ class MyTests(unittest.TestCase):
with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/centos-7.7/crontab.json'), 'r', encoding='utf-8') as f: with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/centos-7.7/crontab.json'), 'r', encoding='utf-8') as f:
self.centos_7_7_crontab_json = json.loads(f.read()) self.centos_7_7_crontab_json = json.loads(f.read())
def test_crontab_nodata(self):
"""
Test 'crontab' with no data
"""
self.assertEqual(jc.parsers.crontab.parse('', quiet=True), {})
def test_crontab_centos_7_7(self): def test_crontab_centos_7_7(self):
""" """
Test 'crontab' on Centos 7.7 Test 'crontab' on Centos 7.7

6
tests/test_crontab_u.py
View File

@ -23,6 +23,12 @@ class MyTests(unittest.TestCase):
with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/centos-7.7/crontab-u.json'), 'r', encoding='utf-8') as f: with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/centos-7.7/crontab-u.json'), 'r', encoding='utf-8') as f:
self.centos_7_7_crontab_u_json = json.loads(f.read()) self.centos_7_7_crontab_u_json = json.loads(f.read())
def test_crontab_u_nodata(self):
"""
Test 'crontab' with no data (has a user field)
"""
self.assertEqual(jc.parsers.crontab_u.parse('', quiet=True), {})
def test_crontab_u_ubuntu_18_4(self): def test_crontab_u_ubuntu_18_4(self):
""" """
Test 'crontab' on Ubuntu 18.4 (has a user field) Test 'crontab' on Ubuntu 18.4 (has a user field)