This commit is contained in:
daichi
2020-10-26 22:28:39 +09:00
parent 46aa50a597
commit 369c7c1e55
2 changed files with 21 additions and 13 deletions

View File

@@ -44,7 +44,7 @@ fn main() -> Result<(), DeError> {
if let Some(filepath) = filepath {
parse_file(filepath);
}
output_with_omikuji(Omikuji::DAIKICHI);
Ok(())
}
@@ -63,7 +63,7 @@ fn parse_file(filepath: &str) {
}
fn output_with_omikuji(omikuji: Omikuji) {
let fp = &format!("art/omikuji/{}", omikuji.get_file_name());
let fp = &format!("art/omikuji/{}", omikuji);
let content = fs::read_to_string(fp).unwrap();
println!("{}", content);
}

View File

@@ -1,3 +1,5 @@
use std::fmt;
pub enum Omikuji {
DAIKICHI,
KICHI,
@@ -7,16 +9,22 @@ pub enum Omikuji {
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()
impl fmt::Display for Omikuji {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
match *self {
Omikuji::DAIKICHI => write!(f, "DAIKICHI.txt"),
Omikuji::KICHI => write!(f, "KICHI.txt"),
Omikuji::CHUKICHI => write!(f, "CHUKICHI.txt"),
Omikuji::SHOUKICHI => write!(f, "SHOUKICHI.txt"),
Omikuji::SUEKICHI => write!(f, "SUEKICHI.txt"),
Omikuji::KYOU => write!(f, "KYOU.txt"),
}
}
}
#[test]
fn test_display() {
assert_eq!("DAIKICHI.txt", Omikuji::DAIKICHI.to_string());
}