Replace invalid CNAM or number with 'Private/Unknown' or '0000000000' values.

Bump version to 2.1.2

Author: thess

callattendant/config.py

@@ -20,7 +20,7 @@
 # and screened callers through to the home phone.
 #
 default_config = {
-    "VERSION": '2.1.1',
+    "VERSION": '2.1.2',
 
     "DEBUG": False,
     "TESTING": False,

callattendant/hardware/modem.py

@@ -334,11 +334,15 @@ def cid_validate(val, key, regex):
                             val = modem_data.split('=')[1].strip()
                             if cid_validate(val, NAME, r'^[A-Za-z][A-Za-z0-9 .,]{1,14}$'):
                                 call_record[NAME] = val
+                            else:
+                                call_record[NAME] = "Private/Unknown"
 
                         elif NMBR in modem_data:
                             val = modem_data.split('=')[1].strip()
                             if cid_validate(val, NMBR, r'^\d{4,17}$'):
                                 call_record[NMBR] = val
+                            else:
+                                call_record[NMBR] = "0000000000"
                     else:
                         # Caller ID validation is disabled
                         if DATE in modem_data:

setup.py

@@ -14,7 +14,7 @@
 
 setuptools.setup(
     name="callattendant",   # Product name on PyPi (Callattendant2)
-    version="2.1.1",        # Ensure this is in-sync with VERSION in config.py
+    version="2.1.2",        # Ensure this is in-sync with VERSION in config.py
     author="Ted Hess",
     author_email="thess@kitschensync.net",
     description="An automated call attendant and call blocker using a USR5637 or CX930xx modem",