From c8652ba2115cf71eaf968ef9b7b96e378549e7f0 Mon Sep 17 00:00:00 2001
From: Lorenz Stechauner <lorenz.stechauner@necronda.net>
Date: Sun, 2 Apr 2023 18:11:35 +0200
Subject: [PATCH] Fixes in migrate.py

---
 wgmaster/migrate.py | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/wgmaster/migrate.py b/wgmaster/migrate.py
index 2d47ef0..4592efc 100755
--- a/wgmaster/migrate.py
+++ b/wgmaster/migrate.py
@@ -75,28 +75,28 @@ STREET_NAMES: Dict[str, str] = {
 }
 
 
-def success(mgnr: int, key: str, value: str) -> None:
+def success(mgnr: int, key: str, value) -> None:
     if not args.quiet:
         print(f'\x1B[1;32m{mgnr:>6}: {key:<12} {value}\x1B[0m', file=sys.stderr)
 
 
-def warning(mgnr: int, key: str, value: str) -> None:
+def warning(mgnr: int, key: str, value) -> None:
     print(f'\x1B[1;33m{mgnr:>6}: {key:<12} {value}\x1B[0m', file=sys.stderr)
 
 
-def invalid(mgnr: int, key: str, value: str) -> None:
+def invalid(mgnr: int, key: str, value) -> None:
     print(f'\x1B[1;31m{mgnr:>6}: {key:<12} {value}\x1B[0m', file=sys.stderr)
 
 
-def warning_delivery(lsnr: str, mgnr: int, key:str, value: str) -> None:
+def warning_delivery(lsnr: str, mgnr: int, key: str, value) -> None:
     print(f'\x1B[1;33m{lsnr:<13} ({mgnr:>6}): {key:<12} {value}\x1B[0m', file=sys.stderr)
 
 
-def invalid_delivery(lsnr: str, mgnr: int, key: str, value: str) -> None:
+def invalid_delivery(lsnr: str, mgnr: int, key: str, value) -> None:
     print(f'\x1B[1;31m{lsnr:<13} ({mgnr:>6}): {key:<12} {value}\x1B[0m', file=sys.stderr)
 
 
-def convert(mgnr: int, key: str, old_value: str, new_value: str) -> None:
+def convert(mgnr: int, key: str, old_value: str, new_value) -> None:
     if not args.quiet:
         print(f'\x1B[1m{mgnr:>6}: {key:<12} "{old_value}" -> "{new_value}"\x1B[0m', file=sys.stderr)
 
@@ -654,7 +654,7 @@ def migrate_deliveries(in_dir: str, out_dir: str) -> None:
     modifiers = {m['ASNR']: m for m in csv.parse(f'{in_dir}/TAbschlaege.csv') if m['Bezeichnung']}
     delivery_map = {}
     seasons = {}
-    comments = {}
+    comments: Dict[str, str] = {}
 
     with open(f'{out_dir}/delivery.csv', 'w+') as f_delivery, \
             open(f'{out_dir}/delivery_part.csv', 'w+') as f_part:
@@ -665,7 +665,8 @@ def migrate_deliveries(in_dir: str, out_dir: str) -> None:
         for d in sorted(csv.parse(f'{in_dir}/TLieferungen.csv'), key=lambda l: f'{l["Datum"]}T{l["Uhrzeit"]}'):
             lsnr: str = d['Lieferscheinnummer']
             if d['Storniert'] or lsnr is None:
-                comments[lsnr] = d['Anmerkung']
+                if lsnr is not None:
+                    comments[lsnr] = d['Anmerkung']
                 continue
 
             date: datetime.date = d['Datum']