hakowork/rojo
3
0
Fork 0
mirror of https://github.com/rojo-rbx/rojo.git synced 2026-10-23 05:51:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update slugify branch audit plan and implement fixes for identified issues

Browse source 
- Marked all todos in the slugify branch audit plan as completed, confirming the successful verification of core invariants and sync processes.
- Introduced a new plan to address critical bugs, correctness issues, and refactors identified during the audit, including enhancements to metadata handling and slugification logic.
- Added tests to ensure proper handling of filenames with forbidden characters and deduplication of instances with colliding names.
- Refactored metadata operations to improve clarity and maintainability, consolidating logic for reading and writing the `name` field in `.meta.json5` files.
This commit is contained in:
Joe 2026-02-10 20:18:33 -06:00
parent d8175d3b48
commit baf05dcb3d
14 changed files with 875 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

64
src/web/api.rs
View file

@ -1438,8 +1438,6 @@ impl ApiService {
.get_instance(removed_id)
.context("Instance not found in Rojo tree")?;
let instance_name = instance.name();
// Get the instigating source and handle each variant appropriately
let instigating_source = instance
.metadata()
@ -1485,16 +1483,60 @@ impl ApiService {
})?;
log::info!("Syncback: Removed directory at {}", instance_path.display());
} else if instance_path.is_file() {
self.suppress_path_remove(instance_path);
fs::remove_file(instance_path)
.with_context(|| format!("Failed to remove file: {}", instance_path.display()))?;
log::info!("Syncback: Removed file at {}", instance_path.display());
use crate::syncback::adjacent_meta_path;
// Also remove adjacent meta file if it exists
// The meta file is named after the instance name, not the file name
// e.g., for "MyScript.server.luau", the meta file is "MyScript.meta.json5"
if let Some(parent_dir) = instance_path.parent() {
let meta_path = parent_dir.join(format!("{}.meta.json5", instance_name));
let file_name = instance_path
.file_name()
.and_then(|f| f.to_str())
.unwrap_or("");
let is_init_file = file_name.starts_with("init.");
if is_init_file {
// Directory-format script: the parent directory represents the
// instance (e.g. src/MyModule/init.luau → the directory IS MyModule).
// Remove the entire directory.
let dir_path = instance_path.parent().unwrap();
self.suppress_path_remove(dir_path);
fs::remove_dir_all(dir_path).with_context(|| {
format!(
"Failed to remove directory for init file: {}",
dir_path.display()
)
})?;
log::info!(
"Syncback: Removed directory {} (init file: {})",
dir_path.display(),
instance_path.display()
);
// Also remove adjacent dir-level meta in the grandparent if it
// exists (e.g. grandparent/MyModule.meta.json5).
if let Some(grandparent) = dir_path.parent() {
if let Some(dir_name) = dir_path.file_name().and_then(|f| f.to_str()) {
let dir_meta = grandparent.join(format!("{}.meta.json5", dir_name));
if dir_meta.exists() {
if let Err(err) = fs::remove_file(&dir_meta) {
log::warn!(
"Failed to remove dir-level meta file {}: {}",
dir_meta.display(),
err
);
}
}
}
}
} else {
// Regular file: remove the file itself
self.suppress_path_remove(instance_path);
fs::remove_file(instance_path).with_context(|| {
format!("Failed to remove file: {}", instance_path.display())
})?;
log::info!("Syncback: Removed file at {}", instance_path.display());
// Remove the adjacent meta file if it exists. The meta file is
// named after the script file's base stem (the slugified name),
// not the raw instance name.
let meta_path = adjacent_meta_path(instance_path);
if meta_path.exists() {
if let Err(err) = fs::remove_file(&meta_path) {
log::warn!(