mirror of
https://github.com/rojo-rbx/rojo.git
synced 2026-10-23 05:51:39 +00:00
fix: extract orphan helpers so pre-walked path reuses them without duplication
Bugbot flagged that the pre-walked fast path bypassed collect_alternate_files and instigating_source checks. Fixed by extracting both into shared helpers called before the if/else branch, so both paths use the same logic.
This commit is contained in:
Joe
parent
a2c7968c60
commit
e06e9f7594
1 changed files with 120 additions and 84 deletions
|
|
@ -287,54 +287,9 @@ pub fn syncback_loop_with_stats(
|
|||
|
||||
let project_path = project.folder_location();
|
||||
|
||||
let phase_timer = std::time::Instant::now();
|
||||
let existing_paths: HashSet<PathBuf> = if !incremental {
|
||||
if let Some(pre_walked) = pre_walked_paths.filter(|p| p.len() > 100) {
|
||||
let before = pre_walked.len();
|
||||
let filtered: HashSet<PathBuf> = pre_walked
|
||||
.into_iter()
|
||||
.filter(|p| is_valid_path(&ignore_patterns, project_path, p))
|
||||
.collect();
|
||||
log::debug!(
|
||||
"[PERF] orphan scan: reusing pre-walked paths ({} -> {} after syncback filters)",
|
||||
before,
|
||||
filtered.len()
|
||||
);
|
||||
filtered
|
||||
} else {
|
||||
let mut paths = HashSet::new();
|
||||
|
||||
// Get the source directories from the project's tree structure.
|
||||
// We need to collect ALL $path directories defined in the project,
|
||||
// not just instigating_source metadata (which may point to project file).
|
||||
let mut dirs_to_scan: Vec<PathBuf> = Vec::new();
|
||||
|
||||
// Recursively collect $path DIRECTORY entries from project tree.
|
||||
// Only directories need to be scanned for orphan detection.
|
||||
fn collect_paths_from_project(
|
||||
node: &crate::project::ProjectNode,
|
||||
base_path: &Path,
|
||||
paths: &mut Vec<PathBuf>,
|
||||
) {
|
||||
if let Some(ref path_node) = node.path {
|
||||
let resolved = base_path.join(path_node.path());
|
||||
if resolved.is_dir() && !paths.contains(&resolved) {
|
||||
log::trace!("Found $path directory in project: {}", resolved.display());
|
||||
paths.push(resolved);
|
||||
}
|
||||
}
|
||||
for child in node.children.values() {
|
||||
collect_paths_from_project(child, base_path, paths);
|
||||
}
|
||||
}
|
||||
|
||||
collect_paths_from_project(&project.tree, project_path, &mut dirs_to_scan);
|
||||
|
||||
// Collect alternate file representations of $path entries.
|
||||
// e.g., if $path: "src" expects a directory, but "src.luau" exists as a file,
|
||||
// that orphan file should be removed.
|
||||
let mut orphan_files_to_check: Vec<PathBuf> = Vec::new();
|
||||
|
||||
fn collect_alternate_files(
|
||||
node: &crate::project::ProjectNode,
|
||||
base_path: &Path,
|
||||
|
|
@ -373,42 +328,123 @@ pub fn syncback_loop_with_stats(
|
|||
collect_alternate_files(child, base_path, files);
|
||||
}
|
||||
}
|
||||
collect_alternate_files(&project.tree, project_path, &mut orphan_files_to_check);
|
||||
|
||||
// Check instance metadata for paths that might not be in the project
|
||||
// (e.g., from nested project references)
|
||||
let root = old_tree.root();
|
||||
log::trace!(
|
||||
"Root instance: name={}, class={}",
|
||||
root.name(),
|
||||
root.class_name()
|
||||
);
|
||||
if let Some(source) = &root.metadata().instigating_source {
|
||||
/// Collect non-project-file instigating_source directories from the old tree root
|
||||
/// and its direct children. These may point to directories not covered by `$path`.
|
||||
fn collect_instigating_dirs(old_tree: &RojoTree, existing: &mut Vec<PathBuf>) {
|
||||
let is_project_file = |p: &Path| {
|
||||
let s = p.to_string_lossy();
|
||||
s.ends_with(".project.json5") || s.ends_with(".project.json")
|
||||
};
|
||||
if let Some(source) = &old_tree.root().metadata().instigating_source {
|
||||
let path = source.path();
|
||||
if !path.to_string_lossy().ends_with(".project.json5")
|
||||
&& !path.to_string_lossy().ends_with(".project.json")
|
||||
{
|
||||
if !is_project_file(path) {
|
||||
log::trace!("Root has instigating_source: {}", path.display());
|
||||
if path.exists() && !dirs_to_scan.contains(&path.to_path_buf()) {
|
||||
dirs_to_scan.push(path.to_path_buf());
|
||||
if path.exists() && !existing.contains(&path.to_path_buf()) {
|
||||
existing.push(path.to_path_buf());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
for ref_id in old_tree.inner().root().children() {
|
||||
if let Some(inst) = old_tree.get_instance(*ref_id) {
|
||||
if let Some(source) = &inst.metadata().instigating_source {
|
||||
let path = source.path();
|
||||
if !path.to_string_lossy().ends_with(".project.json5")
|
||||
&& !path.to_string_lossy().ends_with(".project.json")
|
||||
if !is_project_file(path)
|
||||
&& path.exists()
|
||||
&& !dirs_to_scan.contains(&path.to_path_buf())
|
||||
&& !existing.contains(&path.to_path_buf())
|
||||
{
|
||||
dirs_to_scan.push(path.to_path_buf());
|
||||
existing.push(path.to_path_buf());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
let phase_timer = std::time::Instant::now();
|
||||
let existing_paths: HashSet<PathBuf> = if !incremental {
|
||||
// Alternate-file orphan candidates and instigating_source dirs are
|
||||
// cheap to collect (a few exists() calls) and needed by both paths.
|
||||
let mut orphan_files_to_check: Vec<PathBuf> = Vec::new();
|
||||
collect_alternate_files(&project.tree, project_path, &mut orphan_files_to_check);
|
||||
|
||||
let mut extra_dirs: Vec<PathBuf> = Vec::new();
|
||||
collect_instigating_dirs(old_tree, &mut extra_dirs);
|
||||
|
||||
if let Some(pre_walked) = pre_walked_paths.filter(|p| p.len() > 100) {
|
||||
let before = pre_walked.len();
|
||||
let mut filtered: HashSet<PathBuf> = pre_walked
|
||||
.into_iter()
|
||||
.filter(|p| is_valid_path(&ignore_patterns, project_path, p))
|
||||
.collect();
|
||||
|
||||
// Supplement with alternate files + instigating_source dirs
|
||||
for file in &orphan_files_to_check {
|
||||
if is_valid_path(&ignore_patterns, project_path, file) {
|
||||
filtered.insert(file.clone());
|
||||
}
|
||||
}
|
||||
for dir in &extra_dirs {
|
||||
if !dir.is_dir() {
|
||||
continue;
|
||||
}
|
||||
for entry in walkdir::WalkDir::new(dir)
|
||||
.follow_links(true)
|
||||
.into_iter()
|
||||
.filter_entry(|e| {
|
||||
if e.depth() == 0 {
|
||||
return true;
|
||||
}
|
||||
e.file_name()
|
||||
.to_str()
|
||||
.is_none_or(|n| !n.starts_with('.') || n == ".gitkeep")
|
||||
})
|
||||
.flatten()
|
||||
{
|
||||
if entry.depth() == 0 {
|
||||
continue;
|
||||
}
|
||||
let path = entry.path().to_path_buf();
|
||||
if is_valid_path(&ignore_patterns, project_path, &path) {
|
||||
filtered.insert(path);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
log::info!(
|
||||
"[PERF] orphan scan: reusing pre-walked paths ({} -> {} after filters + supplements)",
|
||||
before,
|
||||
filtered.len()
|
||||
);
|
||||
filtered
|
||||
} else {
|
||||
let mut paths = HashSet::new();
|
||||
|
||||
// Get the source directories from the project's tree structure.
|
||||
// We need to collect ALL $path directories defined in the project,
|
||||
// not just instigating_source metadata (which may point to project file).
|
||||
let mut dirs_to_scan: Vec<PathBuf> = Vec::new();
|
||||
|
||||
// Recursively collect $path DIRECTORY entries from project tree.
|
||||
// Only directories need to be scanned for orphan detection.
|
||||
fn collect_paths_from_project(
|
||||
node: &crate::project::ProjectNode,
|
||||
base_path: &Path,
|
||||
paths: &mut Vec<PathBuf>,
|
||||
) {
|
||||
if let Some(ref path_node) = node.path {
|
||||
let resolved = base_path.join(path_node.path());
|
||||
if resolved.is_dir() && !paths.contains(&resolved) {
|
||||
log::trace!("Found $path directory in project: {}", resolved.display());
|
||||
paths.push(resolved);
|
||||
}
|
||||
}
|
||||
for child in node.children.values() {
|
||||
collect_paths_from_project(child, base_path, paths);
|
||||
}
|
||||
}
|
||||
|
||||
collect_paths_from_project(&project.tree, project_path, &mut dirs_to_scan);
|
||||
dirs_to_scan.extend(extra_dirs);
|
||||
|
||||
if log::log_enabled!(log::Level::Trace) {
|
||||
let dirs_str: Vec<_> = dirs_to_scan
|
||||
|
|
@ -465,7 +501,7 @@ pub fn syncback_loop_with_stats(
|
|||
} else {
|
||||
HashSet::new()
|
||||
};
|
||||
log::debug!(
|
||||
log::info!(
|
||||
"[PERF] orphan scan: {:.3}s ({} paths)",
|
||||
phase_timer.elapsed().as_secs_f64(),
|
||||
existing_paths.len()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue