vh/NetAlertX
1
0
Fork 0
mirror of https://github.com/jokob-sk/NetAlertX.git synced 2025-12-07 09:36:05 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

🔃 Sync Hub v0.7.2

Browse Source
This commit is contained in:
jokob-sk
2024-06-08 09:34:07 +10:00
parent f077c85c2d
commit 0d83ed3179
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
front/plugins/sync/hub.php
View File

@@ -35,10 +35,11 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
} }
// Generate a unique file path to avoid overwriting existing files // Generate a unique file path to avoid overwriting existing files
$files = glob("{$storage_path}/last_result.encoded.{$node_name}.*.log"); $files = glob("{$storage_path}/last_result.{encoded,decoded}.{$node_name}.*.log", GLOB_BRACE);
$file_count = count($files) + 1; $file_count = count($files) + 1;
$file_path = "{$storage_path}/last_result.encoded.{$node_name}.{$file_count}.log"; $file_path = "{$storage_path}/last_result.encoded.{$node_name}.{$file_count}.log";
// Save the decoded data to the file // Save the decoded data to the file
file_put_contents($file_path, $data); file_put_contents($file_path, $data);
http_response_code(200); http_response_code(200);

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

@@ -106,23 +106,27 @@ def main():
mylog('verbose', [f'[{pluginName}] Devices files to process: "{files_to_process}"']) mylog('verbose', [f'[{pluginName}] Devices files to process: "{files_to_process}"'])
for file_path in files_to_process: for file_name in files_to_process:
# only process received .log files, skipping the one logging the progress of this plugin # only process received .log files, skipping the one logging the progress of this plugin
if file_path != 'last_result.log': if file_name != 'last_result.log':
mylog('verbose', [f'[{pluginName}] Processing: "{file_path}"']) mylog('verbose', [f'[{pluginName}] Processing: "{file_name}"'])
# Store e.g. Node_1 from last_result.encoded.Node_1.1.log # Store e.g. Node_1 from last_result.encoded.Node_1.1.log
tmp_SyncHubNodeName = '' tmp_SyncHubNodeName = ''
if len(file_path.split('.')) > 3: if len(file_name.split('.')) > 3:
tmp_SyncHubNodeName = file_path.split('.')[2] tmp_SyncHubNodeName = file_name.split('.')[2]
file_path = f"{INSTALL_PATH}/front/plugins/sync/{file_name}"
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']:
device['dev_SyncHubNodeName'] = tmp_SyncHubNodeName if device['dev_MAC'] not in unique_mac_addresses:
unique_mac_addresses.add(device['dev_MAC']) device['dev_SyncHubNodeName'] = tmp_SyncHubNodeName
device_data.append(device) unique_mac_addresses.add(device['dev_MAC'])
device_data.append(device)
if len(device_data) > 0: if len(device_data) > 0:
# Retrieve existing dev_MAC values from the Devices table # Retrieve existing dev_MAC values from the Devices table