Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

469241 Add ability to recurse watch to any tree depth

This commit is contained in:
Jan Bartel 2015-06-04 09:40:35 +10:00
parent 5fda111bcc
commit e0161ab234
2 changed files with 49 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
jetty-util/src/main/java/org/eclipse/jetty/util/PathWatcher.java
View File

@ -67,6 +67,8 @@ public class PathWatcher extends AbstractLifeCycle implements Runnable
{
public static class Config
{
public static final int UNLIMITED_DEPTH = -9999;
private static final String PATTERN_SEP;
static
@ -258,8 +260,10 @@ public class PathWatcher extends AbstractLifeCycle implements Runnable
subconfig.recurseDepth = this.recurseDepth; // TODO shouldn't really do a subconfig for this
else
{
subconfig.recurseDepth = this.recurseDepth - (dir.getNameCount() - this.dir.getNameCount());
if (this.recurseDepth == UNLIMITED_DEPTH)
subconfig.recurseDepth = UNLIMITED_DEPTH;
else
subconfig.recurseDepth = this.recurseDepth - (dir.getNameCount() - this.dir.getNameCount());
}
return subconfig;
}
@ -269,6 +273,11 @@ public class PathWatcher extends AbstractLifeCycle implements Runnable
return recurseDepth;
}
public boolean isRecurseDepthUnlimited ()
{
return this.recurseDepth == UNLIMITED_DEPTH;
}
public Path getPath ()
{
return this.dir;
@ -375,6 +384,11 @@ public class PathWatcher extends AbstractLifeCycle implements Runnable
return false;
}
//If not limiting depth, should recurse all
if (isRecurseDepthUnlimited())
return true;
//Depth limited, check it
int childDepth = dir.relativize(child).getNameCount();
return (childDepth <= recurseDepth);
}
@ -513,11 +527,21 @@ public class PathWatcher extends AbstractLifeCycle implements Runnable
}
}
if ((base.getPath().equals(dir) && base.getRecurseDepth() >= 0) || base.shouldRecurseDirectory(dir))
//Register the dir with the watcher if it is:
// - the base dir and recursion is unlimited
// - the base dir and its depth is 0 (meaning we want to capture events from it, but not necessarily its children)
// - the base dir and we are recursing it and the depth is within the limit
// - a child dir and its depth is within the limits
if ((base.getPath().equals(dir) && (base.isRecurseDepthUnlimited() || base.getRecurseDepth() >= 0)) || base.shouldRecurseDirectory(dir))
watcher.register(dir,base);
}
if ((base.getPath().equals(dir)&& base.getRecurseDepth() >= 0) || base.shouldRecurseDirectory(dir))
//Continue walking the tree of this dir if it is:
// - the base dir and recursion is unlimited
// - the base dir and we're not recursing in it
// - the base dir and we are recursing it and the depth is within the limit
// - a child dir and its depth is within the limits
if ((base.getPath().equals(dir)&& (base.isRecurseDepthUnlimited() || base.getRecurseDepth() >= 0)) || base.shouldRecurseDirectory(dir))
return FileVisitResult.CONTINUE;
else
return FileVisitResult.SKIP_SUBTREE;

21
jetty-util/src/test/java/org/eclipse/jetty/util/PathWatcherTest.java
View File

@ -329,6 +329,27 @@ public class PathWatcherTest
assertThat("Config.recurse[1].shouldRecurse[./a]",config.shouldRecurseDirectory(dir.resolve("a")),is(true));
assertThat("Config.recurse[1].shouldRecurse[./]",config.shouldRecurseDirectory(dir),is(true));
}
@Test
public void testConfig_ShouldRecurse_3() throws IOException
{
Path dir = testdir.getEmptyDir().toPath();
//Create some deep dirs
Files.createDirectories(dir.resolve("a/b/c/d/e/f/g"));
PathWatcher.Config config = new PathWatcher.Config(dir);
config.setRecurseDepth(PathWatcher.Config.UNLIMITED_DEPTH);
assertThat("Config.recurse[1].shouldRecurse[./a/b/c/d/g]",config.shouldRecurseDirectory(dir.resolve("a/b/c/d/g")),is(true));
assertThat("Config.recurse[1].shouldRecurse[./a/b/c/d/f]",config.shouldRecurseDirectory(dir.resolve("a/b/c/d/f")),is(true));
assertThat("Config.recurse[1].shouldRecurse[./a/b/c/d/e]",config.shouldRecurseDirectory(dir.resolve("a/b/c/d/e")),is(true));
assertThat("Config.recurse[1].shouldRecurse[./a/b/c/d]",config.shouldRecurseDirectory(dir.resolve("a/b/c/d")),is(true));
assertThat("Config.recurse[1].shouldRecurse[./a/b/c]",config.shouldRecurseDirectory(dir.resolve("a/b/c")),is(true));
assertThat("Config.recurse[1].shouldRecurse[./a/b]",config.shouldRecurseDirectory(dir.resolve("a/b")),is(true));
assertThat("Config.recurse[1].shouldRecurse[./a]",config.shouldRecurseDirectory(dir.resolve("a")),is(true));
assertThat("Config.recurse[1].shouldRecurse[./]",config.shouldRecurseDirectory(dir),is(true));
}
/**
* When starting up the PathWatcher, the events should occur