Merge branch 'release/sameold-0.2.3'

Author: cbs228

Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 name = "samedec"
 description = "A SAME/EAS digital receiver and alerting program"
-version = "0.2.2"
+version = "0.2.3"
 authors = ["Colin S <3526918+cbs228@users.noreply.github.com>"]
 license = "MIT OR Apache-2.0"
 edition = "2018"
@@ -10,7 +10,7 @@ repository = "https://github.com/cbs228/sameold.git"
 readme = "README.md"
 
 [dependencies]
-sameold = {path = "../sameold", version = "0.2.1"}
+sameold = {path = "../sameold", version = "0.2.3"}
 byteorder = "^1.4"
 clap = "^2.33"
 log = "^0.4"

crates/samedec/Cargo.toml

@@ -269,7 +269,7 @@ impl From<State<Alerting>> for State<Waiting> {
 
 // Create a demonstration message
 fn make_demo_message(at: &DateTime<Utc>) -> Message {
-    let msg_string = format!("ZCZC-EAS-DMO-999000+0015-{}-N0CALL-", at.format("%j%H%M"));
+    let msg_string = format!("ZCZC-EAS-DMO-999000+0015-{}-N0 CALL -", at.format("%j%H%M"));
     Message::StartOfMessage(MessageHeader::new(msg_string).expect("unable to create DMO message"))
 }
 

crates/samedec/src/app.rs

@@ -1,7 +1,7 @@
 [package]
 name = "sameold"
 description = "A SAME/EAS digital receiver library"
-version = "0.2.2"
+version = "0.2.3"
 authors = ["Colin S <3526918+cbs228@users.noreply.github.com>"]
 license = "MIT OR Apache-2.0"
 edition = "2018"

crates/sameold/Cargo.toml

@@ -517,9 +517,18 @@ fn bit_vote_parity(b0: u8, b1: u8, b2: u8) -> (u8, u32) {
 //
 // Allowed characters include the following ASCII:
 // - Uppercase letters
+// - Lowercase letters
 // - Numbers
 // - Minus sign (`-`)
 // - Plus sign (`+`)
+// - Question mark (`?`)
+// - Open parentheses (`(`)
+// - Close parentheses (`)`)
+// - Open brackets (`[`)
+// - Close brackets (`]`)
+// - Period (`.`)
+// - Underscore (`_`)
+// - Comma (`,`)
 // - Slash (`/`)
 // - Space (` `)(might be encountered in callsign field)
 //
@@ -530,15 +539,33 @@ fn bit_vote_parity(b0: u8, b1: u8, b2: u8) -> (u8, u32) {
 fn is_allowed_byte(c: u8) -> bool {
     const MINUS: u8 = '-' as u8;
     const PLUS: u8 = '+' as u8;
+    const QUESTION_MARK: u8 = '?' as u8;
+    const OPEN_PARENTHESES: u8 = '(' as u8;
+    const CLOSE_PARENTHESES: u8 = ')' as u8;
+    const OPEN_BRACKETS: u8 = '[' as u8;
+    const CLOSE_BRACKETS: u8 = ']' as u8;
+    const PERIOD: u8 = '.' as u8;
+    const UNDERSCORE: u8 = '_' as u8;
+    const COMMA: u8 = ',' as u8;
     const SLASH: u8 = '/' as u8;
     const SPACE: u8 = ' ' as u8;
     const NUMBERS: [u8; 2] = ['0' as u8, '9' as u8];
     const UPPER_ALPHA: [u8; 2] = ['A' as u8, 'Z' as u8];
+    const LOWER_ALPHA: [u8; 2] = ['a' as u8, 'z' as u8];
 
     c == MINUS
         || (c >= NUMBERS[0] && c <= NUMBERS[1])
         || (c >= UPPER_ALPHA[0] && c <= UPPER_ALPHA[1])
+        || (c >= LOWER_ALPHA[0] && c <= LOWER_ALPHA[1])
         || c == SLASH
+        || c == QUESTION_MARK
+        || c == OPEN_PARENTHESES
+        || c == CLOSE_PARENTHESES
+        || c == OPEN_BRACKETS
+        || c == CLOSE_BRACKETS
+        || c == PERIOD
+        || c == UNDERSCORE
+        || c == COMMA
         || c == PLUS
         || c == SPACE
 }

crates/sameold/src/framing.rs

@@ -569,7 +569,7 @@ const PREFIX_MESSAGE_END: &str = "NNNN";
 fn check_header(hdr: &str) -> Result<(usize, usize), MessageDecodeErr> {
     lazy_static! {
         static ref RE: Regex =
-            Regex::new(r"^ZCZC-[A-Z]{3}-[A-Z]{3}(-[0-9]{6})+(\+[0-9]{4}-[0-9]{7}-.{3,8}-)")
+            Regex::new(r"^ZCZC-[[:alpha:]]{3}-[[:alpha:]]{3}(-[0-9]{6})+(\+[0-9]{4}-[0-9]{7}-.{3,8}-)")
                 .expect("bad SAME regexp");
     }