Skip to content
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

Jump to bottom

Allow parameters in any order #73

Merged
merged 18 commits into from
Jan 6, 2021
Merged

Allow parameters in any order #73

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
5b1cdc6
Pulled out my other attempt at optional, order-independent parameters
talbotmcinnis Oct 28, 2020
ab3c462
First key/value options parser
talbotmcinnis Nov 9, 2020
466e29b
Fixed test_debug makefile command
talbotmcinnis Nov 9, 2020
99214bd
Fixing build errors from last commit. Working on error logging.
talbotmcinnis Nov 9, 2020
748e85c
Upgraded to an if let pattern
talbotmcinnis Nov 9, 2020
676110c
Cleanup and a comment
talbotmcinnis Nov 9, 2020
4e05d25
Added error log when parsing voice
talbotmcinnis Nov 15, 2020
06d0021
Applied variables parameters to BROADCAST extraction
talbotmcinnis Nov 15, 2020
df9b40b
Oops, part of last commit missed
talbotmcinnis Nov 15, 2020
f41f7ce
New extract style for CARRIER
talbotmcinnis Nov 22, 2020
09858a2
New extract style for weather station
talbotmcinnis Nov 22, 2020
3c2f448
Cleanup out debug output
talbotmcinnis Nov 22, 2020
60952f3
cargo fmt on extract
talbotmcinnis Nov 22, 2020
1fec535
Fixed warnings about extra brackets
talbotmcinnis Dec 6, 2020
50479ce
Fix extract of non-stations, as per PR comment
talbotmcinnis Dec 6, 2020
451db21
Correct use of if let Ok
talbotmcinnis Dec 6, 2020
dcf76ba
Simplifed a regex with a split_at suggested by Markus
talbotmcinnis Dec 7, 2020
b74695a
Fix type in unit test test_complete_garbge
talbotmcinnis Dec 21, 2020
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
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ test:
cargo test --workspace --exclude datis

test_debug:
cargo test -- --nocapture
cargo test --workspace --exclude datis -- --nocapture

release:
cargo build --release --package datis
Expand Down
320 changes: 235 additions & 85 deletions crates/datis-core/src/extract.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,58 +51,120 @@ pub fn extract_atis_station_frequencies(situation: &str) -> HashMap<String, Stat
}

