goldcollection
/
muwire
mirror of https://github.com/zlatinb/muwire
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cache the tree once it's fully built. GitHub issue #88

auto-update
Zlatin Balevsky 2021-10-17 07:33:13 +01:00
parent 7df7faaea8
commit b5228f4a41
No known key found for this signature in database
GPG Key ID: A72832072D525E41
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gui/griffon-app/controllers/com/muwire/gui/BrowseController.groovy
View File

@ -90,11 +90,16 @@ class BrowseController {
}
for(BrowseStatusEvent event : statusCopy) {
model.status = event.status
model.filterEnabled = (event.status == BrowseStatus.FINISHED || event.status == BrowseStatus.FAILED) &&
model.resultCount > 0
if (event.status == BrowseStatus.FETCHING)
model.totalResults = event.totalResults
}
if (!statusCopy.isEmpty()) {
if ((model.status == BrowseStatus.FINISHED || model.status == BrowseStatus.FAILED) &&
model.resultCount > 0) {
model.filterEnabled = true
model.cacheTopTreeLevel()
}
}
}
@ControllerAction

12
gui/griffon-app/models/com/muwire/gui/BrowseModel.groovy
View File

@ -14,6 +14,7 @@ import com.muwire.core.search.BrowseStatus
import javax.annotation.Nonnull
import javax.swing.SwingWorker
import javax.swing.tree.DefaultMutableTreeNode
import javax.swing.tree.TreeNode
@ArtifactProviderFor(GriffonModel)
class BrowseModel {
@ -47,12 +48,18 @@ class BrowseModel {
volatile String[] filter
volatile Filterer filterer
private final List<TreeNode> topLevelNodes = new ArrayList<>()
void mvcGroupInit(Map<String,String> args) {
root = new DefaultMutableTreeNode()
resultsTreeModel = new ResultTreeModel(root)
}
void cacheTopTreeLevel() {
for(int i = 0; i < root.getChildCount(); i ++)
topLevelNodes.add(root.getChildAt(i))
}
private boolean filter(UIResultEvent result) {
if (filter == null)
return true
@ -77,8 +84,9 @@ class BrowseModel {
} else {
synchronized (allResults) {
results.addAll(allResults)
for(UIResultEvent result : allResults)
resultsTreeModel.addToTree(result)
}
for(TreeNode topLevel : topLevelNodes) {
root.add(topLevel)
}
view.refreshResults()
view.expandUnconditionally()