Skip to content

Add delete operation #8

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

Closed
TheMeinerLP wants to merge 1 commit into from
Closed

Add delete operation #8

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
18 changes: 18 additions & 0 deletions src/main/java/codechicken/diffpatch/cli/PatchOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import java.util.*;
import java.util.function.Consumer;
import java.util.function.Function;
import java.util.stream.Stream;

import static codechicken.diffpatch.util.LogLevel.*;
import static codechicken.diffpatch.util.Utils.filterPrefixed;
Expand Down Expand Up @@ -331,6 +332,23 @@ public boolean doPatch(FileCollector oCollector, FileCollector rCollector, Patch

for (String file : removedFiles) {
summary.removedFiles++;
Path deletedFile = this.outputPath.toPath().resolve(file);
Files.delete(deletedFile);
try(Stream<Path> walker = Files.walk(this.outputPath.toPath())){
walker.sorted(Comparator.reverseOrder())
.filter(Files::isDirectory)
.filter(path -> {
try(Stream<Path> folders = Files.list(path)) {
return !folders.findFirst().isPresent();
} catch (IOException e) {
return false;
}
})
.map(Path::toFile)
.forEach(File::delete);
}


log(DEBUG, "Removed: " + file);
}

Expand Down