sjg/trx-rs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[refactor](trx-rs): fix clippy too_many_arguments warnings

Browse Source 
Bundle parameters into structs to reduce argument counts:
- geo.rs: find_passes_for_sat takes &TleEntry instead of individual fields
- listener.rs: handle_client takes ClientContext struct

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Signed-off-by: Stan Grams <sjg@haxx.space>
This commit is contained in:
Stan Grams
2026-03-29 11:13:29 +02:00
parent 01d0b9efdd
commit 944fd4a0fc
2 changed files with 56 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/trx-core/src/geo.rs
+28 -46
View File
@@ -461,18 +461,15 @@ fn compute_az_el(
/// Scan for passes of one satellite over a time window. /// Scan for passes of one satellite over a time window.
fn find_passes_for_sat( fn find_passes_for_sat(
name: &str,
norad_id: u32, norad_id: u32,
category: SatCategory, entry: &TleEntry,
line1: &str,
line2: &str,
obs_lat: f64, obs_lat: f64,
obs_lon: f64, obs_lon: f64,
start_ms: i64, start_ms: i64,
window_ms: i64, window_ms: i64,
) -> Vec<PassPrediction> { ) -> Vec<PassPrediction> {
let elements = let elements =
match Elements::from_tle(Some(name.to_string()), line1.as_bytes(), line2.as_bytes()) { match Elements::from_tle(Some(entry.name.clone()), entry.line1.as_bytes(), entry.line2.as_bytes()) {
Ok(e) => e, Ok(e) => e,
Err(_) => return vec![], Err(_) => return vec![],
}; };
@@ -522,9 +519,9 @@ fn find_passes_for_sat(
} else if in_pass { } else if in_pass {
// LOS occurred between previous step and this step. // LOS occurred between previous step and this step.
passes.push(PassPrediction { passes.push(PassPrediction {
satellite: name.to_string(), satellite: entry.name.clone(),
norad_id, norad_id,
category, category: entry.category,
aos_ms, aos_ms,
los_ms: t_ms, los_ms: t_ms,
max_elevation_deg: (max_el * 10.0).round() / 10.0, max_elevation_deg: (max_el * 10.0).round() / 10.0,
@@ -541,9 +538,9 @@ fn find_passes_for_sat(
// Pass in progress at end of window. // Pass in progress at end of window.
if in_pass { if in_pass {
passes.push(PassPrediction { passes.push(PassPrediction {
satellite: name.to_string(), satellite: entry.name.clone(),
norad_id, norad_id,
category, category: entry.category,
aos_ms, aos_ms,
los_ms: start_ms + window_ms, los_ms: start_ms + window_ms,
max_elevation_deg: (max_el * 10.0).round() / 10.0, max_elevation_deg: (max_el * 10.0).round() / 10.0,
@@ -580,11 +577,8 @@ pub fn compute_upcoming_passes(
let mut all_passes = Vec::new(); let mut all_passes = Vec::new();
for (&norad_id, entry) in store { for (&norad_id, entry) in store {
let passes = find_passes_for_sat( let passes = find_passes_for_sat(
&entry.name,
norad_id, norad_id,
entry.category, entry,
&entry.line1,
&entry.line2,
station_lat, station_lat,
station_lon, station_lon,
start_ms, start_ms,
@@ -946,17 +940,13 @@ NOAA 19
let start = 1774800000000_i64; // 2026-03-28 let start = 1774800000000_i64; // 2026-03-28
let window = 24 * 60 * 60 * 1000_i64; let window = 24 * 60 * 60 * 1000_i64;
let (l1, l2) = hardcoded_tle(33591).unwrap(); let (l1, l2) = hardcoded_tle(33591).unwrap();
let passes = find_passes_for_sat( let entry = TleEntry {
"NOAA 19", name: "NOAA 19".to_string(),
33591, line1: l1.to_string(),
SatCategory::Weather, line2: l2.to_string(),
l1, category: SatCategory::Weather,
l2, };
48.0, let passes = find_passes_for_sat(33591, &entry, 48.0, 11.0, start, window);
11.0,
start,
window,
);
assert!( assert!(
passes.len() >= 2 && passes.len() <= 10, passes.len() >= 2 && passes.len() <= 10,
"Expected 2-10 passes for NOAA-19 in 24h, got {}", "Expected 2-10 passes for NOAA-19 in 24h, got {}",
@@ -981,17 +971,13 @@ NOAA 19
let start = 1774800000000_i64; let start = 1774800000000_i64;
let window = 24 * 60 * 60 * 1000_i64; let window = 24 * 60 * 60 * 1000_i64;
let (l1, l2) = hardcoded_tle(25338).unwrap(); let (l1, l2) = hardcoded_tle(25338).unwrap();
let passes = find_passes_for_sat( let entry = TleEntry {
"NOAA 15", name: "NOAA 15".to_string(),
25338, line1: l1.to_string(),
SatCategory::Weather, line2: l2.to_string(),
l1, category: SatCategory::Weather,
l2, };
48.0, let passes = find_passes_for_sat(25338, &entry, 48.0, 11.0, start, window);
11.0,
start,
window,
);
assert!( assert!(
passes.len() >= 2, passes.len() >= 2,
"Expected at least 2 passes for NOAA-15 in 24h, got {}", "Expected at least 2 passes for NOAA-15 in 24h, got {}",
@@ -1008,17 +994,13 @@ NOAA 19
let start = 1774800000000_i64; let start = 1774800000000_i64;
let window = 24 * 60 * 60 * 1000_i64; let window = 24 * 60 * 60 * 1000_i64;
let (l1, l2) = hardcoded_tle(28654).unwrap(); let (l1, l2) = hardcoded_tle(28654).unwrap();
let passes = find_passes_for_sat( let entry = TleEntry {
"NOAA 18", name: "NOAA 18".to_string(),
28654, line1: l1.to_string(),
SatCategory::Weather, line2: l2.to_string(),
l1, category: SatCategory::Weather,
l2, };
48.0, let passes = find_passes_for_sat(28654, &entry, 48.0, 11.0, start, window);
11.0,
start,
window,
);
assert!( assert!(
passes.len() >= 2, passes.len() >= 2,
"Expected at least 2 passes for NOAA-18 in 24h, got {}", "Expected at least 2 passes for NOAA-18 in 24h, got {}",
src/trx-server/src/listener.rs
+28 -13
View File
@@ -65,6 +65,16 @@ struct SatPassCache {
result: trx_core::geo::PassPredictionResult, result: trx_core::geo::PassPredictionResult,
computed_at: Instant, computed_at: Instant,
} }
/// Shared state passed to each client handler.
struct ClientContext {
rigs: Arc<HashMap<String, RigHandle>>,
default_rig_id: String,
validator: Arc<SimpleTokenValidator>,
station_coords: Option<(f64, f64)>,
sat_pass_cache: Arc<Mutex<Option<SatPassCache>>>,
timeouts: ListenerTimeouts,
}
/// Run the JSON TCP listener, accepting client connections. /// Run the JSON TCP listener, accepting client connections.
/// ///
/// `rigs` is a shared map from rig_id → `RigHandle`. The first entry (by /// `rigs` is a shared map from rig_id → `RigHandle`. The first entry (by
@@ -90,15 +100,17 @@ pub async fn run_listener(
let (socket, peer) = accept?; let (socket, peer) = accept?;
info!("Client connected: {}", peer); info!("Client connected: {}", peer);
let rigs = Arc::clone(&rigs); let ctx = ClientContext {
let default_rig_id = default_rig_id.clone(); rigs: Arc::clone(&rigs),
let validator = Arc::clone(&validator); default_rig_id: default_rig_id.clone(),
validator: Arc::clone(&validator),
station_coords,
sat_pass_cache: Arc::clone(&sat_pass_cache),
timeouts,
};
let client_shutdown_rx = shutdown_rx.clone(); let client_shutdown_rx = shutdown_rx.clone();
let coords = station_coords;
let cache = Arc::clone(&sat_pass_cache);
let client_timeouts = timeouts;
tokio::spawn(async move { tokio::spawn(async move {
if let Err(e) = handle_client(socket, peer, rigs, default_rig_id, validator, coords, cache, client_timeouts, client_shutdown_rx).await { if let Err(e) = handle_client(socket, peer, ctx, client_shutdown_rx).await {
error!("Client {} error: {:?}", peer, e); error!("Client {} error: {:?}", peer, e);
} }
}); });
@@ -192,14 +204,17 @@ async fn send_response(
async fn handle_client( async fn handle_client(
socket: TcpStream, socket: TcpStream,
addr: SocketAddr, addr: SocketAddr,
rigs: Arc<HashMap<String, RigHandle>>, ctx: ClientContext,
default_rig_id: String,
validator: Arc<SimpleTokenValidator>,
station_coords: Option<(f64, f64)>,
sat_pass_cache: Arc<Mutex<Option<SatPassCache>>>,
timeouts: ListenerTimeouts,
mut shutdown_rx: watch::Receiver<bool>, mut shutdown_rx: watch::Receiver<bool>,
) -> std::io::Result<()> { ) -> std::io::Result<()> {
let ClientContext {
rigs,
default_rig_id,
validator,
station_coords,
sat_pass_cache,
timeouts,
} = ctx;
let (reader, mut writer) = socket.into_split(); let (reader, mut writer) = socket.into_split();
let mut reader = BufReader::new(reader); let mut reader = BufReader::new(reader);