From ca4ca72476b20032fc66820a176cb061ac22b38f Mon Sep 17 00:00:00 2001 From: James Woglom Date: Sat, 4 Dec 2021 21:56:30 -0500 Subject: [PATCH] add SKIP_NS_LAST_UPLOADED_CHECK workaround when running tconnectsync for past data. see #23 --- tconnectsync/secret.py | 1 + tconnectsync/sync/basal.py | 6 ++++++ tconnectsync/sync/bolus.py | 6 ++++++ tconnectsync/sync/pump_events.py | 6 ++++++ 4 files changed, 19 insertions(+) diff --git a/tconnectsync/secret.py b/tconnectsync/secret.py index b8f5376..771f238 100644 --- a/tconnectsync/secret.py +++ b/tconnectsync/secret.py @@ -37,6 +37,7 @@ AUTOUPDATE_FAILURE_MINUTES = get_number('AUTOUPDATE_FAILURE_MINUTES', '180') # 3 AUTOUPDATE_RESTART_ON_FAILURE = get_bool('AUTOUPDATE_RESTART_ON_FAILURE', 'false') ENABLE_TESTING_MODES = get_bool('ENABLE_TESTING_MODES', 'false') +SKIP_NS_LAST_UPLOADED_CHECK = get_bool('SKIP_NS_LAST_UPLOADED_CHECK', 'false') if __name__ == '__main__': for k in locals(): diff --git a/tconnectsync/sync/basal.py b/tconnectsync/sync/basal.py index e064545..c68c6ae 100644 --- a/tconnectsync/sync/basal.py +++ b/tconnectsync/sync/basal.py @@ -6,6 +6,7 @@ from ..parser.nightscout import ( NightscoutEntry ) from ..parser.tconnect import TConnectEntry +from ..secret import SKIP_NS_LAST_UPLOADED_CHECK logger = logging.getLogger(__name__) @@ -111,6 +112,11 @@ def ns_write_basal_events(nightscout, basalEvents, pretend=False): last_upload_time = arrow.get(last_upload["created_at"]) logger.info("Last Nightscout basal upload: %s" % last_upload_time) + if SKIP_NS_LAST_UPLOADED_CHECK: + logger.warning("Overriding last upload check") + last_upload = None + last_upload_time = None + add_count = 0 for event in basalEvents: if last_upload_time and arrow.get(event["time"]) < last_upload_time: diff --git a/tconnectsync/sync/bolus.py b/tconnectsync/sync/bolus.py index ff67f4f..4731dc5 100644 --- a/tconnectsync/sync/bolus.py +++ b/tconnectsync/sync/bolus.py @@ -8,6 +8,7 @@ from ..parser.nightscout import ( NightscoutEntry ) from ..parser.tconnect import TConnectEntry +from ..secret import SKIP_NS_LAST_UPLOADED_CHECK logger = logging.getLogger(__name__) @@ -64,6 +65,11 @@ def ns_write_bolus_events(nightscout, bolusEvents, pretend=False, include_bg=Fal last_upload_time = arrow.get(last_upload["created_at"]) logger.info("Last Nightscout bolus upload: %s" % last_upload_time) + if SKIP_NS_LAST_UPLOADED_CHECK: + logger.warning("Overriding last upload check") + last_upload = None + last_upload_time = None + add_count = 0 for event in bolusEvents: created_at = event["completion_time"] if not event["extended_bolus"] else event["bolex_start_time"] diff --git a/tconnectsync/sync/pump_events.py b/tconnectsync/sync/pump_events.py index de03a26..25e20e5 100644 --- a/tconnectsync/sync/pump_events.py +++ b/tconnectsync/sync/pump_events.py @@ -10,6 +10,7 @@ from ..parser.nightscout import ( NightscoutEntry ) from ..parser.tconnect import TConnectEntry +from ..secret import SKIP_NS_LAST_UPLOADED_CHECK logger = logging.getLogger(__name__) @@ -172,6 +173,11 @@ def _ns_write_pump_events(nightscout, events, buildNsEventFunc, eventType, prete last_upload_time = arrow.get(last_upload["created_at"]) logger.info("Last Nightscout %s: %s" % (eventType, last_upload_time)) + if SKIP_NS_LAST_UPLOADED_CHECK: + logger.warning("Overriding last upload check") + last_upload = None + last_upload_time = None + add_count = 0 for event in events: created_at = event["time"]