Skip to content

Bxc 5896 glob matching #156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bbpennel merged 2 commits into from
Sep 15, 2026
Merged

Bxc 5896 glob matching #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e7fd5a
BXC-5896 add test
sharonluong Sep 9, 2026
b776173
BXC-5896 glob match to relative path
sharonluong Sep 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/main/java/edu/unc/lib/boxc/migration/cdm/services/SourceFileService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import org.slf4j.Logger;

import java.io.BufferedWriter;
import java.io.File;
import java.io.IOException;
import java.io.Reader;
import java.nio.file.FileSystems;
Expand Down Expand Up @@ -222,13 +223,14 @@ private Map<String, List<String>> gatherCandidatePaths(GenerateSourceFileMapping
Files.walkFileTree(basePath, new SimpleFileVisitor<Path>() {
@Override
public FileVisitResult visitFile(Path path, BasicFileAttributes attrs) throws IOException {
if (pathPattern == null || pathMatcher.matches(path)) {
var relativePath = basePath.relativize(path);
if (pathPattern == null || pathMatcher.matches(relativePath)) {
String filename = path.getFileName().toString();
if (options.isLowercaseTemplate()) {
filename = filename.toLowerCase();
}
List<String> paths = candidatePaths.computeIfAbsent(filename, f -> new ArrayList<>());
paths.add(basePath.relativize(path).toString());
paths.add(relativePath.toString());
}
return FileVisitResult.CONTINUE;
}
Expand Down
25 changes: 20 additions & 5 deletions src/test/java/edu/unc/lib/boxc/migration/cdm/services/SourceFileServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,26 @@ public void generateNestedMatchesTest() throws Exception {
assertMappedDatePresent();
}

@Test
public void generateBasePathMatchesTest() throws Exception {
testHelper.indexExportData("mini_gilmer");
GenerateSourceFileMappingOptions options = makeDefaultOptions();
// test source files are in the source subdirectory of the base path
options.setPathPattern("source/*.tif");
// add nested path
testHelper.addSourceFile("nested/path/276_182_E.tif");
Path basePath = testHelper.addSourceFile("276_183_E.tif");

service.generateMapping(options);

SourceFilesInfo info = service.loadMappings();
assertMappingPresent(info, "25", "276_182_E.tif", null);
assertMappingPresent(info, "26", "276_183_E.tif", basePath);
assertMappingPresent(info, "27", "276_203_E.tif", null);

assertMappedDatePresent();
}

@Test
public void generateTransformedNestedMatchTest() throws Exception {
testHelper.indexExportData("mini_gilmer");
Expand Down Expand Up @@ -822,11 +842,6 @@ private void assertExceptionContains(String expected, Exception e) {
"Expected message exception to contain '" + expected + "', but was: " + e.getMessage());
}

private void setIndexedDate() throws Exception {
project.getProjectProperties().setIndexedDate(Instant.now());
ProjectPropertiesSerialization.write(project);
}

private void assertMappedDatePresent() throws Exception {
MigrationProjectProperties props = ProjectPropertiesSerialization.read(project.getProjectPropertiesPath());
assertNotNull(props.getSourceFilesUpdatedDate());
Expand Down
Loading