Skip to content
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

Jump to bottom

feat: Add option to not modify readonly files during copy, add logging of time #19894

Merged
merged 7 commits into from
Sep 6, 2024
Merged

feat: Add option to not modify readonly files during copy, add logging of time #19894

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4145fe8
feat: Add option to not modify readonly files during copy, add loggin…
TatuLund Sep 5, 2024
201de9d
Update TaskCopyLocalFrontendFiles.java
TatuLund Sep 5, 2024
f6056f3
Merge branch 'main' into fix19866
TatuLund Sep 5, 2024
549e02d
Use system property
TatuLund Sep 5, 2024
f49c1b0
Refactor
TatuLund Sep 5, 2024
7f662e0
rename property
mcollovati Sep 6, 2024
a30a754
Merge branch 'main' into fix19866
mcollovati Sep 6, 2024
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
22 changes: 16 additions & 6 deletions flow-server/src/main/java/com/vaadin/flow/server/frontend/TaskCopyLocalFrontendFiles.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
import java.util.stream.Stream;

import org.apache.commons.io.FileUtils;
import org.apache.commons.io.filefilter.FileFilterUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand All @@ -55,6 +54,11 @@ public class TaskCopyLocalFrontendFiles
this.options = options;
}

private static boolean shouldApplyWriteableFlag() {
return !Boolean.parseBoolean(System.getProperty(
"vaadin.frontend.disableWritableFlagCheckOnCopy", "false"));
}

@Override
public void execute() {
File target = options.getJarFrontendResourcesFolder();
Expand Down Expand Up @@ -96,16 +100,22 @@ static Set<String> copyLocalResources(File source, File target,
return Collections.emptySet();
}
try {
long start = System.nanoTime();
Set<String> handledFiles = new HashSet<>(TaskCopyFrontendFiles
.getFilesInDirectory(source, relativePathExclusions));
FileUtils.copyDirectory(source, target,
withoutExclusions(source, relativePathExclusions));
try (Stream<Path> fileStream = Files
.walk(Paths.get(target.getPath()))) {
// used with try-with-resources as defined in walk API note
fileStream.filter(file -> !Files.isWritable(file)).forEach(
filePath -> filePath.toFile().setWritable(true));
if (shouldApplyWriteableFlag()) {
try (Stream<Path> fileStream = Files
.walk(Paths.get(target.getPath()))) {
// used with try-with-resources as defined in walk API note
fileStream.filter(file -> !Files.isWritable(file)).forEach(
filePath -> filePath.toFile().setWritable(true));
}
}
long ms = (System.nanoTime() - start) / 1000000;
log().info("Copied {} local frontend files. Took {} ms.",
handledFiles.size(), ms);
return handledFiles;
} catch (IOException e) {
throw new UncheckedIOException(String.format(
Expand Down
Loading