From 2680769fcd6ade04bff70aeceaf90bf989c5bbd6 Mon Sep 17 00:00:00 2001
From: K2IE <dan@islenet.com>
Date: Tue, 2 Apr 2024 13:19:42 -0400
Subject: [PATCH] Fix expiration date parsing issue

---
 noaacap/DEBIAN/control                    |  2 +-
 noaacap/usr/local/bin/noaacap.py          | 10 ++++++----
 noaacap/usr/local/share/noaacap/CHANGELOG |  4 ++++
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/noaacap/DEBIAN/control b/noaacap/DEBIAN/control
index 1c3d149..af9833f 100644
--- a/noaacap/DEBIAN/control
+++ b/noaacap/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: noaacap
-Version: 1.3.0
+Version: 1.3.1
 Section: hamradio
 Priority: extra
 Maintainer: Dan Srebnick <k2ie at k2ie.net>
diff --git a/noaacap/usr/local/bin/noaacap.py b/noaacap/usr/local/bin/noaacap.py
index b7c22c6..7ae19b7 100755
--- a/noaacap/usr/local/bin/noaacap.py
+++ b/noaacap/usr/local/bin/noaacap.py
@@ -6,7 +6,7 @@
 ##
 ## See /usr/local/share/noaacap/CHANGELOG for change history
 ##
-version = "1.3"
+version = "1.3.1"
 
 import sys
 import pytz
@@ -199,16 +199,18 @@ for i in range(0, count):
       if ProductClass != "/O":	 		#Loop if not operational
          continue
 
+      EventEnd = "20" + EventEnd
+
       # Is alert expired?
-      now = datetime.datetime.now(datetime.timezone.utc)
+      now = datetime.datetime.now(datetime.timezone.utc).replace(microsecond=0)
       # Fix exit on exp = '000000T0000Z'
       try:
          exp = dateutil.parser.parse(EventEnd)
       except:
          exp = now
 
-#      log.debug('Time Now:   ' + datetime.datetime.strftime(now,"%y-%m-%d %H:%M") + '\n' + \
-#                'Expiration: ' + datetime.datetime.strftime(exp,"%y-%m-%d %H:%M"))
+#      log.debug('Time Now:   ' + datetime.datetime.strftime(now,"%y-%m-%d %H:%M")) 
+#      log.debug('Expiration: ' + datetime.datetime.strftime(exp,"%y-%m-%d %H:%M"))
 
       if now > exp:
          log.debug("Alert Expired")
diff --git a/noaacap/usr/local/share/noaacap/CHANGELOG b/noaacap/usr/local/share/noaacap/CHANGELOG
index a1fba3d..4de785d 100644
--- a/noaacap/usr/local/share/noaacap/CHANGELOG
+++ b/noaacap/usr/local/share/noaacap/CHANGELOG
@@ -1,5 +1,9 @@
 noaacap changelog
 ##
+Version: 1.3.1
+Release: April 2, 2024
+Fix expiration date parsing issue
+##
 Version: 1.3
 Release: TBD
 Fixed truncation bug in compressed zone list