src/main.rs

@@ -83,13 +83,13 @@ struct Cli {
     #[arg(short = 'y', long, allow_negative_numbers = true)]
     my_lat: Option<f64>,
     
-    /// 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<f64>,
     
     /// Filter out spots from these callsign-UUID combinations (self spots, for example), comma-separated
-    #[arg(short = 't', long, value_delimiter = ',')]
-    filter: Option<String>,
+    #[arg(short = 't', long, value_delimiter = ',', num_args = 1..,)]
+    filter: Vec<String>,
     
 }
 
@@ -454,11 +454,6 @@ 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 {
@@ -493,8 +488,8 @@ 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 {
+    // 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,
@@ -517,6 +512,9 @@ fn handle_frame(frame: &AgwFrame, cli: &Cli, buffers: &mut BufferManager, loc_st
                 .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