Skip to content

Instantly share code, notes, and snippets.

@kk7ds
Created December 8, 2017 01:45
Show Gist options
  • Save kk7ds/dc92ddf5ee489081ac781d9910d67ee0 to your computer and use it in GitHub Desktop.
Save kk7ds/dc92ddf5ee489081ac781d9910d67ee0 to your computer and use it in GitHub Desktop.
diff --git a/nx584/controller.py b/nx584/controller.py
index fe64d56..4ee5d90 100644
--- a/nx584/controller.py
+++ b/nx584/controller.py
@@ -505,8 +505,15 @@ class NXController(object):
event.reportable = bool(frame.data[2] & 0x80)
event.zone_user_device = frame.data[3]
event.partition_number = frame.data[4]
- month = frame.data[5]
- day = frame.data[6]
+ euro_format = self._config.getboolean('config', 'euro_date_format',
+ fallback=False)
+ if euro_format:
+ month = frame.data[6]
+ day = frame.data[5]
+ else:
+ month = frame.data[5]
+ day = frame.data[6]
+
hour = frame.data[7]
minute = frame.data[8]
now = datetime.datetime.now()
@@ -514,9 +521,13 @@ class NXController(object):
year = now.year - 1
else:
year = now.year
- event.timestamp = datetime.datetime(
- year=year, month=month, day=day,
- hour=hour, minute=minute)
+ try:
+ event.timestamp = datetime.datetime(
+ year=year, month=month, day=day,
+ hour=hour, minute=minute)
+ except ValueError:
+ LOG.error('Log event had invalid date, or format needs to be set')
+ return
LOG.info('Log event: %s at %s' % (event.event_string,
event.timestamp))
_event = {'type': 'log',
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment