diff --git a/Plugin/unraid/api/arrs.php b/Plugin/unraid/api/arrs.php index 597f1ed..08b7221 100644 --- a/Plugin/unraid/api/arrs.php +++ b/Plugin/unraid/api/arrs.php @@ -7,23 +7,4 @@ if ($_vv_cached !== null) { echo json_encode($_vv_cached); exit; } unset($_vv_cached); require_once dirname(__DIR__) . '/include/arrs.php'; - -$data = vv_arrs_all(); -$vars = vv_conf_vars(); -$myHost = vv_detect_host(); -$myId = strtoupper($myHost); - -$data['settings'] = [ - 'arr_sync_enabled' => ($vars['ARR_SYNC_ENABLED'] ?? 'true') !== 'false', - 'sonarr_recovery' => ($vars[$myId . '_SONARR_RECOVERY'] ?? 'true') !== 'false', - 'radarr_recovery' => ($vars[$myId . '_RADARR_RECOVERY'] ?? 'true') !== 'false', - 'lidarr_recovery' => ($vars[$myId . '_LIDARR_RECOVERY'] ?? 'true') !== 'false', - 'recovery_age_hours' => (int)($vars['ARR_IMPORT_RECOVERY_AGE'] ?? 6), - 'sonarr_port' => (int)($vars['ARR_SYNC_SONARR_PORT'] ?? 8989), - 'radarr_port' => (int)($vars['ARR_SYNC_RADARR_PORT'] ?? 7878), - 'lidarr_port' => (int)($vars['ARR_SYNC_LIDARR_PORT'] ?? 8686), - 'my_host' => $myHost, - 'my_id' => $myId, -]; - -echo json_encode($data); +echo json_encode(vv_arrs_all()); diff --git a/Plugin/unraid/include/arrs.php b/Plugin/unraid/include/arrs.php index 9cff157..266d4a0 100644 --- a/Plugin/unraid/include/arrs.php +++ b/Plugin/unraid/include/arrs.php @@ -268,11 +268,26 @@ function vv_arrs_all(): array { $result[] = $nodeOut; } + $vars = vv_conf_vars(); + $myId = strtoupper($currentHost); + return [ 'nodes' => $result, 'sync' => vv_arr_sync_stats(), 'recovery' => vv_arr_recovery_stats(), 'host' => $currentHost, + 'settings' => [ + 'arr_sync_enabled' => ($vars['ARR_SYNC_ENABLED'] ?? 'true') !== 'false', + 'sonarr_recovery' => ($vars[$myId . '_SONARR_RECOVERY'] ?? 'true') !== 'false', + 'radarr_recovery' => ($vars[$myId . '_RADARR_RECOVERY'] ?? 'true') !== 'false', + 'lidarr_recovery' => ($vars[$myId . '_LIDARR_RECOVERY'] ?? 'true') !== 'false', + 'recovery_age_hours' => (int)($vars['ARR_IMPORT_RECOVERY_AGE'] ?? 6), + 'sonarr_port' => (int)($vars['ARR_SYNC_SONARR_PORT'] ?? 8989), + 'radarr_port' => (int)($vars['ARR_SYNC_RADARR_PORT'] ?? 7878), + 'lidarr_port' => (int)($vars['ARR_SYNC_LIDARR_PORT'] ?? 8686), + 'my_host' => $currentHost, + 'my_id' => $myId, + ], 'ts' => time(), ]; }