diff --git a/src/decoder/adsb/acas.rs b/src/decoder/adsb/acas.rs index 04d37a2..b7eeab4 100644 --- a/src/decoder/adsb/acas.rs +++ b/src/decoder/adsb/acas.rs @@ -17,7 +17,7 @@ mod tests { #[test] fn test_threat_encounter() { let squitter = "8D40621D58C382D690C8AC2863A7"; - if let Some(message) = decoder::message(squitter) { + if let Some(message) = decoder::get_message(squitter) { assert_eq!(threat_encounter(&message), Some('\u{2072}')); } } diff --git a/src/decoder/adsb/ais.rs b/src/decoder/adsb/ais.rs index 3af01a9..de873f3 100644 --- a/src/decoder/adsb/ais.rs +++ b/src/decoder/adsb/ais.rs @@ -46,12 +46,12 @@ pub(crate) fn ais(message: &[u32]) -> Option { #[cfg(test)] mod tests { use super::*; - use crate::decoder::message; + use crate::decoder::get_message; #[test] fn test_ais() { let squitter = "8DAAAA9225041331DF3820CAC7A4"; - if let Some(message) = message(squitter) { + if let Some(message) = get_message(squitter) { if let Some(result) = ais(&message) { assert_eq!(result, "AAL173"); } @@ -66,7 +66,7 @@ mod tests { ]; for (squitter, value) in squitters.iter() { - if let Some(message) = message(squitter) { + if let Some(message) = get_message(squitter) { let result = ais(&message); match result { Some(r) => assert_eq!(r.as_str(), *value, "{}", squitter), diff --git a/src/decoder/adsb/altitude.rs b/src/decoder/adsb/altitude.rs index c283de2..39e4c52 100644 --- a/src/decoder/adsb/altitude.rs +++ b/src/decoder/adsb/altitude.rs @@ -24,7 +24,7 @@ pub fn altitude(message: &[u32], df: u32) -> Option { "DF:{} C:{:b} M:{} ALT:{}", df, code?, - crate::decoder::hex_message(message), + crate::decoder::get_hex_message(message), a ); None @@ -61,8 +61,8 @@ mod tests { #[test] fn test_alt() { - if let Some(message) = decoder::message("A8281200200464B3CF7820CD194C") { - let df = decoder::df(&message).expect("Failed to get downlink format"); + if let Some(message) = decoder::get_message("A8281200200464B3CF7820CD194C") { + let df = decoder::get_downlink_format(&message).expect("Failed to get downlink format"); let result = altitude(&message, df); assert_eq!(result, Some(14300)); } @@ -70,8 +70,8 @@ mod tests { #[test] fn test_alt_e() { - if let Some(message) = decoder::message("A020100A10020A80F000004F24AF") { - let df = decoder::df(&message).expect("Failed to get downlink format"); + if let Some(message) = decoder::get_message("A020100A10020A80F000004F24AF") { + let df = decoder::get_downlink_format(&message).expect("Failed to get downlink format"); let result = altitude(&message, df); assert_eq!(result, None); } diff --git a/src/decoder/adsb/altitude/graytobin.rs b/src/decoder/adsb/altitude/graytobin.rs index d6d9cfd..9276275 100644 --- a/src/decoder/adsb/altitude/graytobin.rs +++ b/src/decoder/adsb/altitude/graytobin.rs @@ -56,7 +56,7 @@ mod tests { #[test] fn test_graytobin() { - if let Some(message) = decoder::message("A8281200200464B3CF7820CD194C") { + if let Some(message) = decoder::get_message("A8281200200464B3CF7820CD194C") { let (high, low) = graytobin(&message); assert_eq!(high, 31); assert_eq!(low, 0); @@ -65,7 +65,7 @@ mod tests { #[test] fn test_graytobin_e() { - if let Some(message) = decoder::message("A020100A10020A80F000004F24AF") { + if let Some(message) = decoder::get_message("A020100A10020A80F000004F24AF") { let (high, low) = graytobin(&message); assert_eq!(high, 2); assert_eq!(low, 0); diff --git a/src/decoder/adsb/icao.rs b/src/decoder/adsb/icao.rs index 4b24521..1fe8f3d 100644 --- a/src/decoder/adsb/icao.rs +++ b/src/decoder/adsb/icao.rs @@ -14,9 +14,9 @@ use crate::decoder::get_crc; /// # Examples /// /// ``` -/// use squitterator::{message, df, icao}; -/// if let Some(message) = message("A0001838300000000000007ADA59") { -/// if let Some(df) = df(&message) { +/// use squitterator::{get_message, get_downlink_format, icao}; +/// if let Some(message) = get_message("A0001838300000000000007ADA59") { +/// if let Some(df) = get_downlink_format(&message) { /// if let Some(icao_address) = icao(&message, df) { /// assert_eq!(icao_address, 7453696); /// } @@ -59,7 +59,7 @@ pub(crate) fn icao_wtc(vc: &(u32, u32)) -> Option { #[cfg(test)] mod tests { - use crate::decoder::{df, icao, message}; + use crate::decoder::{get_downlink_format, get_message, icao}; #[test] fn test_icao() { @@ -79,8 +79,8 @@ mod tests { ]; for (squitter, value) in squitters.iter() { - if let Some(message) = message(squitter) { - if let Some(df) = df(&message) { + if let Some(message) = get_message(squitter) { + if let Some(df) = get_downlink_format(&message) { if let Some(result) = icao(&message, df) { assert_eq!(result, *value, "Squitter: {} ICAO:{:X}", squitter, result); } diff --git a/src/decoder/adsb/squawk.rs b/src/decoder/adsb/squawk.rs index ec1b5d0..f5e03f5 100644 --- a/src/decoder/adsb/squawk.rs +++ b/src/decoder/adsb/squawk.rs @@ -23,7 +23,7 @@ pub(crate) fn squawk(message: &[u32]) -> Option { #[cfg(test)] mod tests { - use crate::decoder::{message, squawk}; + use crate::decoder::{get_message, squawk}; #[test] fn test_squawk() { @@ -40,7 +40,7 @@ mod tests { ]; for (squitter, value) in squitters.iter() { - if let Some(message) = message(squitter) { + if let Some(message) = get_message(squitter) { let result = squawk(&message); assert_eq!(result, Some(*value)); } diff --git a/src/decoder/bds.rs b/src/decoder/bds.rs index 11a5141..de564f9 100644 --- a/src/decoder/bds.rs +++ b/src/decoder/bds.rs @@ -58,12 +58,12 @@ pub(crate) fn goodflags(message: &[u32], flag: u32, sb: u32, eb: u32) -> bool { #[cfg(test)] mod tests { use super::*; - use crate::decoder::message; + use crate::decoder::get_message; #[test] fn test_bds() { let squitter = "8D40621D58C382D690C8AC2863A7"; - if let Some(message) = message(squitter) { + if let Some(message) = get_message(squitter) { assert_eq!(bds(&message), (0, 0)); } } @@ -71,7 +71,7 @@ mod tests { #[test] fn test_bds_21() { let squitter = "A8000096300000000000007F5EBC"; - if let Some(message) = message(squitter) { + if let Some(message) = get_message(squitter) { assert_eq!(bds(&message), (3, 0)); } } diff --git a/src/decoder/bds/bds_4_4.rs b/src/decoder/bds/bds_4_4.rs index 094e90b..13e5242 100644 --- a/src/decoder/bds/bds_4_4.rs +++ b/src/decoder/bds/bds_4_4.rs @@ -63,7 +63,7 @@ pub fn is_bds_4_4(message: &[u32]) -> Option { ); debug!( "DF:{} F:{:b} {:?}", - decoder::df(message)?, + decoder::get_downlink_format(message)?, decoder::range_value(message, 33, 36)?, meteo ); diff --git a/src/decoder/downlink.rs b/src/decoder/downlink.rs index 2a36fe7..67c5645 100644 --- a/src/decoder/downlink.rs +++ b/src/decoder/downlink.rs @@ -22,28 +22,28 @@ use crate::range_value; /// # Examples /// /// ``` -/// use squitterator::{message, df}; +/// use squitterator::{get_message, get_downlink_format}; /// let squitter = "8D40621D58C382D690C8AC2863A7"; -/// if let Some(message) = message(squitter) { -/// if let Some(df) = df(&message) { +/// if let Some(message) = get_message(squitter) { +/// if let Some(df) = get_downlink_format(&message) { /// assert_eq!(df, 17); /// } /// } /// ``` -pub fn df(message: &[u32]) -> Option { +pub fn get_downlink_format(message: &[u32]) -> Option { range_value(message, 1, 5) } #[cfg(test)] mod tests { use super::*; - use crate::decoder::message; + use crate::decoder::get_message; #[test] fn test_df_17() { let squitter = "8D40621D58C382D690C8AC2863A7"; - if let Some(message) = message(squitter) { - let result = df(&message).unwrap_or(0); + if let Some(message) = get_message(squitter) { + let result = get_downlink_format(&message).unwrap_or(0); assert_eq!(result, 17); } } @@ -51,8 +51,8 @@ mod tests { #[test] fn test_df_21() { let squitter = "A8281200200464B3CF7820CD194C"; - if let Some(message) = message(squitter) { - let result = df(&message).unwrap_or(0); + if let Some(message) = get_message(squitter) { + let result = get_downlink_format(&message).unwrap_or(0); assert_eq!(result, 21); } } @@ -60,8 +60,8 @@ mod tests { #[test] fn test_df_22() { let squitter = "A020100A10020A80F000004F24AF"; - if let Some(message) = message(squitter) { - let result = df(&message).unwrap_or(0); + if let Some(message) = get_message(squitter) { + let result = get_downlink_format(&message).unwrap_or(0); assert_eq!(result, 20); } } diff --git a/src/decoder/downlink/dfs.rs b/src/decoder/downlink/dfs.rs index f62c22c..75e9aa1 100644 --- a/src/decoder/downlink/dfs.rs +++ b/src/decoder/downlink/dfs.rs @@ -7,7 +7,7 @@ use std::{ use log::debug; -use super::{df, Ext, Mds, Srt}; +use super::{get_downlink_format, Ext, Mds, Srt}; #[derive(Debug)] pub enum DF { @@ -49,13 +49,13 @@ impl DF { } impl Downlink for DF { - fn from_message(message: &[u32]) -> Result { - match df(message) { + fn from_get_message(message: &[u32]) -> Result { + match get_downlink_format(message) { Some(value) => { let dl = match value { - 0..=16 => DF::SRT(Srt::from_message(message)?), - 17 => DF::EXT(Ext::from_message(message)?), - 20 | 21 => DF::MDS(Mds::from_message(message)?), + 0..=16 => DF::SRT(Srt::from_get_message(message)?), + 17 => DF::EXT(Ext::from_get_message(message)?), + 20 | 21 => DF::MDS(Mds::from_get_message(message)?), _ => DF::SRT(Srt::new()), }; Ok(dl) @@ -82,7 +82,7 @@ impl Downlink for DF { } pub trait Downlink: Sized { - fn from_message(message: &[u32]) -> Result; + fn from_get_message(message: &[u32]) -> Result; fn update(&mut self, message: &[u32]); fn icao(&self) -> Option; } diff --git a/src/decoder/downlink/extended/update.rs b/src/decoder/downlink/extended/update.rs index 2aafab8..52aa207 100644 --- a/src/decoder/downlink/extended/update.rs +++ b/src/decoder/downlink/extended/update.rs @@ -55,18 +55,18 @@ impl Ext { } impl decoder::Downlink for Ext { - fn from_message(message: &[u32]) -> Result { + fn from_get_message(message: &[u32]) -> Result { let mut dl = Ext::new(); dl.update(message); Ok(dl) } fn update(&mut self, message: &[u32]) { - if let Some(df) = decoder::df(message) { + if let Some(df) = decoder::get_downlink_format(message) { self.df = Some(df); self.icao = decoder::icao(message, df); - self.capability = decoder::ca(message); - self.message_type = decoder::message_type(message); + self.capability = decoder::get_capability(message); + self.message_type = decoder::get_message_type(message); match self.message_type.0 { 1..=4 => { self.update_mt_1_4(message); diff --git a/src/decoder/downlink/mode_s.rs b/src/decoder/downlink/mode_s.rs index 8df1e55..4649f15 100644 --- a/src/decoder/downlink/mode_s.rs +++ b/src/decoder/downlink/mode_s.rs @@ -93,14 +93,14 @@ impl Display for Mds { } impl decoder::Downlink for Mds { - fn from_message(message: &[u32]) -> Result { + fn from_get_message(message: &[u32]) -> Result { let mut dl = Mds::new(); dl.update(message); Ok(dl) } fn update(&mut self, message: &[u32]) { - if let Some(df) = decoder::df(message) { + if let Some(df) = decoder::get_downlink_format(message) { self.df = Some(df); self.icao = decoder::icao(message, df); self.altitude = decoder::altitude(message, df); diff --git a/src/decoder/downlink/short.rs b/src/decoder/downlink/short.rs index 3e0e6e0..157f1e5 100644 --- a/src/decoder/downlink/short.rs +++ b/src/decoder/downlink/short.rs @@ -59,14 +59,14 @@ impl Display for Srt { } impl decoder::Downlink for Srt { - fn from_message(message: &[u32]) -> Result { + fn from_get_message(message: &[u32]) -> Result { let mut dl = Srt::new(); dl.update(message); Ok(dl) } fn update(&mut self, message: &[u32]) { - if let Some(df) = decoder::df(message) { + if let Some(df) = decoder::get_downlink_format(message) { self.df = Some(df); self.icao = decoder::icao(message, df); match df { @@ -77,7 +77,7 @@ impl decoder::Downlink for Srt { self.squawk = decoder::squawk(message); } 11 => { - self.capability = Some(decoder::ca(message)); + self.capability = Some(decoder::get_capability(message)); } _ => {} } diff --git a/src/decoder/ehs/base.rs b/src/decoder/ehs/base.rs index 1d4254c..be0728d 100644 --- a/src/decoder/ehs/base.rs +++ b/src/decoder/ehs/base.rs @@ -44,7 +44,7 @@ mod tests { #[test] fn test_track_and_groundspeed() { - if let Some(message) = decoder::message("8DC06A75990D0628B0040C8AA788") { + if let Some(message) = decoder::get_message("8DC06A75990D0628B0040C8AA788") { if let (Some(track), Some(groundspeed)) = track_and_groundspeed(&message, false) { assert_eq!(groundspeed, 416); assert_eq!(track, 321); diff --git a/src/decoder/ehs/bds_4_0.rs b/src/decoder/ehs/bds_4_0.rs index c9fc553..0abae01 100644 --- a/src/decoder/ehs/bds_4_0.rs +++ b/src/decoder/ehs/bds_4_0.rs @@ -1,9 +1,9 @@ use log::debug; -use crate::decoder::{flag_and_range_value, hex_message}; +use crate::decoder::{flag_and_range_value, get_hex_message}; pub(crate) fn mcp_selected_altitude(message: &[u32]) -> Option { - debug!("MCP, {}", hex_message(message)); + debug!("MCP, {}", get_hex_message(message)); flag_and_range_value(message, 33, 34, 45) .filter(|&f| f.0 == 1) .map(|v| v.1 << 4) @@ -36,7 +36,7 @@ pub(crate) fn target_altitude_source(message: &[u32]) -> Option { #[cfg(test)] mod tests { use super::*; - use crate::decoder::message; + use crate::decoder::get_message; #[test] fn test_mcp_selected_altitude_value() { let s = [ @@ -45,7 +45,7 @@ mod tests { ("A80004BAB8AE4270A80000823C66", 29008), ]; for (squitter, value) in s.iter() { - if let Some(message) = message(squitter) { + if let Some(message) = get_message(squitter) { assert_eq!(mcp_selected_altitude(&message), Some(*value as u32)); } } @@ -59,7 +59,7 @@ mod tests { ("A80004BAB8AE4270A80000823C66", 37008), ]; for (squitter, value) in s.iter() { - if let Some(message) = message(squitter) { + if let Some(message) = get_message(squitter) { assert_eq!(fms_selected_altitude(&message), Some(*value as u32)); } } diff --git a/src/decoder/plane.rs b/src/decoder/plane.rs index cd35698..4dcbe91 100644 --- a/src/decoder/plane.rs +++ b/src/decoder/plane.rs @@ -118,7 +118,7 @@ impl Plane { } } - pub fn from_message(message: &[u32], df: u32, icao: u32, relaxed: bool) -> Self { + pub fn from_get_message(message: &[u32], df: u32, icao: u32, relaxed: bool) -> Self { let mut plane = Plane::new(); plane.icao = icao; (_, plane.reg) = super::icao_to_country(icao); diff --git a/src/decoder/plane/from_squitter/from_bcast.rs b/src/decoder/plane/from_squitter/from_bcast.rs index 066b45e..14a78c2 100644 --- a/src/decoder/plane/from_squitter/from_bcast.rs +++ b/src/decoder/plane/from_squitter/from_bcast.rs @@ -12,7 +12,7 @@ impl Plane { } if df == 11 || df == 17 { - self.capability.0 = decoder::ca(message); + self.capability.0 = decoder::get_capability(message); } } } diff --git a/src/decoder/plane/from_squitter/from_ext.rs b/src/decoder/plane/from_squitter/from_ext.rs index 449ad65..db77ffd 100644 --- a/src/decoder/plane/from_squitter/from_ext.rs +++ b/src/decoder/plane/from_squitter/from_ext.rs @@ -5,7 +5,7 @@ use crate::decoder; impl Plane { pub(super) fn update_from_ext(&mut self, message: &[u32], df: u32) { - let (message_type, message_subtype) = decoder::message_type(message); + let (message_type, message_subtype) = decoder::get_message_type(message); self.last_type_code = message_type; debug!("DF:{}, TC:{}, ST:{}", df, message_type, message_subtype); match message_type { diff --git a/src/decoder/utils.rs b/src/decoder/utils.rs index 14806c1..0bc7c77 100644 --- a/src/decoder/utils.rs +++ b/src/decoder/utils.rs @@ -10,8 +10,6 @@ pub(crate) use format::*; pub(crate) use ma_code::*; pub(crate) use me_code::*; -use log::debug; - /// Converts a squitter string into a vector of u32 values. /// /// # Arguments @@ -21,17 +19,13 @@ use log::debug; /// # Returns /// /// * `Option>` - An Option vector of u32 values representing the converted squitter string. -pub fn message(squitter: &str) -> Option> { +pub fn get_message(squitter: &str) -> Option> { clean_squitter(squitter) .filter(|message| matches!(message.len(), 14 | 28)) .filter(|message| reminder(message) == 0) - .map(|message| { - debug!("Message: {:?}", message); - message - }) } -pub(crate) fn hex_message(message: &[u32]) -> String { +pub(crate) fn get_hex_message(message: &[u32]) -> String { message .iter() .map(|x| format!("{:X}", x)) @@ -39,17 +33,7 @@ pub(crate) fn hex_message(message: &[u32]) -> String { .join("") } -/// Retrieves the message type and subtype from a message. -/// -/// # Arguments -/// -/// * `message` - The message to extract the message type and subtype from. -/// -/// # Returns -/// -/// A tuple containing the message type and subtype. -/// -pub(crate) fn message_type(message: &[u32]) -> (u32, u32) { +pub(crate) fn get_message_type(message: &[u32]) -> (u32, u32) { ((message[8] << 1) | (message[9] >> 3), message[9] & 7) } @@ -62,7 +46,7 @@ pub(crate) fn message_type(message: &[u32]) -> (u32, u32) { /// # Returns /// /// The CA value. -pub(crate) fn ca(message: &[u32]) -> u32 { +pub(crate) fn get_capability(message: &[u32]) -> u32 { message[1] & 0b0111 } @@ -71,9 +55,9 @@ mod tests { use super::*; #[test] - fn test_message() { + fn test_get_message() { let squitter = "8D40621D58C382D690C8AC2863A7"; - match message(squitter) { + match get_message(squitter) { Some(message) => assert_eq!( message, vec![ @@ -88,7 +72,7 @@ mod tests { #[test] fn test_message_short() { let squitter = "02E197B00179C3"; - match message(squitter) { + match get_message(squitter) { Some(message) => assert_eq!(message, vec![0, 2, 14, 1, 9, 7, 11, 0, 0, 1, 7, 9, 12, 3]), None => panic!("Failed to convert squitter to message"), } @@ -97,24 +81,24 @@ mod tests { //#[test] //fn test_ic() { // let squitter = "8D40621D58C382D690C8AC2863A7"; - // if let Some(message) = message(squitter) { + // if let Some(message) = get_message(squitter) { // assert_eq!(ic(&message), 8); // } //} #[test] - fn test_ca() { + fn test_get_capability() { let squitter = "8D40621D58C382D690C8AC2863A7"; - if let Some(message) = message(squitter) { - assert_eq!(ca(&message), 5); + if let Some(message) = get_message(squitter) { + assert_eq!(get_capability(&message), 5); } } #[test] fn test_message_type() { let squitter = "8D40621D58C382D690C8AC2863A7"; - if let Some(message) = message(squitter) { - let (message_type, message_subtype) = message_type(&message); + if let Some(message) = get_message(squitter) { + let (message_type, message_subtype) = get_message_type(&message); assert_eq!(message_type, 11); assert_eq!(message_subtype, 0); } diff --git a/src/decoder/utils/crc.rs b/src/decoder/utils/crc.rs index f2b061a..1f90c14 100644 --- a/src/decoder/utils/crc.rs +++ b/src/decoder/utils/crc.rs @@ -108,7 +108,7 @@ mod tests { ]; for (squitter, value) in squitters.iter() { - if let Some(message) = message(squitter) { + if let Some(message) = get_message(squitter) { let result = crc112(&message); assert_eq!(result, *value); } @@ -131,7 +131,7 @@ mod tests { ]; for (squitter, value) in squitters.iter() { - if let Some(message) = message(squitter) { + if let Some(message) = get_message(squitter) { let result = crc56(&message); assert_eq!(result, *value); } @@ -147,7 +147,7 @@ mod tests { ]; for (squitter, value) in squitters.iter() { - if let Some(message) = message(squitter) { + if let Some(message) = get_message(squitter) { let result = reminder(&message); assert_eq!(result, *value); } diff --git a/src/decoder/utils/ma_code.rs b/src/decoder/utils/ma_code.rs index b995ac8..89e4dc0 100644 --- a/src/decoder/utils/ma_code.rs +++ b/src/decoder/utils/ma_code.rs @@ -43,7 +43,7 @@ pub(crate) fn ma_code(message: &[u32]) -> Option { #[cfg(test)] mod tests { use super::*; - use crate::decoder::message; + use crate::decoder::get_message; #[test] fn test_ma_code() { @@ -59,7 +59,7 @@ mod tests { ]; for (squitter, value) in squitters.iter() { - if let Some(message) = message(squitter) { + if let Some(message) = get_message(squitter) { let result = ma_code(&message); assert_eq!(result, Some(*value)); } @@ -69,7 +69,7 @@ mod tests { #[test] fn test_ma_code_invalid_hex() { let squitter = "8D40621D58C382D690C8AC2863A7"; - if let Some(message) = message(squitter) { + if let Some(message) = get_message(squitter) { let result = ma_code(&message); assert_eq!(result, Some(1141)); } diff --git a/src/decoder/utils/me_code.rs b/src/decoder/utils/me_code.rs index c58292f..e8572dd 100644 --- a/src/decoder/utils/me_code.rs +++ b/src/decoder/utils/me_code.rs @@ -17,7 +17,7 @@ pub(crate) fn me_code(message: &[u32]) -> Option { #[cfg(test)] mod tests { use super::*; - use crate::decoder::message; + use crate::decoder::get_message; #[test] fn test_me_code() { @@ -33,7 +33,7 @@ mod tests { ]; for (squitter, value) in squitters.iter() { - if let Some(message) = message(squitter) { + if let Some(message) = get_message(squitter) { let result = me_code(&message); assert_eq!(result, Some(*value)); } @@ -43,7 +43,7 @@ mod tests { #[test] fn test_me_code_invalid_hex() { let squitter = "8D40621D58C382D690C8AC2863A7"; - if let Some(message) = message(squitter) { + if let Some(message) = get_message(squitter) { let result = me_code(&message); assert_eq!(result, Some(12513)); } diff --git a/src/lib.rs b/src/lib.rs index 797f38a..3859a94 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -7,8 +7,8 @@ mod reader; pub use arguments::Args; pub use decoder::{ - df, icao, message, set_observer_coords_from_str, DisplayFlags, Downlink, Legend, LegendHeaders, - Plane, Planes, UpdateFromDownlink, DF, + get_downlink_format, get_message, icao, set_observer_coords_from_str, DisplayFlags, Downlink, + Legend, LegendHeaders, Plane, Planes, UpdateFromDownlink, DF, }; pub use errors::AppResult; pub use logger::initialize_logger; diff --git a/src/reader.rs b/src/reader.rs index d637164..a9958ee 100644 --- a/src/reader.rs +++ b/src/reader.rs @@ -1,5 +1,6 @@ use crate::{ - df, icao, message, AppCounters, Args, DisplayFlags, Downlink, Legend, LegendHeaders, Planes, DF, + get_downlink_format, get_message, icao, AppCounters, Args, DisplayFlags, Downlink, Legend, + LegendHeaders, Planes, DF, }; use log::{debug, error, info}; use std::{ @@ -31,11 +32,11 @@ fn read_lines(reader: R, args: &Args, planes: &mut Planes) -> Result let mut app_state = AppCounters::from_update_interval(args.update); for line in reader.lines().map_while(Result::ok) { - let Some(message) = message(&line) else { + let Some(message) = get_message(&line) else { continue; }; - let Some(df) = df(&message) else { + let Some(df) = get_downlink_format(&message) else { continue; }; @@ -62,7 +63,7 @@ fn read_lines(reader: R, args: &Args, planes: &mut Planes) -> Result } let now = chrono::Utc::now(); - if let Ok(downlink) = DF::from_message(&message) { + if let Ok(downlink) = DF::from_get_message(&message) { if let Some(ref downlink_error_log_file) = downlink_error_log_file { downlink.log(downlink_error_log_file)?; }