From f9b1ea70de352cad5316882c1b83709dfdeec1cf Mon Sep 17 00:00:00 2001
From: pucherot <pucherot@users.noreply.github.com>
Date: Fri, 15 Jan 2021 09:12:52 +0100
Subject: [PATCH] v2.56

BUGFIX #23
---
 back/pialert.conf                             |   4 +-
 back/pialert.py                               |  37 ++++++++++++++----
 .../{pialert_2.55.tar => pialert_2.56.tar}    | Bin 58521600 -> 58521600 bytes
 install/pialert_latest.tar                    | Bin 58521600 -> 58521600 bytes
 4 files changed, 32 insertions(+), 9 deletions(-)
 rename install/{pialert_2.55.tar => pialert_2.56.tar} (99%)

diff --git a/back/pialert.conf b/back/pialert.conf
index e2abf7dd..393f316b 100644
--- a/back/pialert.conf
+++ b/back/pialert.conf
@@ -1,6 +1,6 @@
-VERSION           = '2.55'
+VERSION           = '2.56'
 VERSION_YEAR      = '2021'
-VERSION_DATE      = '2021-01-13'
+VERSION_DATE      = '2021-01-15'
 
 DB_PATH           = '/home/pi/pialert/db/pialert.db'
 LOG_PATH          = '/home/pi/pialert/log'
diff --git a/back/pialert.py b/back/pialert.py
index 2ef322df..899c536e 100644
--- a/back/pialert.py
+++ b/back/pialert.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 #
-# Pi.Alert v2.55  /  2021-01-13
-# Puche 2020
+# Pi.Alert v2.56  /  2021-01-15
+# Puche 2021
 # GNU GPLv3
 
 
@@ -712,16 +712,39 @@ def create_new_devices ():
 
     # DHCP Leases - Create New Devices
     print_log ('New devices - 6 DHCP Leases Create devices')
-    sql.execute ("""INSERT INTO Devices (dev_MAC, dev_name, dev_Vendor,
-                        dev_LastIP, dev_FirstConnection, dev_LastConnection,
+    # BUGFIX #23 - Duplicated MAC in DHCP.Leases
+    # TEST - Force Duplicated MAC
+        # sql.execute ("""INSERT INTO DHCP_Leases VALUES
+        #                 (1610700000, 'TEST1', '10.10.10.1', 'Test 1', '*')""")
+        # sql.execute ("""INSERT INTO DHCP_Leases VALUES
+        #                 (1610700000, 'TEST2', '10.10.10.2', 'Test 2', '*')""")
+    sql.execute ("""INSERT INTO Devices (dev_MAC, dev_name, dev_LastIP, 
+                        dev_Vendor, dev_FirstConnection, dev_LastConnection,
                         dev_ScanCycle, dev_AlertEvents, dev_AlertDeviceDown,
                         dev_PresentLastScan)
-                    SELECT DHCP_MAC, DHCP_Name, '(unknown)', DHCP_IP, ?, ?,
-                        1, 1, 0, 1
-                    FROM DHCP_Leases
+                    SELECT DISTINCT DHCP_MAC,
+                        (SELECT DHCP_Name FROM DHCP_Leases AS D2
+                         WHERE D2.DHCP_MAC = D1.DHCP_MAC
+                         ORDER BY DHCP_DateTime DESC LIMIT 1),
+                        (SELECT DHCP_IP FROM DHCP_Leases AS D2
+                         WHERE D2.DHCP_MAC = D1.DHCP_MAC
+                         ORDER BY DHCP_DateTime DESC LIMIT 1),
+                        '(unknown)', ?, ?, 1, 1, 0, 1
+                    FROM DHCP_Leases AS D1
                     WHERE NOT EXISTS (SELECT 1 FROM Devices
                                       WHERE dev_MAC = DHCP_MAC) """,
                     (startTime, startTime) ) 
+
+    # sql.execute ("""INSERT INTO Devices (dev_MAC, dev_name, dev_Vendor,
+    #                     dev_LastIP, dev_FirstConnection, dev_LastConnection,
+    #                     dev_ScanCycle, dev_AlertEvents, dev_AlertDeviceDown,
+    #                     dev_PresentLastScan)
+    #                 SELECT DHCP_MAC, DHCP_Name, '(unknown)', DHCP_IP, ?, ?,
+    #                     1, 1, 0, 1
+    #                 FROM DHCP_Leases
+    #                 WHERE NOT EXISTS (SELECT 1 FROM Devices
+    #                                   WHERE dev_MAC = DHCP_MAC) """,
+    #                 (startTime, startTime) ) 
     print_log ('New Devices end')
 
 #-------------------------------------------------------------------------------
diff --git a/install/pialert_2.55.tar b/install/pialert_2.56.tar
similarity index 99%
rename from install/pialert_2.55.tar
rename to install/pialert_2.56.tar
index e48d214d2931a29e9111462b1caa19d3dc2b5f0c..367517210e302c337722e498ec234cd1dc53c437 100644
GIT binary patch
delta 5582
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

delta 4695
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
SLB5NO-46dA;)AY*js6?81OamZ

diff --git a/install/pialert_latest.tar b/install/pialert_latest.tar
index e48d214d2931a29e9111462b1caa19d3dc2b5f0c..367517210e302c337722e498ec234cd1dc53c437 100644
GIT binary patch
delta 5582
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

delta 4695
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
SLB5NO-46dA;)AY*js6?81OamZ