jaby
/
jabyengine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Support LZ4 compression for external CMDs

This commit is contained in:
Jaby 2024-09-28 15:00:18 +02:00
parent f8d94904a4
commit 77be3d7239
2 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Tools/jaby_engine_fconv/src/main.rs
View File

@ -88,16 +88,26 @@ fn run_internal_conversion(cmd: CommandLine) -> Result<(), Error> {
fn run_external_conversion(cmd: CommandLine) -> Result<(), Error> { fn run_external_conversion(cmd: CommandLine) -> Result<(), Error> {
let input_file = cmd.input_file.ok_or(Error::from_str("Input has to be a file"))?; let input_file = cmd.input_file.ok_or(Error::from_str("Input has to be a file"))?;
let output_file = cmd.output_file.ok_or(Error::from_str("Output has to be a file"))?; let output_file = cmd.output_file.ok_or(Error::from_str("Output has to be a file"))?;
let is_xa = matches!(cmd.sub_command, SubCommands::XA(_));
if cmd.compress_lz4 {
print_warning("LZ4 compression not supported for external commands".to_owned());
}
match cmd.sub_command { match cmd.sub_command {
SubCommands::VAG(args) => vag::convert(args, input_file, output_file), SubCommands::VAG(args) => vag::convert(args, input_file, output_file.clone()),
SubCommands::XA(args) => xa::convert(args, input_file, output_file), SubCommands::XA(args) => xa::convert(args, input_file, output_file.clone()),
_ => Err(Error::from_str("Internal functions can not be called for external conversion")) _ => Err(Error::from_str("Internal functions can not be called for external conversion"))
}?;
if cmd.compress_lz4 {
if is_xa {
print_warning(format!("File {} is of type XA and can not be compressed", output_file.to_string_lossy()));
}
else {
let compressed_file = tool_helper::compress::psx_default::lz4(&tool_helper::read_file(&output_file)?)?;
return tool_helper::write_file(&output_file, compressed_file);
}
} }
Ok(())
} }
fn run_main(cmd: CommandLine) -> Result<(), Error> { fn run_main(cmd: CommandLine) -> Result<(), Error> {

9
src/Tools/tool_helper/src/lib.rs
View File

@ -1,6 +1,6 @@
use colored::*; use colored::*;
use envmnt::{ExpandOptions, ExpansionType}; use envmnt::{ExpandOptions, ExpansionType};
use std::{boxed::Box, io::{BufRead, BufReader, BufWriter, Read, Write}, path::PathBuf, str::FromStr}; use std::{boxed::Box, fs::OpenOptions, io::{BufRead, BufReader, BufWriter, Read, Write}, path::PathBuf, str::FromStr};
pub mod bits; pub mod bits;
pub mod compress; pub mod compress;
@ -241,6 +241,13 @@ pub fn read_file_to_string(file_path: &PathBuf) -> Result<String, Error> {
} }
} }
pub fn write_file(file_path: &PathBuf, data: Vec<u8>) -> Result<(), Error> {
let mut file = OpenOptions::new().read(true).write(true).truncate(true).create(true).open(file_path)?;
file.write_all(data.as_slice())?;
Ok(())
}
fn create_file_read_error<T>(file_path: &PathBuf, error: std::io::Error) -> Result<T, Error> { fn create_file_read_error<T>(file_path: &PathBuf, error: std::io::Error) -> Result<T, Error> {
Err(Error::from_text(format!("Failed reading file {} with error: \"{}\"", file_path.display(), error))) Err(Error::from_text(format!("Failed reading file {} with error: \"{}\"", file_path.display(), error)))
} }