Skip to content

fix #47 #48

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 3 commits into from
Mar 23, 2026
Merged

fix #47 #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
df62c51
fix: wait for world save to complete before creating backup
wellcoming Mar 11, 2026
d78e52c
fix prune #47
wellcoming Mar 21, 2026
323bf31
Merge branch '1.21' into 1.21
wellcoming Mar 21, 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
90 changes: 44 additions & 46 deletions ...n/java/io/github/skydynamic/quickbackupmulti/schedule/runnables/DefaultPruneRunnable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

import java.time.ZoneId;
import java.util.*;
import java.util.function.Function;

public class DefaultPruneRunnable implements Runnable {
private final PruneScheduleConfig config;
Expand Down Expand Up @@ -58,64 +59,61 @@ private static List<StorageInfo> filterBackupWithPbs(PbsConfig pbsConfig, List<S

ZoneId zoneId = timezoneOverride != null ? ZoneId.of(timezoneOverride) : ZoneId.systemDefault();

List<StorageInfo> filteredList = new ArrayList<>(backupList);
filteredList.sort(Comparator.comparingLong(StorageInfo::getTimestamp));

List<StorageInfo> toDelete = new ArrayList<>();

Map<String, Integer> timeUnits = Map.of(
"hour", pbsConfig.getHour(),
"day", pbsConfig.getDay(),
"week", pbsConfig.getWeek(),
"month", pbsConfig.getMonth(),
"year", pbsConfig.getYear()
);

for (Map.Entry<String, Integer> entry : timeUnits.entrySet()) {
String unit = entry.getKey();
int count = entry.getValue();
if (count <= 0) continue;

Map<String, StorageInfo> latestPerUnit = new HashMap<>();
for (StorageInfo backup : filteredList) {
String key = DurationUtils.formatByUnit(backup.getTimestamp(), unit, zoneId);
if (!latestPerUnit.containsKey(key)) {
latestPerUnit.put(key, backup);
} else if (backup.getTimestamp() > latestPerUnit.get(key).getTimestamp()) {
toDelete.add(latestPerUnit.get(key));
latestPerUnit.put(key, backup);
} else {
toDelete.add(backup);
}
}
filteredList.removeAll(latestPerUnit.values());
}
List<StorageInfo> sortedBackups = new ArrayList<>(backupList);
sortedBackups.sort(Comparator.comparingLong(StorageInfo::getTimestamp).reversed());
ListIterator<StorageInfo> backupIterator = sortedBackups.listIterator();

if (pbsConfig.getLast() > 0 && filteredList.size() > pbsConfig.getLast()) {
int keepCount = pbsConfig.getLast();
List<StorageInfo> toKeep = filteredList.subList(filteredList.size() - keepCount, filteredList.size());
Set<StorageInfo> toKeepSet = new HashSet<>(toKeep);
toDelete.addAll(filteredList.stream().filter(b -> !toKeepSet.contains(b)).toList());
}
List<StorageInfo> keepList = new ArrayList<>();
applyPbsPolicy(pbsConfig.getLast(), backupIterator, keepList, StorageInfo::getName);
applyPbsPolicy(pbsConfig.getHour(), backupIterator, keepList, b -> DurationUtils.formatByUnit(b.getTimestamp(), "hour", zoneId));
applyPbsPolicy(pbsConfig.getDay(), backupIterator, keepList, b -> DurationUtils.formatByUnit(b.getTimestamp(), "day", zoneId));
applyPbsPolicy(pbsConfig.getWeek(), backupIterator, keepList, b -> DurationUtils.formatByUnit(b.getTimestamp(), "week", zoneId));
applyPbsPolicy(pbsConfig.getMonth(), backupIterator, keepList, b -> DurationUtils.formatByUnit(b.getTimestamp(), "month", zoneId));
applyPbsPolicy(pbsConfig.getYear(), backupIterator, keepList, b -> DurationUtils.formatByUnit(b.getTimestamp(), "year", zoneId));

// keepList.sort(Comparator.comparingLong(StorageInfo::getTimestamp).reversed());

if (pbsConfig.getMaxLifeTime() != null && !pbsConfig.getMaxLifeTime().equals("0s")) {
long maxLifeTimeMillis = DurationUtils.parseDurationToSeconds(pbsConfig.getMaxLifeTime()) * 1000;
long now = System.currentTimeMillis();
List<StorageInfo> expired = filteredList.stream()
.filter(b -> now - b.getTimestamp() > maxLifeTimeMillis)
.toList();
toDelete.addAll(expired);
filteredList.removeAll(expired);
keepList.removeIf(backup -> now - backup.getTimestamp() > maxLifeTimeMillis);
}

if (pbsConfig.getMaxAmount() > 0 && filteredList.size() > pbsConfig.getMaxAmount()) {
int removeCount = filteredList.size() - pbsConfig.getMaxAmount();
toDelete.addAll(filteredList.subList(0, removeCount));
if (pbsConfig.getMaxAmount() > 0 && keepList.size() > pbsConfig.getMaxAmount()) {
keepList.subList(pbsConfig.getMaxAmount(), keepList.size()).clear();
}

List<StorageInfo> toDelete = new ArrayList<>(sortedBackups);
// I'm too lazy to write a double pointer.
toDelete.removeAll(new HashSet<>(keepList));
return toDelete;
}

private static void applyPbsPolicy(int limit, ListIterator<StorageInfo> backupIterator, List<StorageInfo> keepList, Function<StorageInfo, String> bucketMapper) {
Set<String> keepBuckets = new HashSet<>();
for (StorageInfo kept : keepList) {
String key = bucketMapper.apply(kept);
keepBuckets.add(key);
}

int count = 0;
while (backupIterator.hasNext()) {
StorageInfo backup = backupIterator.next();

String key = bucketMapper.apply(backup);
if (keepBuckets.contains(key))
continue;
if (count >= limit && limit >= 0) {
backupIterator.previous();
break;
}

keepBuckets.add(key);
keepList.add(backup);
count++;
}
}

@FunctionalInterface
public interface PruneRunnable {
void execute(PruneScheduleConfig config, CommandSourceStack commandSourceStack);
Expand Down
22 changes: 13 additions & 9 deletions common/src/main/java/io/github/skydynamic/quickbackupmulti/utils/BackupManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,11 +134,13 @@ public static void makeBackup(CommandSourceStack commandSource, String name, Str
try {
commandSource.sendSystemMessage(Component.nullToEmpty(tr("quickbackupmulti.make.start")));
MinecraftServer server = commandSource.getServer();
server.executeBlocking(() -> server.saveEverything(true, true, true));
for (ServerLevel serverLevel : server.getAllLevels()) {
if (serverLevel == null || serverLevel.noSave) continue;
serverLevel.noSave = true;
}
server.executeBlocking(() -> {
server.saveEverything(true, true, true);
for (ServerLevel serverLevel : server.getAllLevels()) {
if (serverLevel == null || serverLevel.noSave) continue;
serverLevel.noSave = true;
}
});

QuickbackupmultiReforged.getManager().incrementalStorage(
name,
Expand All @@ -152,10 +154,12 @@ public static void makeBackup(CommandSourceStack commandSource, String name, Str
double intervalTime = (endTime - startTime) / 1000.0;
commandSource.sendSystemMessage(Component.nullToEmpty(tr("quickbackupmulti.make.success", intervalTime)));

for (ServerLevel serverLevel : server.getAllLevels()) {
if (serverLevel == null || !serverLevel.noSave) continue;
serverLevel.noSave = false;
}
server.executeBlocking(() -> {
for (ServerLevel serverLevel : server.getAllLevels()) {
if (serverLevel == null || !serverLevel.noSave) continue;
serverLevel.noSave = false;
}
});
} catch (Exception e) {
logger.error("Make Backup Failed", e);
commandSource.sendSystemMessage(Component.nullToEmpty(tr("quickbackupmulti.make.fail", e.toString())));
Expand Down
Loading