endernon/idmangler-cli
1
0
Fork 0
Code Issues Pull requests Projects Releases 7 Packages Wiki Activity Actions

cargo fmt

Browse source
This commit is contained in:
endernon 2024-12-31 16:27:33 +00:00
parent 41610c51ca
commit fa9a50b60e
1 changed files with 13 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/main.rs
View file

@ -96,20 +96,16 @@ fn main() {
// create necessary variables
let ver = TransformVersion::Version1;
// StartData and TypeData are always present
// ENCODE: StartData
StartData(ver)
.encode(ver, &mut out)
.unwrap();
StartData(ver).encode(ver, &mut out).unwrap();
// ENCODE: TypeData
TypeData(ItemType::from(loaded_config.item_type))
.encode(ver, &mut out)
.unwrap();
// ENCODE: ALotOfStuff
// Also print any mapped errors
if let Err(e) = cook(
@ -124,15 +120,10 @@ fn main() {
};
// ENCODE: EndData
EndData
.encode(ver, &mut out)
.unwrap();
EndData.encode(ver, &mut out).unwrap();
// final string print
println!("{}", encode_string(&out));
}
Err(e) => println!("{}", e),
}
@ -144,9 +135,14 @@ fn main() {
}
}
}
fn cook(debug_mode: &bool, json_config: Jsonconfig, idsmap: HashMap<String, u8>, json_shiny: Vec<Shinystruct>, out: &mut Vec<u8>, ver: TransformVersion) -> Result<(), Errorfr> {
fn cook(
debug_mode: &bool,
json_config: Jsonconfig,
idsmap: HashMap<String, u8>,
json_shiny: Vec<Shinystruct>,
out: &mut Vec<u8>,
ver: TransformVersion,
) -> Result<(), Errorfr> {
// ENCODE: NameData
NameData(json_config.name.trim().to_string())
.encode(ver, out)
@ -218,7 +214,6 @@ fn cook(debug_mode: &bool, json_config: Jsonconfig, idsmap: HashMap<String, u8>,
.encode(ver, out)
.unwrap();
if let Some(rerollcount) = json_config.rerolls {
if rerollcount != 0 {
// ENCODE: RerollData if applicable
@ -259,13 +254,12 @@ fn cook(debug_mode: &bool, json_config: Jsonconfig, idsmap: HashMap<String, u8>,
// prints (Water,6) 255 times
// println!("{:?}",vec![(Powders::WATER, 6); 255]);
Ok(())
}
fn load_jsonconfig(path: &String) -> Result<Jsonconfig, Errorfr> {
serde_json::from_reader(fs::File::open(path).map_err(|_| Errorfr::ItemJsonMissing)?)
.map_err(Errorfr::ItemJsonCorrupt)
serde_json::from_reader(fs::File::open(path).map_err(|_| Errorfr::ItemJsonMissing)?)
.map_err(Errorfr::ItemJsonCorrupt)
}
fn load_idkeys(executable_path: &str) -> Result<HashMap<String, u8>, Errorfr> {
// id_keys.json
@ -282,4 +276,4 @@ fn load_shinystats(executable_path: &str) -> Result<Vec<Shinystruct>, Errorfr> {
.map_err(|_| Errorfr::ShinyJsonMissing)?,
)
.map_err(|_| Errorfr::ShinyJsonCorrupt)
}
}