mirror of
https://github.com/jokob-sk/NetAlertX.git
synced 2025-12-06 17:15:38 -08:00
Sync
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
[](https://github.com/jokob-sk/NetAlertX)
|
||||
[](https://github.com/jokob-sk/NetAlertX)
|
||||
[](https://hub.docker.com/r/jokobsk/netalertx)
|
||||
[](https://hub.docker.com/r/jokobsk/netalertx)
|
||||
[](https://github.com/jokob-sk/NetAlertX/releases)
|
||||
|
||||
@@ -151,10 +151,10 @@ def main():
|
||||
write_notification(message, 'info', timeNowTZ())
|
||||
|
||||
|
||||
# Process any received data for the Device DB table
|
||||
# Process any received data for the Device DB table (ONLY JSON)
|
||||
# Create the file path
|
||||
|
||||
# Decode files, rename them, and get the list of files
|
||||
# Get all "last_result" files from the sync folder, decode, rename them, and get the list of files
|
||||
files_to_process = decode_and_rename_files(file_dir, file_prefix)
|
||||
|
||||
if len(files_to_process) > 0:
|
||||
@@ -192,6 +192,16 @@ def main():
|
||||
device['dev_SyncHubNodeName'] = tmp_SyncHubNodeName
|
||||
unique_mac_addresses.add(device['dev_MAC'])
|
||||
device_data.append(device)
|
||||
|
||||
# Rename the file to "processed_" + current name
|
||||
new_file_name = f"processed_{file_name}"
|
||||
new_file_path = os.path.join(file_dir, new_file_name)
|
||||
|
||||
# Overwrite if the new file already exists
|
||||
if os.path.exists(new_file_path):
|
||||
os.remove(new_file_path)
|
||||
|
||||
os.rename(file_path, new_file_path)
|
||||
|
||||
if len(device_data) > 0:
|
||||
# Retrieve existing dev_MAC values from the Devices table
|
||||
@@ -243,6 +253,9 @@ def main():
|
||||
|
||||
mylog('verbose', [message])
|
||||
write_notification(message, 'info', timeNowTZ())
|
||||
|
||||
|
||||
|
||||
|
||||
# Commit and close the connection
|
||||
conn.commit()
|
||||
|
||||
@@ -226,12 +226,14 @@ def execute_plugin(db, all_plugins, plugin, pluginsState = plugins_state() ):
|
||||
file_dir = os.path.join(pluginsPath, plugin["code_name"])
|
||||
file_prefix = 'last_result'
|
||||
|
||||
# Decode files, rename them, and get the list of files
|
||||
# Decode files, rename them, and get the list of files, this will return all files starting with the prefix, even if they are not encoded
|
||||
files_to_process = decode_and_rename_files(file_dir, file_prefix)
|
||||
|
||||
for filename in files_to_process:
|
||||
|
||||
full_path = os.path.join(file_dir, filename)
|
||||
|
||||
mylog('debug', [f'[Plugins] Processing file "{full_path}"'])
|
||||
|
||||
# Open the decrypted file and process its contents
|
||||
with open(full_path, 'r') as f:
|
||||
|
||||
Reference in New Issue
Block a user