Merge pull request #7 from mirumirumi/dev

Fix symbol name cannot include number digits
mirumirumi · Oct 31, 2023 · 2f8c92b · 2f8c92b
2 parents 37d4fea + 8786a5e
commit 2f8c92b
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ro-soku"
-version = "0.1.1"
+version = "0.1.2"
 authors = ["mirumi <[email protected]>"]
 edition = "2021"
 description = "Retrieve OHLCV ro-soku (means a candle in Japanese) from any exchange🕯️"

diff --git a/src/args.rs b/src/args.rs
@@ -156,8 +156,11 @@ impl Cli {
 
     fn check_symbol_format(&self) -> Result<(), Error> {
         ensure!(
-            self.symbol.chars().all(|c| c.is_uppercase() || c == '/') && self.symbol.contains('/'),
-            "Symbol pair must be in uppercase and contain `/`."
+            self.symbol
+                .chars()
+                .all(|c| c.is_uppercase() || c.is_ascii_digit() || c == '/')
+                && self.symbol.contains('/'),
+            "Symbol pair must be in uppercase or number and contain `/`."
         );
         Ok(())
     }

diff --git a/src/guide.rs b/src/guide.rs
@@ -164,8 +164,11 @@ impl Guide {
             .with_initial_text("BTC/USDT")
             .validate_with(|input: &String| {
                 ensure!(
-                    input.chars().all(|c| c.is_uppercase() || c == '/') && input.contains('/'),
-                    "Symbol pair must be in uppercase and contain `/`."
+                    input
+                        .chars()
+                        .all(|c| c.is_uppercase() || c.is_ascii_digit() || c == '/')
+                        && input.contains('/'),
+                    "Symbol pair must be in uppercase or number and contain `/`."
                 );
                 Ok(())
             })