Skip to content

[Bugfix] 修复导出整合包文件选择界面UI线程阻塞 #6363

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

Open
ToobLac wants to merge 1 commit into
base: main
Choose a base branch
from
+19 −5
Open

[Bugfix] 修复导出整合包文件选择界面UI线程阻塞 #6363

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
24 changes: 19 additions & 5 deletions HMCL/src/main/java/org/jackhuang/hmcl/ui/export/ModpackFileSelectionPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,10 @@
import javafx.scene.layout.HBox;
import org.jackhuang.hmcl.game.HMCLGameRepository;
import org.jackhuang.hmcl.modpack.ModAdviser;
import org.jackhuang.hmcl.task.Schedulers;
import org.jackhuang.hmcl.ui.FXUtils;
import org.jackhuang.hmcl.ui.construct.NoneMultipleSelectionModel;
import org.jackhuang.hmcl.ui.construct.SpinnerPane;
import org.jackhuang.hmcl.ui.wizard.WizardController;
import org.jackhuang.hmcl.ui.wizard.WizardPage;
import org.jackhuang.hmcl.util.Pair;
Expand All @@ -44,6 +46,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.CompletableFuture;

import static org.jackhuang.hmcl.ui.FXUtils.onEscPressed;
import static org.jackhuang.hmcl.util.Lang.mapOf;
Expand All @@ -58,27 +61,37 @@ public final class ModpackFileSelectionPage extends BorderPane implements Wizard
private final WizardController controller;
private final String version;
private final ModAdviser adviser;
private final ModpackFileTreeItem rootNode;
private ModpackFileTreeItem rootNode;

public ModpackFileSelectionPage(WizardController controller, HMCLGameRepository repository, String version, ModAdviser adviser) {
this.controller = controller;
this.version = version;
this.adviser = adviser;

JFXTreeView<String> treeView = new JFXTreeView<>();
rootNode = getTreeItem(repository.getRunDirectory(version), "minecraft", 0);
treeView.setRoot(rootNode);
treeView.setSelectionModel(new NoneMultipleSelectionModel<>());
onEscPressed(treeView, () -> controller.onPrev(true));
setMargin(treeView, new Insets(10, 10, 5, 10));
this.setCenter(treeView);

SpinnerPane spinnerPane = new SpinnerPane();
spinnerPane.setContent(treeView);
setMargin(spinnerPane, new Insets(10, 10, 5, 10));
this.setCenter(spinnerPane);

spinnerPane.setLoading(true);

@Glavo Glavo Jul 16, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

当遍历期间出现 UncheckedIOException 等异常时，CompletableFuture 会异常完成，导致 thenAcceptAsync 完全不执行；此时 spinnerPane 永远保持加载状态，“下一步”也始终禁用，且异常不会被记录或展示。应添加异常完成处理，在 JavaFX 线程中结束加载状态并向用户报告或允许重试。

CompletableFuture
.supplyAsync(() -> getTreeItem(repository.getRunDirectory(version), "minecraft", 0), Schedulers.io())
.thenAcceptAsync(modpackFileTreeItem -> {
treeView.setRoot(rootNode = modpackFileTreeItem);
spinnerPane.setLoading(false);
}, Schedulers.javafx());

HBox nextPane = new HBox();
nextPane.setPadding(new Insets(16, 16, 16, 0));
nextPane.setAlignment(Pos.CENTER_RIGHT);
{
JFXButton btnNext = FXUtils.newRaisedButton(i18n("wizard.next"));
btnNext.setPrefSize(100, 40);
btnNext.disableProperty().bind(spinnerPane.loadingProperty());
btnNext.setOnAction(e -> onNext());

nextPane.getChildren().setAll(btnNext);
Expand Down Expand Up @@ -176,6 +189,7 @@ public void cleanup(SettingsMap settings) {
}

@Glavo Glavo Jul 16, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

当游戏目录不存在、为空或所有内容均被过滤时，getTreeItem 会返回 null；加载结束后按钮会重新启用，但此处直接返回，使用户点击“下一步”没有任何反应。修改前 getFilesNeeded(null, ...) 会生成空列表并继续调用 controller.onFinish()，因此这是空目录场景下的新回归。

private void onNext() {
if (rootNode == null) return;
ArrayList<String> list = new ArrayList<>();
getFilesNeeded(rootNode, "minecraft", list);
controller.getSettings().put(MODPACK_FILE_SELECTION, list);
Expand Down