Skip to content

Code review / hotfixes #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
patataofcourse wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

Code review / hotfixes #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e4ff9c0
run formatter, remove let _
patataofcourse Mar 19, 2024
48cedfd
fix readme badge
patataofcourse Mar 19, 2024
11d52f5
add a bunch of fixmes
patataofcourse Mar 19, 2024
9e29925
suppress rustdoc warnings on CLI arguments
patataofcourse Mar 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# MSBTools

[![Version 0.1](https://img.shields.io/badge/version-v0.1-red)](todo!)
[![Version 0.1](https://img.shields.io/badge/version-v0.1-red)](https://github.com/TheAlternateDoctor/msbt_lib/releases/tag/v0.1)

A crate that allows manipulating Nintendo's proprietary MSBT format, with a library crate to parse those files.

Expand Down
190 changes: 107 additions & 83 deletions src/control_codes.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,23 @@ use bytestream::ByteOrder;
use crate::structs::txt2::{convert_char, read_char};

#[derive(Debug)]
pub struct ControlCode{
pub struct ControlCode {
tag_group: u16,
tag_type: u16,
params_size: u16,
params: Vec<u8>
params: Vec<u8>,
}

pub fn convert_control_code_binary(string: &mut VecDeque<u8>, order: bytestream::ByteOrder) -> String{

let mut control_code = ControlCode {tag_group:0,tag_type:0,params_size:0,params:Vec::<u8>::new()};
pub fn convert_control_code_binary(
string: &mut VecDeque<u8>,
order: bytestream::ByteOrder,
) -> String {
let mut control_code = ControlCode {
tag_group: 0,
tag_type: 0,
params_size: 0,
params: Vec::<u8>::new(),
};

//Reading the group of the code
let byte_temp = [string.pop_front().unwrap(), string.pop_front().unwrap()];
Expand All @@ -37,14 +44,21 @@ pub fn convert_control_code_binary(string: &mut VecDeque<u8>, order: bytestream:
}
match control_code.tag_group {
0 => write_global(control_code),
_ => write_raw_code(control_code)
_ => write_raw_code(control_code),
}
// Now we write the final string
}

pub fn convert_control_code_close_binary(string: &mut VecDeque<u8>, order: bytestream::ByteOrder) -> String {

let mut control_code = ControlCode {tag_group:0,tag_type:0,params_size:0,params:Vec::<u8>::new()};
pub fn convert_control_code_close_binary(
string: &mut VecDeque<u8>,
order: bytestream::ByteOrder,
) -> String {
let mut control_code = ControlCode {
tag_group: 0,
tag_type: 0,
params_size: 0,
params: Vec::<u8>::new(),
};

//Reading the group of the code
let byte_temp = [string.pop_front().unwrap(), string.pop_front().unwrap()];
Expand All @@ -55,7 +69,7 @@ pub fn convert_control_code_close_binary(string: &mut VecDeque<u8>, order: bytes
let byte_temp = [string.pop_front().unwrap(), string.pop_front().unwrap()];
let byte = read_char(byte_temp, order);
control_code.tag_type = byte;

// Now we write the final string
let mut control_string = String::from("[/RawCmd ");
control_string += &control_code.tag_group.to_string();
Expand All @@ -66,7 +80,7 @@ pub fn convert_control_code_close_binary(string: &mut VecDeque<u8>, order: bytes
control_string
}

pub fn convert_control_code(code: &str, order: bytestream::ByteOrder) -> Vec<u8>{
pub fn convert_control_code(code: &str, order: bytestream::ByteOrder) -> Vec<u8> {
let mut bare_code = code.to_string();
bare_code.remove(0);
bare_code.pop();
Expand All @@ -79,215 +93,225 @@ pub fn convert_control_code(code: &str, order: bytestream::ByteOrder) -> Vec<u8>
convert_raw_code(bare_content[1], "", order)
}
}
"Colour" | "Color" => {
convert_colour_code(bare_content[1], order)
}
"Size" => {
convert_size_code(bare_content[1], order)
}
"Colour" | "Color" => convert_colour_code(bare_content[1], order),
"Size" => convert_size_code(bare_content[1], order),
_ => {
let mut raw_bytes = Vec::<u8>::new();
for char in code.chars(){
for char in code.chars() {
raw_bytes.append(&mut convert_char(char, order));
}
raw_bytes
}
}
}

pub fn convert_control_code_close(code: &str, order: bytestream::ByteOrder) -> Vec<u8>{
pub fn convert_control_code_close(code: &str, order: bytestream::ByteOrder) -> Vec<u8> {
let mut raw_bytes = Vec::<u8>::new();
let mut bare_code = code.to_string();
bare_code.remove(0);
bare_code.remove(0);
bare_code.pop();
let bare_content = bare_code.split(' ').collect::<Vec<&str>>();
match bare_content[0]{
match bare_content[0] {
"RawCmd" => {
let code_def = bare_content[1].split('.').collect::<Vec<&str>>();
let tag_group: u16 = code_def[0].parse().unwrap();
let tag_type: u16 = code_def[1].parse().unwrap();

raw_bytes.push(0x0F);
raw_bytes.push(0x00);
match order{
match order {
ByteOrder::BigEndian => {
raw_bytes.append(&mut tag_group.to_be_bytes().to_vec());
raw_bytes.append(&mut tag_type.to_be_bytes().to_vec());
},
}
ByteOrder::LittleEndian => {
raw_bytes.append(&mut tag_group.to_le_bytes().to_vec());
raw_bytes.append(&mut tag_type.to_le_bytes().to_vec());
},
}
}
}
_=> {
for char in code.chars(){
_ => {
for char in code.chars() {
raw_bytes.append(&mut convert_char(char, order));
}
}
}
raw_bytes
}

fn write_global(code: ControlCode) -> String{
fn write_global(code: ControlCode) -> String {
match code.tag_type {
0 => "[Ruby_to_document]".to_owned(), // Ruby type, string argument?
1 => "[Font_to_document]".to_owned(), // Font type, string argument?
2 => write_size_code(code), // Text size type. Argument u16?
3 => write_colour_code(code), // Colour type. Argument #RRGGBBAA
_ => write_raw_code(code).to_owned() //Unknown type. All types are hopefully handled above.
2 => write_size_code(code), // Text size type. Argument u16?
3 => write_colour_code(code), // Colour type. Argument #RRGGBBAA
_ => write_raw_code(code).to_owned(), //Unknown type. All types are hopefully handled above.
}
}

fn write_raw_code(code: ControlCode) -> String{
fn write_raw_code(code: ControlCode) -> String {
let mut control_string = String::from("[RawCmd ");
control_string += &code.tag_group.to_string();
control_string += ".";
control_string += &code.tag_type.to_string();
if code.params_size > 0{
if code.params_size > 0 {
control_string += " ";
for code in code.params{
for code in code.params {
control_string += &format!("{code:02X}");
control_string += "_";
}
control_string.truncate(control_string.len()-1);
control_string.truncate(control_string.len() - 1);
}
control_string += "]";
control_string
}

fn write_size_code(code: ControlCode) -> String {
let mut control_string = String::from("[Size ");
for code in code.params{
control_string += &format!("{code:02X}");
}
control_string.truncate(control_string.len()-1);
for code in code.params {
control_string += &format!("{code:02X}");
}
control_string.truncate(control_string.len() - 1);
control_string += "]";
control_string
}

fn write_colour_code(code: ControlCode) -> String {
let mut control_string = String::from("[Colour #");
for code in code.params{
control_string += &format!("{code:02X}");
}
control_string.truncate(control_string.len()-1);
for code in code.params {
control_string += &format!("{code:02X}");
}
control_string.truncate(control_string.len() - 1);
control_string += "]";
control_string
}

fn convert_raw_code(code_type: &str, args: &str, order: bytestream::ByteOrder) -> Vec<u8>{
fn convert_raw_code(code_type: &str, args: &str, order: bytestream::ByteOrder) -> Vec<u8> {
let mut raw_bytes = Vec::<u8>::new();

let mut control_code = ControlCode{
tag_group: 0,
tag_type: 0,
params_size: 0,
params: Vec::<u8>::new()
let mut control_code = ControlCode {
tag_group: 0,
tag_type: 0,
params_size: 0,
params: Vec::<u8>::new(),
};
let code_def = code_type.split('.').collect::<Vec<&str>>();
control_code.tag_group = code_def[0].parse().unwrap();
control_code.tag_type = code_def[1].parse().unwrap();

if !args.is_empty(){
control_code.params_size = ((args.len()+1)/3) as u16;
if !args.is_empty() {
control_code.params_size = ((args.len() + 1) / 3) as u16;
for byte in args.split('_').collect::<Vec<&str>>() {
control_code.params.push(u8::from_str_radix(byte, 16).unwrap());
control_code
.params
.push(u8::from_str_radix(byte, 16).unwrap());
}
} else {
control_code.params_size = 0u16;
}
raw_bytes.push(0x0E);
raw_bytes.push(0x00);
match order{
match order {
ByteOrder::BigEndian => {
raw_bytes.append(&mut control_code.tag_group.to_be_bytes().to_vec());
raw_bytes.append(&mut control_code.tag_type.to_be_bytes().to_vec());
raw_bytes.append(&mut control_code.params_size.to_be_bytes().to_vec());
},
}
ByteOrder::LittleEndian => {
raw_bytes.append(&mut control_code.tag_group.to_le_bytes().to_vec());
raw_bytes.append(&mut control_code.tag_type.to_le_bytes().to_vec());
raw_bytes.append(&mut control_code.params_size.to_le_bytes().to_vec());
},
}
}
if control_code.params_size != 0{
if control_code.params_size != 0 {
raw_bytes.append(&mut control_code.params);
}
raw_bytes
}

fn convert_colour_code(args: &str, order: bytestream::ByteOrder) -> Vec<u8>{
fn convert_colour_code(args: &str, order: bytestream::ByteOrder) -> Vec<u8> {
let mut raw_bytes = Vec::<u8>::new();
let mut bare_args = args.to_string();
bare_args.remove(0);

let mut control_code = ControlCode{
tag_group: 0,
tag_type: 3,
params_size: 4,
params: Vec::<u8>::new()
let mut control_code = ControlCode {
tag_group: 0,
tag_type: 3,
params_size: 4,
params: Vec::<u8>::new(),
};

for _i in 0..bare_args.len()/2{
let arg:String = args.chars().skip(control_code.params.len()*2).take(2).collect();
control_code.params.push(u8::from_str_radix(&arg, 16).unwrap())
}
for _i in 0..bare_args.len() / 2 {
let arg: String = args
.chars()
.skip(control_code.params.len() * 2)
.take(2)
.collect();
control_code
.params
.push(u8::from_str_radix(&arg, 16).unwrap())
}

raw_bytes.push(0x0E);
raw_bytes.push(0x00);
match order{
match order {
ByteOrder::BigEndian => {
raw_bytes.append(&mut control_code.tag_group.to_be_bytes().to_vec());
raw_bytes.append(&mut control_code.tag_type.to_be_bytes().to_vec());
raw_bytes.append(&mut control_code.params_size.to_be_bytes().to_vec());
},
}
ByteOrder::LittleEndian => {
raw_bytes.append(&mut control_code.tag_group.to_le_bytes().to_vec());
raw_bytes.append(&mut control_code.tag_type.to_le_bytes().to_vec());
raw_bytes.append(&mut control_code.params_size.to_le_bytes().to_vec());
},
}
}
if control_code.params_size != 0{
if control_code.params_size != 0 {
raw_bytes.append(&mut control_code.params);
}
raw_bytes
}

fn convert_size_code(args: &str, order: bytestream::ByteOrder) -> Vec<u8>{
fn convert_size_code(args: &str, order: bytestream::ByteOrder) -> Vec<u8> {
let mut raw_bytes = Vec::<u8>::new();
let mut bare_args = args.to_string();
bare_args.remove(0);

let mut control_code = ControlCode{
tag_group: 0,
tag_type: 2,
params_size: 2,
params: Vec::<u8>::new()
let mut control_code = ControlCode {
tag_group: 0,
tag_type: 2,
params_size: 2,
params: Vec::<u8>::new(),
};

for _i in 0..bare_args.len()/2{
let arg:String = args.chars().skip(control_code.params.len()*2).take(2).collect();
control_code.params.push(u8::from_str_radix(&arg, 16).unwrap())
}
for _i in 0..bare_args.len() / 2 {
let arg: String = args
.chars()
.skip(control_code.params.len() * 2)
.take(2)
.collect();
control_code
.params
.push(u8::from_str_radix(&arg, 16).unwrap())
}

raw_bytes.push(0x0E);
raw_bytes.push(0x00);
match order{
match order {
ByteOrder::BigEndian => {
raw_bytes.append(&mut control_code.tag_group.to_be_bytes().to_vec());
raw_bytes.append(&mut control_code.tag_type.to_be_bytes().to_vec());
raw_bytes.append(&mut control_code.params_size.to_be_bytes().to_vec());
},
}
ByteOrder::LittleEndian => {
raw_bytes.append(&mut control_code.tag_group.to_le_bytes().to_vec());
raw_bytes.append(&mut control_code.tag_type.to_le_bytes().to_vec());
raw_bytes.append(&mut control_code.params_size.to_le_bytes().to_vec());
},
}
}
if control_code.params_size != 0{
if control_code.params_size != 0 {
raw_bytes.append(&mut control_code.params);
}
raw_bytes
}
}
Loading