From d65b0bad61058f7c1122986f6821e29dfba5d3d3 Mon Sep 17 00:00:00 2001 From: jaby Date: Fri, 7 Oct 2022 11:30:30 +0200 Subject: [PATCH] Add data to cd desc --- src/Tools/psxcdgen_ex/src/main.rs | 18 ++++++++++++++---- src/Tools/psxcdgen_ex/src/types/mod.rs | 12 ++++++++---- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/src/Tools/psxcdgen_ex/src/main.rs b/src/Tools/psxcdgen_ex/src/main.rs index fcbb10c8..dc54ae35 100644 --- a/src/Tools/psxcdgen_ex/src/main.rs +++ b/src/Tools/psxcdgen_ex/src/main.rs @@ -1,7 +1,17 @@ -use psxcdgen_ex::types::CDDesc; +use psxcdgen_ex::types::{CDDesc, Data}; +use tool_helper::Error; + +fn run_main() -> Result<(), Error> { + let mut desc = CDDesc::new(); + let file = Data::new("Planschi")?; + + desc.root.add_data(file); + Ok(()) +} fn main() { - let _desc = CDDesc::new(); - - println!("Planschbecken"); + match run_main() { + Ok(_) => println!("Planschbecken"), + Err(error) => println!("{}", error) + } } \ No newline at end of file diff --git a/src/Tools/psxcdgen_ex/src/types/mod.rs b/src/Tools/psxcdgen_ex/src/types/mod.rs index fb8aa44a..0fde591a 100644 --- a/src/Tools/psxcdgen_ex/src/types/mod.rs +++ b/src/Tools/psxcdgen_ex/src/types/mod.rs @@ -14,10 +14,6 @@ impl CDDesc { } } -pub struct PVD { - -} - pub struct Directory { name: DirectoryName, properties: Properties, @@ -29,6 +25,14 @@ impl Directory { pub fn new(dir_name: &str) -> Result { Ok(Directory{name: DirectoryName::from_str(dir_name)?, properties: Properties::default(), data: Vec::new(), dirs: Vec::new()}) } + + pub fn add_dir(&mut self, dir: Directory) { + self.dirs.push(dir); + } + + pub fn add_data(&mut self, data: Data) { + self.data.push(data); + } } pub struct Data {