Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-10-31 18:46:07 +01:00
Code Issues Packages Projects Releases Activity

Fix recursive iteration

Browse Source 
Due to the api of TreeWalk we have no real change to iterate this
recursively, so we get back to good old loops.
This commit is contained in:
René Pfeuffer
2020-10-07 15:36:05 +02:00
parent 5887c5c268
commit e8506ff14d
4 changed files with 69 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitBrowseCommand.java
View File

@@ -24,8 +24,6 @@
package sonia.scm.repository.spi;
//~--- non-JDK imports --------------------------------------------------------
import com.google.common.base.Stopwatch;
import com.google.common.base.Strings;
import com.google.common.collect.Lists;
@@ -66,17 +64,15 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Stack;
import java.util.function.Consumer;
import static java.util.Collections.emptyList;
import static java.util.Optional.empty;
import static java.util.Optional.of;
import static sonia.scm.ContextEntry.ContextBuilder.entity;
import static sonia.scm.NotFoundException.notFound;
import static sonia.scm.repository.spi.SyncAsyncExecutor.ExecutionType.ASYNCHRONOUS;
//~--- JDK imports ------------------------------------------------------------
/**
*
* @author Sebastian Sdorra
@@ -251,7 +247,7 @@ public class GitBrowseCommand extends AbstractGitCommand
private void findChildren(FileObject parent, TreeWalk treeWalk) throws IOException {
TreeEntry entry = new TreeEntry();
createTree(parent.getPath(), entry, treeWalk);
createTree(entry, treeWalk);
convertToFileObject(parent, entry.getChildren());
}
@@ -282,25 +278,22 @@ public class GitBrowseCommand extends AbstractGitCommand
parent.setTruncated(hasNext);
}
private Optional<TreeEntry> createTree(String path, TreeEntry parent, TreeWalk treeWalk) throws IOException {
List<TreeEntry> entries = new ArrayList<>();
private void createTree(TreeEntry parent, TreeWalk treeWalk) throws IOException {
Stack<TreeEntry> parents = new Stack<>();
parents.push(parent);
while (treeWalk.next()) {
TreeEntry treeEntry = new TreeEntry(repo, treeWalk);
if (!treeEntry.getPathString().startsWith(path)) {
parent.setChildren(entries);
return of(treeEntry);
final String currentPath = treeWalk.getPathString();
while (!currentPath.startsWith(parents.peek().pathString)) {
parents.pop();
}
entries.add(treeEntry);
TreeEntry currentParent = parents.peek();
TreeEntry treeEntry = new TreeEntry(repo, treeWalk);
currentParent.addChild(treeEntry);
if (request.isRecursive() && treeEntry.getType() == TreeType.DIRECTORY) {
treeWalk.enterSubtree();
Optional<TreeEntry> surplus = createTree(treeEntry.getNameString(), treeEntry, treeWalk);
surplus.ifPresent(entries::add);
parents.push(treeEntry);
}
}
parent.setChildren(entries);
return empty();
}
private FileObject findFirstMatch(TreeWalk treeWalk) throws IOException {
@@ -465,7 +458,9 @@ public class GitBrowseCommand extends AbstractGitCommand
private final ObjectId objectId;
private final TreeType type;
private final SubRepository subRepository;
private List<TreeEntry> children = emptyList();
private final List<TreeEntry> children = new ArrayList<>();
private boolean sorted = true;
TreeEntry() {
pathString = "";
@@ -513,12 +508,16 @@ public class GitBrowseCommand extends AbstractGitCommand
}
List<TreeEntry> getChildren() {
if (!sorted) {
sort(children, entry -> entry.type != TreeType.FILE, TreeEntry::getNameString);
sorted = true;
}
return children;
}
void setChildren(List<TreeEntry> children) {
sort(children, entry -> entry.type != TreeType.FILE, TreeEntry::getNameString);
this.children = children;
private void addChild(TreeEntry treeEntry) {
sorted = false;
children.add(treeEntry);
}
}
}