mindustry logic execution, map- and schematic- parsing and rendering
| -rw-r--r-- | src/args.rs | 39 | ||||
| -rw-r--r-- | src/main.rs | 15 |
2 files changed, 44 insertions, 10 deletions
diff --git a/src/args.rs b/src/args.rs index ee06dec..62a2596 100644 --- a/src/args.rs +++ b/src/args.rs @@ -122,6 +122,45 @@ pub enum OptionValue Value(String), } +impl OptionValue +{ + pub const fn is_absent(&self) -> bool + { + match self + { + OptionValue::Absent => true, + _ => false, + } + } + + pub const fn is_present(&self) -> bool + { + match self + { + OptionValue::Present | OptionValue::Value(..) => true, + _ => false, + } + } + + pub const fn has_value(&self) -> bool + { + match self + { + OptionValue::Value(..) => true, + _ => false, + } + } + + pub const fn get_value(&self) -> Option<&String> + { + match self + { + OptionValue::Value(v) => Some(v), + _ => None, + } + } +} + #[derive(Clone, Debug)] pub struct OptionHandler { diff --git a/src/main.rs b/src/main.rs index e9f7522..d141581 100644 --- a/src/main.rs +++ b/src/main.rs @@ -3,7 +3,7 @@ use std::env::Args; use std::io::{self, Write}; use std::fs; -use crate::args::{ArgOption, OptionError, OptionHandler, OptionValue}; +use crate::args::{ArgOption, OptionError, OptionHandler}; use crate::data::{DataRead, Serializer}; use crate::data::schematic::{Schematic, SchematicSerializer}; @@ -67,14 +67,10 @@ fn main_print(mut args: Args) let mut ss = SchematicSerializer(®); let mut first = true; // process the file if any - let file = match handler.get_long("file").unwrap().1 + let file = match handler.get_long("file").unwrap().1.get_value() { - OptionValue::Absent => false, - OptionValue::Present => - { - return; - }, - OptionValue::Value(ref path) => + None => false, + Some(ref path) => { match fs::read(path) { @@ -116,8 +112,7 @@ fn main_print(mut args: Args) } } // if --interactive or no schematics: continue parsing from console - let interactive = if let OptionValue::Absent = handler.get_long("interactive").unwrap().1 {false} else {true}; - if interactive || (!file && handler.get_literals().is_empty()) + if handler.get_long("interactive").unwrap().1.is_present() || (!file && handler.get_literals().is_empty()) { println!("\nEntering interactive mode, paste schematic to print details.\n"); let mut buff = String::new(); |