diff --git a/src/main.rs b/src/main.rs index c387f78..b27b54d 100644 --- a/src/main.rs +++ b/src/main.rs @@ -83,13 +83,13 @@ struct Cli { #[arg(short = 'y', long, allow_negative_numbers = true)] my_lat: Option, - /// Spotter longitude DD.dddd; to send negaitve (W or S), use = e.g. --my-lon=-97.1 + /// Spotter longitude DD.dddd #[arg(short = 'x', long, allow_negative_numbers = true)] my_lon: Option, /// Filter out spots from these callsign-UUID combinations (self spots, for example), comma-separated - #[arg(short = 't', long, value_delimiter = ',')] - filter: Option, + #[arg(short = 't', long, value_delimiter = ',', num_args = 1..,)] + filter: Vec, } @@ -454,12 +454,7 @@ fn handle_frame(frame: &AgwFrame, cli: &Cli, buffers: &mut BufferManager, loc_st if cli.ui_only && summary != "UI" { return; } - // Ignore frames where source matches one of the filtered strings - TODO finish this - if cli.filter { - return; - } - + // In non-debug mode, print the session line and any additional lines. if !cli.debug { print_session_line(×tamp, &source, &final_destination, &summary); @@ -493,30 +488,33 @@ fn handle_frame(frame: &AgwFrame, cli: &Cli, buffers: &mut BufferManager, loc_st //println!("Stored location: {} {}", stored_loc[0].clone(), stored_loc[1].clone()); - // If Spothole is enabled - if summary == "UI" && cli.spothole { - // POST JSON - let packet = json!({ - "dx_call": &source_call, - "dx_ssid": &source_ssid, - "de_call": &my_call, - "de_latitude": &my_lat, - "de_longitude": &my_lon, - "freq": &freq, - "comment": &text, - "dx_latitude": &json_lat, - "dx_longitude": &json_lon, - "mode": "PKT", - "mode_type": "DATA", - "mode_source": "SPOT", - "time": SystemTime::now().duration_since(UNIX_EPOCH).unwrap().as_secs(), - }); - let client = reqwest::blocking::Client::new(); - let res = client.post(spothole_url) - .json(&packet) - .send(); - println!("sent to {} = {}", spothole_url, packet); - println!("res = {res:?}"); + // If Spothole is enabled and this is a UI frame and the source is not filtered + if summary == "UI" && cli.spothole && !cli.filter.contains(&source){ + // POST JSON + let packet = json!({ + "dx_call": &source_call, + "dx_ssid": &source_ssid, + "de_call": &my_call, + "de_latitude": &my_lat, + "de_longitude": &my_lon, + "freq": &freq, + "comment": &text, + "dx_latitude": &json_lat, + "dx_longitude": &json_lon, + "mode": "PKT", + "mode_type": "DATA", + "mode_source": "SPOT", + "time": SystemTime::now().duration_since(UNIX_EPOCH).unwrap().as_secs(), + }); + let client = reqwest::blocking::Client::new(); + let res = client.post(spothole_url) + .json(&packet) + .send(); + println!("sent to {} = {}", spothole_url, packet); + println!("res = {res:?}"); + // If it's filtered, send a note about that + } else if summary == "UI" && cli.spothole && cli.filter.contains(&source) { + println!("Filter {:?} applied, not spotted", cli.filter) } // Send UDP