pub fn extract_atis_station_config(config: &str) -> Option<StationConfig> {
let re = RegexBuilder::new(
r"^ATIS ([a-zA-Z- ]+) ([1-3]\d{2}(\.\d{1,3})?)(,[ ]?TRAFFIC ([1-3]\d{2}(\.\d{1,3})?))?(,[ ]?VOICE ([a-zA-Z-:]+))?(,[ ]?INFO ([a-zA-Z]))?$",
)
.case_insensitive(true)
.build()
.unwrap();

re.captures(config).map(|caps| {
let name = caps.get(1).unwrap().as_str();
let atis_freq = caps.get(2).unwrap().as_str();
let atis_freq = (f64::from_str(atis_freq).unwrap() * 1_000_000.0) as u64;
let traffic_freq = caps
.get(5)
.map(|freq| (f64::from_str(freq.as_str()).unwrap() * 1_000_000.0) as u64);
let tts = caps
.get(8)
.and_then(|s| TextToSpeechProvider::from_str(s.as_str()).ok());
let info_ltr = caps
.get(10)
.map(|ilo| ((ilo.as_str()).chars().next().unwrap().to_ascii_uppercase()) as char);
StationConfig {
name: name.to_string(),
atis: atis_freq,
traffic: traffic_freq,
tts,
info_ltr_override: info_ltr,
let re = RegexBuilder::new(r"^ATIS ([a-zA-Z- ]+) ([1-3]\d{2}(\.\d{1,3})?)")
.case_insensitive(true)
.build()
.unwrap();

let caps = re.captures(config).unwrap();
talbotmcinnis marked this conversation as resolved.
Show resolved Hide resolved
let name = caps.get(1).unwrap().as_str().to_string();
let atis_freq = caps.get(2).unwrap();
let atis_freq = (f64::from_str(atis_freq.as_str()).unwrap() * 1_000_000.0) as u64;

let mut traffic_freq: Option<u64> = None;
let mut tts: Option<TextToSpeechProvider> = None;
let mut info_ltr_override = None;

let rex_option = RegexBuilder::new(r"([^ ]*) (.*)")
.case_insensitive(true)
.build()
.unwrap();
for token in config.split(",").skip(1) {
let caps = rex_option.captures(token.trim()).unwrap();
let option_key = caps.get(1).unwrap().as_str();
let option_value = caps.get(2).map_or("", |m| m.as_str());
talbotmcinnis marked this conversation as resolved.
Show resolved Hide resolved

match option_key {
"TRAFFIC" => {
if let Some(traffic_freq_hz) = option_value.parse::<f64>().ok() {
talbotmcinnis marked this conversation as resolved.
Show resolved Hide resolved
traffic_freq = Some((traffic_freq_hz * 1_000_000.0) as u64);
} else {
log::warn!(
"Unable to extract ATIS station traffic frequency from {}",
option_value
);
}
}
"VOICE" => {
if let Some(tts_provider) = TextToSpeechProvider::from_str(option_value).ok() {
talbotmcinnis marked this conversation as resolved.
Show resolved Hide resolved
tts = Some(tts_provider);
} else {
log::warn!("Unable to extract Voice from {}", option_value);
}
}
"INFO" => {
info_ltr_override = caps.get(2).map_or(None, |param| {
(Some(param.as_str().chars().next().unwrap().to_ascii_uppercase()))
});
}
_ => {
log::warn!("Unsupported ATIS station option {}", option_key);
}
}
})
}

let result = StationConfig {
name: name,
atis: atis_freq,
traffic: traffic_freq,
tts,
info_ltr_override: info_ltr_override,
};

Some(result)
}

pub fn extract_carrier_station_config(config: &str) -> Option<StationConfig> {
let re = RegexBuilder::new(
r"^CARRIER ([a-zA-Z- ]+) ([1-3]\d{2}(\.\d{1,3})?)(,[ ]?VOICE ([a-zA-Z-:]+))?$",
)
.case_insensitive(true)
.build()
.unwrap();
re.captures(config).map(|caps| {
let name = caps.get(1).unwrap().as_str();
let atis_freq = caps.get(2).unwrap().as_str();
let atis_freq = (f64::from_str(atis_freq).unwrap() * 1_000_000.0) as u64;
let tts = caps
.get(5)
.and_then(|s| TextToSpeechProvider::from_str(s.as_str()).ok());
StationConfig {
name: name.to_string(),
atis: atis_freq,
traffic: None,
tts,
info_ltr_override: None,
let re = RegexBuilder::new(r"^CARRIER ([a-zA-Z- ]+) ([1-3]\d{2}(\.\d{1,3})?)")
.case_insensitive(true)
.build()
.unwrap();

let caps = re.captures(config).unwrap();
let name = caps.get(1).unwrap().as_str().to_string();
let atis_freq = caps.get(2).unwrap();
let atis_freq = (f64::from_str(atis_freq.as_str()).unwrap() * 1_000_000.0) as u64;

let mut tts: Option<TextToSpeechProvider> = None;
let mut info_ltr_override = None;

let rex_option = RegexBuilder::new(r"([^ ]*) (.*)")
.case_insensitive(true)
.build()
.unwrap();
for token in config.split(",").skip(1) {
let caps = rex_option.captures(token.trim()).unwrap();
let option_key = caps.get(1).unwrap().as_str();
let option_value = caps.get(2).map_or("", |m| m.as_str());

match option_key {
"VOICE" => {
if let Some(tts_provider) = TextToSpeechProvider::from_str(option_value).ok() {
tts = Some(tts_provider);
} else {
log::warn!("Unable to extract Voice from {}", option_value);
}
}
"INFO" => {
info_ltr_override = caps.get(2).map_or(None, |param| {
(Some(param.as_str().chars().next().unwrap().to_ascii_uppercase()))
});
}
_ => {
log::warn!("Unsupported CARRIER station option {}", option_key);
}
}
})
}

let result = StationConfig {
name: name,
atis: atis_freq,
traffic: None,
tts,
info_ltr_override: info_ltr_override,
};

Some(result)
}

#[derive(Debug, PartialEq)]
Expand All @@ -113,25 +175,47 @@ pub struct BroadcastConfig {
}

pub fn extract_custom_broadcast_config(config: &str) -> Option<BroadcastConfig> {
let re = RegexBuilder::new(
r"^BROADCAST ([1-3]\d{2}(\.\d{1,3})?)(,[ ]?VOICE ([a-zA-Z-:]+))?:[ ]*(.+)$",
)
.case_insensitive(true)
.build()
.unwrap();
re.captures(config).map(|caps| {
let freq = caps.get(1).unwrap().as_str();
let freq = (f32::from_str(freq).unwrap() * 1_000_000.0) as u64;
let tts = caps
.get(4)
.and_then(|s| TextToSpeechProvider::from_str(s.as_str()).ok());
let message = caps.get(5).unwrap().as_str();
BroadcastConfig {
freq,
message: message.to_string(),
tts,
let re = RegexBuilder::new(r"^BROADCAST ([1-3]\d{2}(\.\d{1,3})?)(.*): ([^:]+)$")
.case_insensitive(true)
.build()
.unwrap();

let caps = re.captures(config).unwrap();
let freq = caps.get(1).unwrap();
let options = caps.get(3);
let freq = (f64::from_str(freq.as_str()).unwrap() * 1_000_000.0) as u64;
let message = caps.get(4).unwrap().as_str().to_string();

let mut tts: Option<TextToSpeechProvider> = None;
if options.is_some() {
let rex_option = RegexBuilder::new(r"([^ ]*) (.*)")
.case_insensitive(true)
.build()
.unwrap();

for token in options.unwrap().as_str().split(",").skip(1) {
let caps = rex_option.captures(token.trim()).unwrap();
let option_key = caps.get(1).unwrap().as_str();
let option_value = caps.get(2).map_or("", |m| m.as_str());

match option_key {
"VOICE" => {
if let Some(tts_provider) = TextToSpeechProvider::from_str(option_value).ok() {
tts = Some(tts_provider);
} else {
log::warn!("Unable to extract Voice from {}", option_value);
}
}
_ => {
log::warn!("Unsupported BROADCAST station option {}", option_key);
}
}
}
})
}

let result = BroadcastConfig { freq, message, tts };

Some(result)
}

#[derive(Debug, PartialEq)]
Expand All @@ -142,25 +226,48 @@ pub struct WetherStationConfig {
}

pub fn extract_weather_station_config(config: &str) -> Option<WetherStationConfig> {
let re = RegexBuilder::new(
r"^WEATHER ([a-zA-Z- ]+) ([1-3]\d{2}(\.\d{1,3})?)(,[ ]?VOICE ([a-zA-Z-:]+))?$",
)
.case_insensitive(true)
.build()
.unwrap();
re.captures(config).map(|caps| {
let name = caps.get(1).unwrap().as_str();
let freq = caps.get(2).unwrap().as_str();
let freq = (f64::from_str(freq).unwrap() * 1_000_000.0) as u64;
let tts = caps
.get(5)
.and_then(|s| TextToSpeechProvider::from_str(s.as_str()).ok());
WetherStationConfig {
name: name.to_string(),
freq,
tts,
let re = RegexBuilder::new(r"^WEATHER ([a-zA-Z- ]+) ([1-3]\d{2}(\.\d{1,3})?)")
.case_insensitive(true)
.build()
.unwrap();

let caps = re.captures(config).unwrap();
let name = caps.get(1).unwrap().as_str().to_string();
let station_freq = caps.get(2).unwrap();
let station_freq = (f64::from_str(station_freq.as_str()).unwrap() * 1_000_000.0) as u64;

let mut tts: Option<TextToSpeechProvider> = None;

let rex_option = RegexBuilder::new(r"([^ ]*) (.*)")
.case_insensitive(true)
.build()
.unwrap();
for token in config.split(",").skip(1) {
let caps = rex_option.captures(token.trim()).unwrap();
let option_key = caps.get(1).unwrap().as_str();
let option_value = caps.get(2).map_or("", |m| m.as_str());

match option_key {
"VOICE" => {
if let Some(tts_provider) = TextToSpeechProvider::from_str(option_value).ok() {
tts = Some(tts_provider);
} else {
log::warn!("Unable to extract Voice from {}", option_value);
}
}
_ => {
log::warn!("Unsupported WEATHER station option {}", option_key);
}
}
})
}

let result = WetherStationConfig {
name: name,
freq: station_freq,
tts,
};

Some(result)
}

#[cfg(test)]
Expand Down Expand Up @@ -318,6 +425,30 @@ mod test {
info_ltr_override: None,
})
);

// Test handling invalid value
assert_eq!(
extract_atis_station_config("ATIS Kutaisi 131.400, TRAFFIC Potatoe"),
Some(StationConfig {
name: "Kutaisi".to_string(),
atis: 131_400_000,
traffic: None,
tts: None,
info_ltr_override: None,
})
);

// Test handling invalid key
assert_eq!(
extract_atis_station_config("ATIS Kutaisi 131.400, GRAVITY 7"),
Some(StationConfig {
name: "Kutaisi".to_string(),
atis: 131_400_000,
traffic: None,
tts: None,
info_ltr_override: None,
})
);
}

#[test]
Expand Down Expand Up @@ -387,6 +518,25 @@ mod test {
);
}

#[test]
fn test_reordered_parameters() {
// Test parameters in another order
assert_eq!(
extract_atis_station_config(
"ATIS Kutaisi 251.000, VOICE en-US-Standard-E, TRAFFIC 123.45"
),
Some(StationConfig {
name: "Kutaisi".to_string(),
atis: 251_000_000,
traffic: Some(123_450_000),
tts: Some(TextToSpeechProvider::GoogleCloud {
voice: gcloud::VoiceKind::StandardE
}),
info_ltr_override: None,
})
);
}

#[test]
fn test_broadcast_config_extraction() {
assert_eq!(
Expand All @@ -399,9 +549,9 @@ mod test {
);

assert_eq!(
extract_custom_broadcast_config("BROADCAST 251.000, VOICE AWS:Brian: Bla bla"),
extract_custom_broadcast_config("BROADCAST 251.500, VOICE AWS:Brian: Bla bla"),
Some(BroadcastConfig {
freq: 251_000_000,
freq: 251_500_000,
message: "Bla bla".to_string(),
tts: Some(TextToSpeechProvider::AmazonWebServices {
voice: aws::VoiceKind::Brian
Expand Down