vh/NetAlertX
1
0
Fork 0
mirror of https://github.com/jokob-sk/NetAlertX.git synced 2026-04-08 03:01:29 -07:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

PLG: sync handle mixed case

Browse Source 
Signed-off-by: jokob-sk <jokob.sk@gmail.com>
This commit is contained in:
jokob-sk
2026-03-16 21:03:47 +11:00
parent 67cab9d606
commit 23e16ae4fa
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
front/plugins/sync/sync.py
View File

@@ -187,9 +187,10 @@ def main():
with open(file_path, 'r') as f: with open(file_path, 'r') as f:
data = json.load(f) data = json.load(f)
for device in data['data']: for device in data['data']:
if device['devMac'] not in unique_mac_addresses: device['devMac'] = str(device['devMac']).lower()
if device['devMac'].lower() not in unique_mac_addresses:
device['devSyncHubNode'] = syncHubNodeName device['devSyncHubNode'] = syncHubNodeName
unique_mac_addresses.add(device['devMac']) unique_mac_addresses.add(device['devMac'].lower())
device_data.append(device) device_data.append(device)
# Rename the file to "processed_" + current name # Rename the file to "processed_" + current name
@@ -206,7 +207,7 @@ def main():
# Retrieve existing devMac values from the Devices table # Retrieve existing devMac values from the Devices table
placeholders = ', '.join('?' for _ in unique_mac_addresses) placeholders = ', '.join('?' for _ in unique_mac_addresses)
cursor.execute(f'SELECT devMac FROM Devices WHERE devMac IN ({placeholders})', tuple(unique_mac_addresses)) cursor.execute(f'SELECT devMac FROM Devices WHERE devMac IN ({placeholders})', tuple(unique_mac_addresses))
existing_mac_addresses = set(row[0] for row in cursor.fetchall()) existing_mac_addresses = set(row[0].lower() for row in cursor.fetchall())
# insert devices into the last_result.log and thus CurrentScan table to manage state # insert devices into the last_result.log and thus CurrentScan table to manage state
for device in device_data: for device in device_data:
@@ -229,7 +230,10 @@ def main():
db_columns = {row[1] for row in cursor.fetchall()} db_columns = {row[1] for row in cursor.fetchall()}
# Filter out existing devices # Filter out existing devices
new_devices = [device for device in device_data if device['devMac'] not in existing_mac_addresses] new_devices = [
device for device in device_data
if device['devMac'].lower() not in existing_mac_addresses
]
mylog('verbose', [f'[{pluginName}] All devices: "{len(device_data)}"']) mylog('verbose', [f'[{pluginName}] All devices: "{len(device_data)}"'])
mylog('verbose', [f'[{pluginName}] New devices: "{len(new_devices)}"']) mylog('verbose', [f'[{pluginName}] New devices: "{len(new_devices)}"'])