Skip to content

Rely on native JSON handling to format the callsigns #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
darryldunkin wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Rely on native JSON handling to format the callsigns #7

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d8a99e7
Leverage json to handle the formatting for the POST, deliver the list…
darryldunkin Oct 10, 2026
79597dd
resolve display error for output
darryldunkin Oct 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 7 additions & 41 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,36 +327,6 @@ impl Mode {
}
}

/// Determines how multiple callsigns are formatted when sent to HamAlert
#[derive(Clone, Copy, Default)]
enum CallsignFormat {
/// Comma-space separated: "N0CALL, K0TEST, W0XYZ"
#[default]
Default,
/// Comma-only (compact): "N0CALL,K0TEST,W0XYZ"
Compact,
/// One per line: "N0CALL\nK0TEST\nW0XYZ"
OnePerLine,
}

impl CallsignFormat {
fn separator(&self) -> &'static str {
match self {
CallsignFormat::Default => ", ",
CallsignFormat::Compact => ",",
CallsignFormat::OnePerLine => "\n",
}
}

fn from_flags(compact: bool, one_per_line: bool) -> Self {
match (compact, one_per_line) {
(true, _) => CallsignFormat::Compact,
(_, true) => CallsignFormat::OnePerLine,
_ => CallsignFormat::Default,
}
}
}

#[derive(Serialize)]
struct TriggerData {
conditions: Conditions,
Expand All @@ -367,7 +337,7 @@ struct TriggerData {

#[derive(Serialize)]
struct Conditions {
callsign: String,
callsign: Vec<String>,
#[serde(skip_serializing_if = "Option::is_none")]
mode: Option<String>,
}
Expand Down Expand Up @@ -893,14 +863,14 @@ async fn fetch_triggers(client: &Client) -> Result<Vec<Trigger>, Box<dyn Error>>

async fn add_trigger(
client: &Client,
callsign: &str,
callsign: Vec<String>,
comment: &str,
actions: Vec<String>,
mode: Option<String>,
) -> Result<(), Box<dyn Error>> {
let trigger_data = TriggerData {
conditions: Conditions {
callsign: callsign.to_string(),
callsign: callsign.clone(),
mode,
},
comment: comment.to_string(),
Expand All @@ -914,7 +884,7 @@ async fn add_trigger(
.send()
.await?;

println!("Add trigger status for {}: {}", callsign, response.status());
println!("Add trigger status for {}: {}", callsign.join(", "), response.status());

// Optionally print the response body
let body = response.text().await?;
Expand Down Expand Up @@ -1022,7 +992,6 @@ async fn import_callsigns(
.join(","),
)
};
let format = CallsignFormat::from_flags(options.trigger.compact, options.trigger.one_per_line);

if options.dry_run {
println!("\nDry run - would add triggers for:");
Expand All @@ -1033,10 +1002,9 @@ async fn import_callsigns(
);
}
} else {
let combined_callsigns = callsigns.join(format.separator());
add_trigger(
client,
&combined_callsigns,
callsigns,
&options.trigger.comment,
action_strings,
mode_string,
Expand Down Expand Up @@ -1272,12 +1240,10 @@ async fn main() -> Result<(), Box<dyn Error>> {
if callsign.is_empty() {
return Err("At least one --callsign must be provided".into());
}
// Join callsigns with the specified format
let format = CallsignFormat::from_flags(options.compact, options.one_per_line);
let combined_callsigns = callsign.join(format.separator());
// Add trigger
add_trigger(
&client,
&combined_callsigns,
callsign,
&options.comment,
action_strings,
mode_string,
Expand Down