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

correct epoch_utc calculation. Fix for 12 hour vs. 24 hour representation

Browse Source
This commit is contained in:
Kelly Brazil
2021-03-23 13:55:23 -07:00
parent 55810ccd1f
commit 7cb8577b96
3 changed files with 70 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
docs/parsers/date.md
View File

@ -2,7 +2,8 @@
# jc.parsers.date
jc - JSON CLI output utility `date` command output parser
Calculated epoch time field is naive (i.e. based on the local time of the system the parser is run on) since there is no unambiguous timezone information in the `date` command output.
The `epoch` calculated timestamp field is naive (i.e. based on the local time of the system the parser is run on)
The `epoch_utc` calculated timestamp field is timezone-aware and is only available if the timezone field is UTC.
Usage (cli):
@ -27,29 +28,29 @@ Examples:
{
"year": 2021,
"month_num": 3,
"day": 22,
"hour": 20,
"minute": 47,
"second": 3,
"day": 23,
"hour": 17,
"minute": 41,
"second": 44,
"period": null,
"month": "Mar",
"weekday": "Mon",
"weekday_num": 1,
"timezone": "PDT",
"epoch": 1616471223
"weekday": "Tue",
"weekday_num": 2,
"timezone": "UTC",
"epoch": 1616546504,
"epoch_utc": 1616571704
}
$ date | jc --date -p -r
{
"year": "2021",
"month": "Mar",
"day": "22",
"weekday": "Mon",
"hour": "20",
"minute": "48",
"second": "12",
"timezone": "PDT"
"day": "23",
"weekday": "Tue",
"hour": "17",
"minute": "41",
"second": "44",
"timezone": "UTC"
}
@ -86,7 +87,8 @@ Returns:
"weekday": string,
"weekday_num": integer,
"timezone": string,
"epoch": integer
"epoch": integer, # naive timestamp
"epoch_utc": integer, # timezone-aware timestamp. Only available if timezone field is UTC
}

81
jc/parsers/date.py
View File

@ -1,6 +1,7 @@
"""jc - JSON CLI output utility `date` command output parser
Calculated epoch time field is naive (i.e. based on the local time of the system the parser is run on) since there is no unambiguous timezone information in the `date` command output.
The `epoch` calculated timestamp field is naive (i.e. based on the local time of the system the parser is run on)
The `epoch_utc` calculated timestamp field is timezone-aware and is only available if the timezone field is UTC.
Usage (cli):
@ -25,32 +26,32 @@ Examples:
{
"year": 2021,
"month_num": 3,
"day": 22,
"hour": 20,
"minute": 47,
"second": 3,
"day": 23,
"hour": 17,
"minute": 41,
"second": 44,
"period": null,
"month": "Mar",
"weekday": "Mon",
"weekday_num": 1,
"timezone": "PDT",
"epoch": 1616471223
"weekday": "Tue",
"weekday_num": 2,
"timezone": "UTC",
"epoch": 1616546504,
"epoch_utc": 1616571704
}
$ date | jc --date -p -r
{
"year": "2021",
"month": "Mar",
"day": "22",
"weekday": "Mon",
"hour": "20",
"minute": "48",
"second": "12",
"timezone": "PDT"
"day": "23",
"weekday": "Tue",
"hour": "17",
"minute": "41",
"second": "44",
"timezone": "UTC"
}
"""
from datetime import datetime
from datetime import datetime, timezone
import jc.utils
@ -92,9 +93,11 @@ def process(proc_data):
"weekday": string,
"weekday_num": integer,
"timezone": string,
"epoch": integer
"epoch": integer, # naive timestamp
"epoch_utc": integer, # timezone-aware timestamp. Only available if timezone field is UTC
}
"""
# ISO 8601 month numberings
month_map = {
"Jan": 1,
"Feb": 2,
@ -110,6 +113,7 @@ def process(proc_data):
"Dec": 12
}
# ISO 8601 weekday numberings
weekday_map = {
"Mon": 1,
"Tue": 2,
@ -124,26 +128,41 @@ def process(proc_data):
dt_year = int(proc_data['year'])
dt_month = month_map[proc_data['month']]
dt_day = int(proc_data['day'])
dt_hour = int(proc_data['hour'])
# fix for 12 vs. 24 hour output
if proc_data['period']:
if proc_data['period'].lower() == 'pm':
dt_hour = int(proc_data['hour']) + 12
else:
dt_hour = int(proc_data['hour'])
dt_minute = int(proc_data['minute'])
dt_second = int(proc_data['second'])
epoch_dt = datetime(dt_year, dt_month, dt_day, hour=dt_hour, minute=dt_minute, second=dt_second)
return {
"year": dt_year,
date_obj = {
'year': dt_year,
'month_num': dt_month,
"day": dt_day,
"hour": dt_hour,
"minute": dt_minute,
"second": dt_second,
"period": proc_data['period'] if 'period' in proc_data else None,
"month": proc_data['month'],
"weekday": proc_data['weekday'],
"weekday_num": weekday_map[proc_data['weekday']],
"timezone": proc_data['timezone'],
"epoch": int(epoch_dt.strftime('%s'))
'day': dt_day,
'hour': dt_hour,
'minute': dt_minute,
'second': dt_second,
'period': proc_data['period'] if 'period' in proc_data else None,
'month': proc_data['month'],
'weekday': proc_data['weekday'],
'weekday_num': weekday_map[proc_data['weekday']],
'timezone': proc_data['timezone'],
'epoch': int(epoch_dt.timestamp())
}
# create aware datetime object only if the timezone is UTC
if proc_data['timezone'] == 'UTC':
utc_epoch_dt = datetime(dt_year, dt_month, dt_day, hour=dt_hour, minute=dt_minute, second=dt_second, tzinfo=timezone.utc)
date_obj['epoch_utc'] = int(utc_epoch_dt.timestamp())
return date_obj
else:
return {}

1
tests/fixtures/ubuntu-20.04/date2.out vendored Normal file
View File

@ -0,0 +1 @@
Tue Mar 23 08:45:29 PM UTC 2021