Skip to content

fix: 修复搜索指令永远找不到备份 #14

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
SkyDynamic merged 1 commit into from
Aug 3, 2025
Merged

fix: 修复搜索指令永远找不到备份 #14

Show file tree
Hide file tree
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
3 changes: 2 additions & 1 deletion common/src/main/java/io/github/skydynamic/quickbakcupmulti/command/SearchCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.mojang.brigadier.arguments.StringArgumentType;
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
import io.github.skydynamic.increment.storage.lib.database.StorageInfo;
import net.minecraft.commands.CommandSourceStack;
import net.minecraft.commands.Commands;
import net.minecraft.network.chat.Component;
Expand All @@ -22,7 +23,7 @@ public class SearchCommand {
);

private static int searchSaveBackups(CommandSourceStack commandSource, String string) {
List<String> backupsList = getBackupsList();
List<String> backupsList = getBackupsList().stream().map(StorageInfo::getName).toList();
List<String> result = backupsList.stream()
.filter(it -> StringUtils.containsIgnoreCase(it, string))
.toList();
Expand Down
4 changes: 2 additions & 2 deletions ...on/src/main/java/io/github/skydynamic/quickbakcupmulti/restore/ClientRestoreDelegate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@ public void run() {

// Restore finish and rejoin the world
QuickbakcupmultiReforged.getModContainer().setRestoringBackup(false);
long end_time = System.currentTimeMillis();
long endTime = System.currentTimeMillis();
minecraftClient.execute(() -> {
Component title = Component.nullToEmpty(Translate.tr("quickbackupmulti.toast.end_title"));
Component desc = Component.nullToEmpty(Translate.tr("quickbackupmulti.toast.end_desc", (int) (end_time - startTime * 1000)));
Component desc = Component.nullToEmpty(Translate.tr("quickbackupmulti.toast.end_desc", (int) ((endTime - startTime)) / 1000));
SystemToast.addOrUpdate(minecraftClient.getToasts(), SystemToast.SystemToastId.PERIODIC_NOTIFICATION, title, desc);
});
if (QuickbakcupmultiReforged.getModConfig().isClientAutoReJoinWorld()) {
Expand Down
28 changes: 11 additions & 17 deletions common/src/main/java/io/github/skydynamic/quickbakcupmulti/utils/BackupManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import io.github.skydynamic.increment.storage.lib.database.Database;
import io.github.skydynamic.increment.storage.lib.database.DatabaseTables;
import io.github.skydynamic.increment.storage.lib.database.StorageInfo;
import io.github.skydynamic.quickbakcupmulti.DatabaseCache;
import io.github.skydynamic.quickbakcupmulti.QuickbakcupmultiReforged;
import io.github.skydynamic.quickbakcupmulti.database.DatabaseManager;
import net.minecraft.commands.CommandSourceStack;
Expand All @@ -20,8 +21,9 @@
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.*;
import java.util.function.Consumer;
import java.util.List;
import java.util.Map;
import java.util.UUID;

import static io.github.skydynamic.quickbakcupmulti.translate.Translate.tr;

Expand All @@ -42,22 +44,14 @@ public static Path getBackupPath() {
return path;
}

private static void getBackupExists(File file, Consumer<String> consumer) {
if (file.isDirectory() && QuickbakcupmultiReforged.getDatabase().storageExists(file.getName())) {
consumer.accept(file.getName());
}
}

private static List<String> getBackupExistsWithList(Path path) {
List<String> backupsDirList = new ArrayList<>();
for (File file : Objects.requireNonNull(path.toFile().listFiles())) {
getBackupExists(file, backupsDirList::add);
public static List<StorageInfo> getBackupsList() {
List<StorageInfo> backupList;
if (!QuickbakcupmultiReforged.getModConfig().isCacheDatabase()) {
backupList = QuickbakcupmultiReforged.getDatabase().getAllStorageInfo();
} else {
backupList = DatabaseCache.getStorageInfoCaches();
}
return backupsDirList;
}

public static List<String> getBackupsList() {
return getBackupExistsWithList(getBackupPath());
return backupList;
}

public static void makeBackup(CommandSourceStack commandSource, String name, String desc) {
Expand Down
7 changes: 1 addition & 6 deletions common/src/main/java/io/github/skydynamic/quickbakcupmulti/utils/ListBackupsUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,12 +98,7 @@ private static MutableComponent getSlotText(StorageInfo info, int page, int num)

public static MutableComponent list(int page) {
long totalBackupSizeB = 0;
List<StorageInfo> backupList;
if (!QuickbakcupmultiReforged.getModConfig().isCacheDatabase()) {
backupList = QuickbakcupmultiReforged.getDatabase().getAllStorageInfo();
} else {
backupList = DatabaseCache.getStorageInfoCaches();
}
List<StorageInfo> backupList = BackupManager.getBackupsList();
List<StorageInfo> backupsInfoList = backupList.stream()
.sorted(Comparator.comparingLong(StorageInfo::getTimestamp))
.toList();
Expand Down