encounter
/
objdiff
mirror of https://github.com/encounter/objdiff.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add scratch preset_id field for decomp.me 

Resolves #133
This commit is contained in:
Luke Street 2024-11-07 09:26:55 -07:00
parent ebf653816a
commit a119d9a6dd
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
objdiff-core/src/config/mod.rs
View File

@ -165,6 +165,8 @@ pub struct ScratchConfig {
pub ctx_path: Option<PathBuf>, pub ctx_path: Option<PathBuf>,
#[serde(default, skip_serializing_if = "Option::is_none")] #[serde(default, skip_serializing_if = "Option::is_none")]
pub build_ctx: Option<bool>, pub build_ctx: Option<bool>,
#[serde(default, skip_serializing_if = "Option::is_none")]
pub preset_id: Option<u32>,
} }
pub const CONFIG_FILENAMES: [&str; 3] = ["objdiff.json", "objdiff.yml", "objdiff.yaml"]; pub const CONFIG_FILENAMES: [&str; 3] = ["objdiff.json", "objdiff.yml", "objdiff.yaml"];

1
objdiff-gui/src/app_config.rs
View File

@ -71,6 +71,7 @@ impl ScratchConfigV1 {
c_flags: self.c_flags, c_flags: self.c_flags,
ctx_path: self.ctx_path, ctx_path: self.ctx_path,
build_ctx: self.build_ctx.then_some(true), build_ctx: self.build_ctx.then_some(true),
preset_id: None,
} }
} }
} }

11
objdiff-gui/src/jobs/create_scratch.rs
View File

@ -23,6 +23,7 @@ pub struct CreateScratchConfig {
pub compiler_flags: String, pub compiler_flags: String,
pub function_name: String, pub function_name: String,
pub target_obj: PathBuf, pub target_obj: PathBuf,
pub preset_id: Option<u32>,
} }
impl CreateScratchConfig { impl CreateScratchConfig {
@ -45,6 +46,7 @@ impl CreateScratchConfig {
compiler_flags: scratch_config.c_flags.clone().unwrap_or_default(), compiler_flags: scratch_config.c_flags.clone().unwrap_or_default(),
function_name, function_name,
target_obj: target_path.to_path_buf(), target_obj: target_path.to_path_buf(),
preset_id: scratch_config.preset_id,
}) })
} }
@ -101,15 +103,18 @@ fn run_create_scratch(
let obj_path = project_dir.join(&config.target_obj); let obj_path = project_dir.join(&config.target_obj);
let file = reqwest::blocking::multipart::Part::file(&obj_path) let file = reqwest::blocking::multipart::Part::file(&obj_path)
.with_context(|| format!("Failed to open {}", obj_path.display()))?; .with_context(|| format!("Failed to open {}", obj_path.display()))?;
let form = reqwest::blocking::multipart::Form::new() let mut form = reqwest::blocking::multipart::Form::new()
.text("compiler", config.compiler.clone()) .text("compiler", config.compiler.clone())
.text("platform", config.platform.clone()) .text("platform", config.platform.clone())
.text("compiler_flags", config.compiler_flags.clone()) .text("compiler_flags", config.compiler_flags.clone())
.text("diff_label", config.function_name.clone()) .text("diff_label", config.function_name.clone())
.text("diff_flags", diff_flags) .text("diff_flags", diff_flags)
.text("context", context.unwrap_or_default()) .text("context", context.unwrap_or_default())
.text("source_code", "// Move related code from Context tab to here") .text("source_code", "// Move related code from Context tab to here");
.part("target_obj", file); if let Some(preset) = config.preset_id {
form = form.text("preset", preset.to_string());
}
form = form.part("target_obj", file);
let client = reqwest::blocking::Client::new(); let client = reqwest::blocking::Client::new();
let response = client let response = client
.post(formatcp!("{API_HOST}/api/scratch")) .post(formatcp!("{API_HOST}/api/scratch"))