Skip to content

Filter .DS_Store on upload #832

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
ekharkunov merged 1 commit into from
Jan 14, 2026
Merged

Filter .DS_Store on upload #832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion client/src/main/java/com/defold/extender/client/ExtenderClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,8 @@ HttpEntity createBuildRequestPayload(List<ExtenderResource> sourceResources) thr
try (ZipOutputStream zipStream = new ZipOutputStream(byteStream)) {
sourceResources.stream()
.filter(res -> {
return !cachedFiles.contains(res.getPath());
return !cachedFiles.contains(res.getPath())
&& !res.getPath().endsWith(".DS_Store");
})
.forEach(res -> {
Path path = Path.of(res.getPath());
Expand Down
9 changes: 6 additions & 3 deletions client/src/test/java/com/defold/extender/client/ExtenderClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,7 @@ private static Stream<Arguments> uploadData() {
Arguments.of(null, List.of("build/a", "build/b", "build/c"))
);
}

@ParameterizedTest()
@ParameterizedTest
@MethodSource("uploadData")
public void testUploadStructure(String cacheResponse, List<String> expectedFilenames) throws Exception {
try {
Expand All @@ -149,23 +148,27 @@ public void testUploadStructure(String cacheResponse, List<String> expectedFilen
File a = new File("build/a");
File b = new File("build/b");
File c = new File("build/c");
File e = new File("build/.DS_Store");
FileExtenderResource aRes = new FileExtenderResource(a);
FileExtenderResource bRes = new FileExtenderResource(b);
FileExtenderResource cRes = new FileExtenderResource(c);
FileExtenderResource eRes = new FileExtenderResource(e);

a.deleteOnExit();
b.deleteOnExit();
c.deleteOnExit();
e.deleteOnExit();

TestUtils.writeToFile("build/a", "a");
TestUtils.writeToFile("build/b", "b");
TestUtils.writeToFile("build/c", "c");
TestUtils.writeToFile("build/e", "e");

List<ExtenderResource> inputFiles = new ArrayList<>();
inputFiles.add(aRes);
inputFiles.add(bRes);
inputFiles.add(cRes);

inputFiles.add(eRes);

HttpEntity entity = extenderClient.createBuildRequestPayload(inputFiles);
assertNotNull(entity);
Expand Down