fix HRS_TO_KEEP_NEWDEV #777

This commit is contained in:
jokob-sk
2024-08-31 12:56:46 +10:00
parent 3473fabdbf
commit 955472ef5c
7 changed files with 85 additions and 52 deletions

View File

@@ -147,8 +147,9 @@ def cleanup_database (dbPath, DAYS_TO_KEEP_EVENTS, PHOLUS_DAYS_DATA, HRS_TO_KEEP
# Cleanup New Devices
if HRS_TO_KEEP_NEWDEV != 0:
mylog('verbose', [f'[{pluginName}] Devices: Delete all New Devices older than {str(HRS_TO_KEEP_NEWDEV)} hours (HRS_TO_KEEP_NEWDEV setting)'])
cursor.execute (f"""DELETE FROM Devices
WHERE dev_NewDevice = 1 AND dev_FirstConnection < date('now', '+{str(HRS_TO_KEEP_NEWDEV)} hour')""")
query = f"""DELETE FROM Devices WHERE dev_NewDevice = 1 AND dev_FirstConnection < date('now', '-{str(HRS_TO_KEEP_NEWDEV)} hour')"""
mylog('verbose', [f'[{pluginName}] Query: {query} '])
cursor.execute (query)
# -----------------------------------------------------
# Cleanup Pholus_Scan

View File

@@ -34,43 +34,43 @@
{
"elementType": "select",
"elementOptions": [{ "multiple": "true", "ordeable": "true" }],
"transformers": []
"transformers": ["getString"]
}
]
},
"maxLength": 50,
"default_value": [
"getString-Device_TableHead_Icon-value-3",
"getString-Device_TableHead_Name-value-0",
"getString-Device_TableHead_Type-value-2",
"getString-Device_TableHead_LastIP-value-8",
"getString-Device_TableHead_Status-value-10",
"getString-Device_TableHead_MAC_full-value-11"
"Device_TableHead_Icon",
"Device_TableHead_Name",
"Device_TableHead_Type",
"Device_TableHead_LastIP",
"Device_TableHead_Status",
"Device_TableHead_MAC_full"
],
"options": [
"getString-Device_TableHead_Name-value-0",
"getString-Device_TableHead_Owner-value-1",
"getString-Device_TableHead_Type-value-2",
"getString-Device_TableHead_Icon-value-3",
"getString-Device_TableHead_Favorite-value-4",
"getString-Device_TableHead_Group-value-5",
"getString-Device_TableHead_FirstSession-value-6",
"getString-Device_TableHead_LastSession-value-7",
"getString-Device_TableHead_LastIP-value-8",
"getString-Device_TableHead_MAC-value-9",
"getString-Device_TableHead_Status-value-10",
"getString-Device_TableHead_MAC_full-value-11",
"getString-Device_TableHead_LastIPOrder-value-12",
"getString-Device_TableHead_Rowid-value-13",
"getString-Device_TableHead_Parent_MAC-value-14",
"getString-Device_TableHead_Connected_Devices-value-15",
"getString-Device_TableHead_Location-value-16",
"getString-Device_TableHead_Vendor-value-17",
"getString-Device_TableHead_Port-value-18",
"getString-Device_TableHead_GUID-value-19",
"getString-Device_TableHead_SyncHubNodeName-value-20",
"getString-Device_TableHead_NetworkSite-value-21",
"getString-Device_TableHead_SSID-value-22"
"Device_TableHead_Name",
"Device_TableHead_Owner",
"Device_TableHead_Type",
"Device_TableHead_Icon",
"Device_TableHead_Favorite",
"Device_TableHead_Group",
"Device_TableHead_FirstSession",
"Device_TableHead_LastSession",
"Device_TableHead_LastIP",
"Device_TableHead_MAC",
"Device_TableHead_Status",
"Device_TableHead_MAC_full",
"Device_TableHead_LastIPOrder",
"Device_TableHead_Rowid",
"Device_TableHead_Parent_MAC",
"Device_TableHead_Connected_Devices",
"Device_TableHead_Location",
"Device_TableHead_Vendor",
"Device_TableHead_Port",
"Device_TableHead_GUID",
"Device_TableHead_SyncHubNodeName",
"Device_TableHead_NetworkSite",
"Device_TableHead_SSID"
],
"localized": ["name", "description"],
"name": [