From e46e21b486853cde55e5872ce2d0661df220f445 Mon Sep 17 00:00:00 2001
From: Tobias Brunner <tobias@tobru.ch>
Date: Sat, 8 Feb 2020 18:02:32 +0100
Subject: [PATCH] fix several issues

---
 README.md                | 10 ----------
 library/emailhandling.py |  1 +
 library/lodur.py         | 23 +++++++++++++++++------
 main.py                  |  2 +-
 4 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index 789da6a..2dce8cc 100644
--- a/README.md
+++ b/README.md
@@ -95,16 +95,6 @@ Configuration is done via environment variables:
 
 Environment variables can also be stored in a `.env` file.
 
-## TODO
-
-* Generalize
-* IMAP Idle
-* Send statistics to InfluxDB
-* Webapp to see what's going on
-* Get as many data out of the PDFs as possible
-* Simple webform to fill-in missing data (skipping Lodur completely)
-  * Webapp for chosing who was there during the Einsatz (tablet ready)
-
 ## WCPGW
 
 What could possibly go wrong? A lot!
diff --git a/library/emailhandling.py b/library/emailhandling.py
index 0cf5a55..1f9858f 100644
--- a/library/emailhandling.py
+++ b/library/emailhandling.py
@@ -20,6 +20,7 @@ class EmailHandling:
 
         self.tmp_dir = tmp_dir
         try:
+            # TODO timeout
             self.imap = imaplib.IMAP4_SSL(server)
             self.imap.login(username, password)
             self.imap.select(mailbox, readonly=False)
diff --git a/library/lodur.py b/library/lodur.py
index 3e31e74..95847fc 100644
--- a/library/lodur.py
+++ b/library/lodur.py
@@ -5,6 +5,7 @@
 import re
 import logging
 from datetime import datetime
+from datetime import timedelta
 import mechanicalsoup
 
 class Lodur:
@@ -135,6 +136,15 @@ class Lodur:
             wer_ala = 'UNKNOWN'
             adr = 'UNKNOWN'
 
+        # Prepare end date and time, can cross midnight
+        # We blindly add 1 hours - that's the usual length of an Einsatz
+        time_end = time + timedelta(hours=1)
+        # check if date is higher after adding 1 hour, this means we crossed midnight
+        if datetime.date(time_end) > datetime.date(time):
+            date_end = date + timedelta(days=1)
+        else:
+            date_end = date
+
         # Fill in form data
         self.logger.info('[%s] Preparing form data for Einsatzrapport', f_id)
         lodur_data = {
@@ -145,13 +155,13 @@ class Lodur:
             'dtv_d': str(date.day), # 04. Datum von
             'dtv_m': str(date.month), # 04. Datum von
             'dtv_y': str(date.year), # 04. Datum von
-            'dtb_d': str(date.day), # 04. Datum bis - we dont know yet the end date
-            'dtb_m': str(date.month), # 04. Datum bis - assume the same day
-            'dtb_y': str(date.year), # 04. Datum bis
+            'dtb_d': str(date_end.day), # 04. Datum bis
+            'dtb_m': str(date_end.month), # 04. Datum bis
+            'dtb_y': str(date_end.year), # 04. Datum bis
             'ztv_h': str(time.hour), # 05. Zeit von
             'ztv_m': str(time.minute), # 05. Zeit von
-            'ztb_h': str(time.hour + 1), # 05. Zeit bis - we dont know yet the end time
-            'ztb_m': str(time.minute), # 05. Zeit bis - just add 1 hour and correct later
+            'ztb_h': str(time_end.hour), # 05. Zeit bis - we dont know yet the end time
+            'ztb_m': str(time_end.minute), # 05. Zeit bis - just add 1 hour and correct later
             'e_ort_1': '306', # 06. Einsatzort: Urdorf 306, Birmensdorf 298
             'eins_ereig': eins_ereig, # 07. Ereignis
             'adr': adr, # 08. Adresse
@@ -280,6 +290,7 @@ class Lodur:
             # very ugly way to find the assigned event id by lodur
             # lodur adds a script element at the bottom of the returned html
             # with the location to reload the page - containing the assigned event id
+            # print(response.text)
             lodur_id = re.search('modul=36&event=([0-9].*)&edit=1&what=144', response.text).group(1)
             self.logger.info('[%s] Lodur assigned the event_id %s', lodur_data['e_r_num'], lodur_id)
 
@@ -291,7 +302,7 @@ class Lodur:
                 self.url +
                 '?modul=36&edit=1&what=144&event=' + lodur_id
             ).text
-            auto_num = re.search(r"fdata\['auto_num'\]\[2\]='(.*)';", content).group(1)
+            auto_num = re.search(r"\"([0-9]{4}\|[0-9]{1,3})\"", content).group(1)
             self.logger.info('[%s] Lodur assigned the auto_num %s', lodur_data['e_r_num'], auto_num)
 
             return lodur_id, auto_num
diff --git a/main.py b/main.py
index 6fe673d..af0000e 100644
--- a/main.py
+++ b/main.py
@@ -34,7 +34,7 @@ LODUR_BASE_URL = os.getenv("LODUR_BASE_URL")
 HEARTBEAT_URL = os.getenv("HEARTBEAT_URL")
 PUSHOVER_API_TOKEN = os.getenv("PUSHOVER_API_TOKEN")
 PUSHOVER_USER_KEY = os.getenv("PUSHOVER_USER_KEY")
-PYLOKID_VERSION = "2.1.1"
+PYLOKID_VERSION = "2.1.2"
 
 def main():
     """ main """