From 5327d900947a3bd99f89706f96ccfcd468ab0198 Mon Sep 17 00:00:00 2001 From: jaby Date: Sat, 17 Sep 2022 17:31:51 +0200 Subject: [PATCH] Calling un-implemented convert function --- src/Tools/Tests/Test.mk | 2 +- .../src/images/reduced_tim/mod.rs | 6 ++--- src/Tools/jaby_engine_fconv/src/main.rs | 22 +++++++++++++++---- 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/src/Tools/Tests/Test.mk b/src/Tools/Tests/Test.mk index cf8d78c5..39bf8afb 100644 --- a/src/Tools/Tests/Test.mk +++ b/src/Tools/Tests/Test.mk @@ -7,6 +7,6 @@ test_cpp_out: always test_jaby_engine_fconv: always @cargo build --manifest-path ../jaby_engine_fconv/Cargo.toml --release - @./../jaby_engine_fconv/target/release/jaby_engine_fconv --help + @./../jaby_engine_fconv/target/release/jaby_engine_fconv -o Test_Planschi.bin Test_PNG.PNG simple-tim full16 always: ; \ No newline at end of file diff --git a/src/Tools/jaby_engine_fconv/src/images/reduced_tim/mod.rs b/src/Tools/jaby_engine_fconv/src/images/reduced_tim/mod.rs index eb147504..a886f2f8 100644 --- a/src/Tools/jaby_engine_fconv/src/images/reduced_tim/mod.rs +++ b/src/Tools/jaby_engine_fconv/src/images/reduced_tim/mod.rs @@ -1,5 +1,5 @@ use clap::{Args, ValueEnum}; -use tool_helper::{Input, Output}; +use tool_helper::{Error, Input, Output}; #[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, ValueEnum)] pub enum ColorDepth { @@ -14,6 +14,6 @@ pub struct Arguments { color_depth: ColorDepth } -pub fn convert(_input: Input, _output: Output) { - println!("Bin ein Planschbecken!"); +pub fn convert(_args: Arguments, _input: Input, _output: Output) -> Result<(), Error> { + Err(Error::new("Convert not implemented yet".to_owned(), Some(-2))) } \ No newline at end of file diff --git a/src/Tools/jaby_engine_fconv/src/main.rs b/src/Tools/jaby_engine_fconv/src/main.rs index 77731d9a..a5ad76b2 100644 --- a/src/Tools/jaby_engine_fconv/src/main.rs +++ b/src/Tools/jaby_engine_fconv/src/main.rs @@ -20,9 +20,23 @@ enum SubCommands { SimpleTIM(reduced_tim::Arguments) } -fn main() { +fn run_main() -> tool_helper::Result<()> { match CommandLine::try_parse() { - Ok(_cmd) => println!("Planschbecken"), - Err(error) => println!("{}", error.to_string()) - } + Ok(cmd) => { + let input = tool_helper::open_input(cmd.input_file)?; + let output = tool_helper::open_output(cmd.output_file)?; + + match cmd.sub_command { + SubCommands::SimpleTIM(args) => reduced_tim::convert(args, input, output), + } + }, + Err(error) => Err(tool_helper::Error::new(error.to_string(), None)) + } +} + +fn main() { + if let Err(error) = run_main() { + println!("{}", error.text); + std::process::exit(error.exit_code); + } } \ No newline at end of file