Skip to content

修复清理游戏资源 / 库操作在 FXThread 运行的问题 #5301

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

Merged
Glavo merged 5 commits into from
Mar 30, 2026
Merged

修复清理游戏资源 / 库操作在 FXThread 运行的问题 #5301

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cd65820
update
CiiLu Jan 24, 2026
71418ac
update
CiiLu Mar 25, 2026
47ff7a9
Merge remote-tracking branch 'upstream/main' into 固江河成帝业立国家终归于乱光阴逝千载过…
Glavo Mar 30, 2026
1eb9227
Refactor `clearAssets` to optimize asset and resource directory handling
Glavo Mar 30, 2026
f873cf9
Update HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/VersionPage.…
Glavo Mar 30, 2026
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
37 changes: 30 additions & 7 deletions HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/VersionPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,21 @@
import org.jackhuang.hmcl.event.EventPriority;
import org.jackhuang.hmcl.event.RefreshedVersionsEvent;
import org.jackhuang.hmcl.game.GameRepository;
import org.jackhuang.hmcl.game.HMCLGameRepository;
import org.jackhuang.hmcl.setting.Profile;
import org.jackhuang.hmcl.task.Schedulers;
import org.jackhuang.hmcl.task.Task;
import org.jackhuang.hmcl.ui.Controllers;
import org.jackhuang.hmcl.ui.FXUtils;
import org.jackhuang.hmcl.ui.SVG;
import org.jackhuang.hmcl.ui.WeakListenerHolder;
import org.jackhuang.hmcl.ui.animation.TransitionPane;
import org.jackhuang.hmcl.ui.construct.*;
import org.jackhuang.hmcl.ui.decorator.DecoratorAnimatedPage;
import org.jackhuang.hmcl.ui.decorator.DecoratorPage;
import org.jackhuang.hmcl.util.StringUtils;
import org.jackhuang.hmcl.util.io.FileUtils;

import java.nio.file.Path;
import java.util.Optional;
import java.util.function.Supplier;

Expand Down Expand Up @@ -186,15 +190,34 @@ private void redownloadAssetIndex() {
}

private void clearLibraries() {
FileUtils.deleteDirectoryQuietly(getProfile().getRepository().getBaseDirectory().resolve("libraries"));
var libraries = getProfile().getRepository().getBaseDirectory().resolve("libraries");
Task.runAsync(Schedulers.io(), () -> {
FileUtils.deleteDirectoryQuietly(libraries);
}).whenComplete(Schedulers.javafx(), (exception) -> {
if (exception != null) {
Controllers.dialog(i18n("message.failed") + "\n" + StringUtils.getStackTrace(exception), i18n("message.error"), MessageDialogPane.MessageType.ERROR);
}
Comment on lines +193 to +199

Copilot AI Mar 30, 2026

Copy link

Choose a reason for hiding this comment

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

FileUtils.deleteDirectoryQuietly(...) swallows IOException and returns false, so this Task.runAsync(...) closure will usually complete successfully even when deletion fails. As a result, whenComplete(..., exception -> ...) won’t show an error dialog on common failures. If you want to report failures, use deleteDirectory(...) (let the exception propagate) or check the boolean result and throw/show an error accordingly.

Copilot uses AI. Check for mistakes.
}).start();
}

private void clearAssets() {
HMCLGameRepository baseDirectory = getProfile().getRepository();
FileUtils.deleteDirectoryQuietly(baseDirectory.getBaseDirectory().resolve("assets"));
if (version.get() != null) {
FileUtils.deleteDirectoryQuietly(baseDirectory.getRunDirectory(version.get().getVersion()).resolve("resources"));
}
Path assetsDir = getProfile().getRepository().getBaseDirectory().resolve("assets");

Profile.ProfileVersion currentVersion = version.get();
Path resourcesDir = currentVersion != null
? getProfile().getRepository().getRunDirectory(currentVersion.getVersion()).resolve("resources")
: null;

Task.runAsync(Schedulers.io(), () -> {
FileUtils.deleteDirectoryQuietly(assetsDir);
if (resourcesDir != null) {
FileUtils.deleteDirectoryQuietly(resourcesDir);
}
}).whenComplete(Schedulers.javafx(), (exception) -> {
if (exception != null) {
Controllers.dialog(i18n("message.failed") + "\n" + StringUtils.getStackTrace(exception), i18n("message.error"), MessageDialogPane.MessageType.ERROR);
}
Comment on lines +211 to +219

Copilot AI Mar 30, 2026

Copy link

Choose a reason for hiding this comment

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

Same as above: deleteDirectoryQuietly(...) catches IOException, so this task will not surface typical deletion failures via exception. Consider using deleteDirectory(...) or handling the boolean return to ensure the UI can inform users when cleanup fails.

Copilot uses AI. Check for mistakes.
}).start();
}

private void clearJunkFiles() {
Expand Down