diff --git a/art/omikuji/3.txt b/art/omikuji/CHUKICHI.txt similarity index 100% rename from art/omikuji/3.txt rename to art/omikuji/CHUKICHI.txt diff --git a/art/omikuji/1.txt b/art/omikuji/DAIKICHI.txt similarity index 100% rename from art/omikuji/1.txt rename to art/omikuji/DAIKICHI.txt diff --git a/art/omikuji/2.txt b/art/omikuji/KICHI.txt similarity index 100% rename from art/omikuji/2.txt rename to art/omikuji/KICHI.txt diff --git a/art/omikuji/6.txt b/art/omikuji/KYOU.txt similarity index 100% rename from art/omikuji/6.txt rename to art/omikuji/KYOU.txt diff --git a/art/omikuji/4.txt b/art/omikuji/SHOUKICHI.txt similarity index 100% rename from art/omikuji/4.txt rename to art/omikuji/SHOUKICHI.txt diff --git a/art/omikuji/5.txt b/art/omikuji/SUEKICHI.txt similarity index 100% rename from art/omikuji/5.txt rename to art/omikuji/SUEKICHI.txt diff --git a/src/lib.rs b/src/lib.rs index 72434c62..b1dd090e 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,3 +1,4 @@ pub mod detections; pub mod models; +pub mod omikuji; pub mod toml; diff --git a/src/main.rs b/src/main.rs index c45012ad..946572f5 100644 --- a/src/main.rs +++ b/src/main.rs @@ -7,6 +7,7 @@ use quick_xml::de::DeError; use std::{fs, path::PathBuf, process}; use yamato_event_analyzer::detections::detection; use yamato_event_analyzer::toml; +use yamato_event_analyzer::omikuji::Omikuji; fn build_app() -> clap::App<'static, 'static> { let program = std::env::args() @@ -43,7 +44,7 @@ fn main() -> Result<(), DeError> { if let Some(filepath) = filepath { parse_file(filepath); } - + output_with_omikuji(Omikuji::DAIKICHI); Ok(()) } @@ -61,8 +62,8 @@ fn parse_file(filepath: &str) { &detection.start(parser); } -fn output_with_omikuji(severity: &str) { - let fp = &format!("art/omikuji/{}.txt", severity); +fn output_with_omikuji(omikuji: Omikuji) { + let fp = &format!("art/omikuji/{}", omikuji.get_file_name()); let content = fs::read_to_string(fp).unwrap(); println!("{}", content); } diff --git a/src/omikuji.rs b/src/omikuji.rs new file mode 100644 index 00000000..e72f94af --- /dev/null +++ b/src/omikuji.rs @@ -0,0 +1,22 @@ +pub enum Omikuji { + DAIKICHI, + KICHI, + CHUKICHI, + SHOUKICHI, + SUEKICHI, + KYOU, +} + +impl Omikuji { + pub fn get_file_name(&self) -> String { + let file_name = match *self { + Omikuji::DAIKICHI => "DAIKICHI.txt", + Omikuji::KICHI => "KICHI.txt", + Omikuji::CHUKICHI => "CHUKICHI.txt", + Omikuji::SHOUKICHI => "SHOUKICHI.txt", + Omikuji::SUEKICHI => "SUEKICHI.txt", + Omikuji::KYOU => "KYOU.txt", + }; + file_name.to_string() + } +} \ No newline at end of file