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

Enhance syncback functionality by implementing tree filtering based on ignoreTrees patterns. Added support for glob pattern matching to filter instances during serialization in both rbxm and rbxmx. Updated SyncbackSnapshot to compile and utilize these patterns efficiently.

Browse source
This commit is contained in:
Joe 2025-12-29 00:02:40 -06:00
parent cf5f7788fc
commit f6dc37e400
4 changed files with 172 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/syncback/mod.rs
View file

@ -32,7 +32,7 @@ pub use file_names::{extension_for_middleware, name_for_inst, validate_file_name
pub use fs_snapshot::FsSnapshot;
pub use hash::*;
pub use property_filter::{filter_properties, filter_properties_preallocated};
pub use snapshot::{SyncbackData, SyncbackSnapshot};
pub use snapshot::{inst_path, SyncbackData, SyncbackSnapshot};
/// The name of an enviroment variable to use to override the behavior of
/// syncback on model files.
@ -59,6 +59,12 @@ pub fn syncback_loop(
.map(|rules| rules.compile_globs())
.transpose()?;
let tree_globs = project
.syncback_rules
.as_ref()
.map(|rules| rules.compile_tree_globs())
.transpose()?;
// TODO: Add a better way to tell if the root of a project is a directory
let skip_pruning = if let Some(path) = &project.tree.path {
let middleware =
@ -187,11 +193,11 @@ pub fn syncback_loop(
log::debug!("Skipping {inst_path} because its path matches ignore pattern");
continue;
}
if let Some(syncback_rules) = &project.syncback_rules {
// Ignore trees;
for ignored in &syncback_rules.ignore_trees {
if inst_path.starts_with(ignored.as_str()) {
log::debug!("Tree {inst_path} is blocked by project");
// Check ignoreTrees with glob pattern support
if let Some(ref globs) = tree_globs {
for glob in globs {
if glob.is_match(&inst_path) {
log::debug!("Tree {inst_path} is blocked by ignoreTrees glob pattern");
continue 'syncback;
}
}
@ -261,10 +267,11 @@ pub fn syncback_loop(
);
continue;
}
if let Some(syncback_rules) = &project.syncback_rules {
for ignored in &syncback_rules.ignore_trees {
if inst_path.starts_with(ignored.as_str()) {
log::debug!("Skipping removing {inst_path} because its path is blocked by project");
// Check ignoreTrees with glob pattern support
if let Some(ref globs) = tree_globs {
for glob in globs {
if glob.is_match(&inst_path) {
log::debug!("Skipping removing {inst_path} because its path is blocked by ignoreTrees glob pattern");
continue 'remove;
}
}
@ -439,6 +446,20 @@ impl SyncbackRules {
Ok(globs)
}
/// Compiles the ignoreTrees patterns into glob matchers.
/// Supports glob patterns like `**/Abc/Script` for flexible matching.
pub fn compile_tree_globs(&self) -> anyhow::Result<Vec<Glob>> {
let mut globs = Vec::with_capacity(self.ignore_trees.len());
for pattern in &self.ignore_trees {
let glob = Glob::new(pattern)
.with_context(|| format!("the pattern '{pattern}' is not a valid ignoreTrees glob"))?;
globs.push(glob);
}
Ok(globs)
}
/// Returns whether Windows-invalid characters should be encoded in file
/// names during syncback. Defaults to `false`.
#[inline]