Skip to content

模组管理支持搜索根据更多数据搜索内容 #3230

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 7 commits into from
Aug 6, 2025
Merged

模组管理支持搜索根据更多数据搜索内容 #3230

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b05b1e7
Update ModListPageSkin.java
zkitefly Aug 12, 2024
c9d2d00
Update ModListPageSkin.java
zkitefly Aug 12, 2024
2cd0b4e
Update ModListPageSkin.java
zkitefly Aug 13, 2024
58c7dd4
Merge remote-tracking branch 'upstream/main' into mods_manage-search
zkitefly Feb 14, 2025
3e1e545
Merge branch 'main' into mods_manage-search
Glavo Aug 6, 2025
67c95b9
update
Glavo Aug 6, 2025
90dff0b
update
Glavo Aug 6, 2025
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
16 changes: 12 additions & 4 deletions HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPageSkin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
import org.jackhuang.hmcl.util.io.FileUtils;
import org.jackhuang.hmcl.util.io.NetworkUtils;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

import java.nio.file.FileSystem;
import java.nio.file.Files;
Expand Down Expand Up @@ -248,23 +249,30 @@ private void search() {
} else {
listView.getItems().clear();

Predicate<String> predicate;
Predicate<@Nullable String> predicate;
if (queryString.startsWith("regex:")) {
try {
Pattern pattern = Pattern.compile(queryString.substring("regex:".length()));
predicate = s -> pattern.matcher(s).find();
predicate = s -> s != null && pattern.matcher(s).find();
} catch (Throwable e) {
LOG.warning("Illegal regular expression", e);
return;
}
} else {
String lowerQueryString = queryString.toLowerCase(Locale.ROOT);
predicate = s -> s.toLowerCase(Locale.ROOT).contains(lowerQueryString);
predicate = s -> s != null && s.toLowerCase(Locale.ROOT).contains(lowerQueryString);
}

// Do we need to search in the background thread?
for (ModInfoObject item : getSkinnable().getItems()) {
if (predicate.test(item.getModInfo().getFileName())) {
LocalModFile modInfo = item.getModInfo();
if (predicate.test(modInfo.getFileName())
|| predicate.test(modInfo.getName())
|| predicate.test(modInfo.getVersion())
|| predicate.test(modInfo.getGameVersion())
|| predicate.test(modInfo.getId())
|| predicate.test(Objects.toString(modInfo.getModLoaderType()))
|| predicate.test((item.getMod() != null ? item.getMod().getDisplayName() : null))) {
listView.getItems().add(item);
}
}
Expand Down