mirror of
https://github.com/kellyjonbrazil/jc.git
synced 2025-06-21 00:19:42 +02:00
simplify None data scenario
This commit is contained in:
@ -157,9 +157,17 @@ def process(proc_data):
|
||||
"gid": integer,
|
||||
"group": string,
|
||||
"access_time": string, # - = null
|
||||
"access_time_epoch": integer, # naive timestamp
|
||||
"access_time_epoch_utc": integer, # timezone-aware timestamp
|
||||
"modify_time": string, # - = null
|
||||
"modify_time_epoch": integer, # naive timestamp
|
||||
"modify_time_epoch_utc": integer, # timezone-aware timestamp
|
||||
"change_time": string, # - = null
|
||||
"change_time_epoch": integer, # naive timestamp
|
||||
"change_time_epoch_utc": integer, # timezone-aware timestamp
|
||||
"birth_time": string, # - = null
|
||||
"birth_time_epoch": integer, # naive timestamp
|
||||
"birth_time_epoch_utc": integer, # timezone-aware timestamp
|
||||
"unix_device": integer,
|
||||
"rdev": integer,
|
||||
"block_size": integer,
|
||||
@ -177,13 +185,15 @@ def process(proc_data):
|
||||
except (ValueError):
|
||||
entry[key] = None
|
||||
|
||||
# turn - into null for time fields
|
||||
# turn - into null for time fields and add calculated timestamp fields
|
||||
for entry in proc_data:
|
||||
null_list = ['access_time', 'modify_time', 'change_time', 'birth_time']
|
||||
for key in null_list:
|
||||
if key in entry:
|
||||
if entry[key] == '-':
|
||||
entry[key] = None
|
||||
entry[key + '_epoch'] = jc.utils.parse_datetime_to_timestamp(entry[key])['timestamp_naive']
|
||||
entry[key + '_epoch_utc'] = jc.utils.parse_datetime_to_timestamp(entry[key])['timestamp_utc']
|
||||
|
||||
return proc_data
|
||||
|
||||
|
@ -109,6 +109,7 @@ def parse_datetime_to_timestamp(data):
|
||||
|
||||
If the conversion completely fails, all fields will be None.
|
||||
"""
|
||||
data = data or ''
|
||||
normalized_datetime = ''
|
||||
utc_tz = False
|
||||
dt = None
|
||||
|
Reference in New Issue
Block a user