Spielstand bleibt erhalten, wenn das letzte Umbenennen scheitert

SaveStore.write_save verschob die geprüfte Temporärdatei direkt auf
world.grw. Godot löscht unter Windows ein vorhandenes Ziel, bevor es die
Datei verschiebt. Scheiterte die Verschiebung, zum Beispiel weil ein
Virenscanner world.grw.tmp festhielt, war der vorige Spielstand schon weg.

Jetzt wird der vorige Stand zuerst nach world.grw.bak verschoben, dann
rückt die Temporärdatei nach. Scheitert das, kommt der Stand aus der
Sicherung zurück; nach Erfolg wird die Sicherung gelöscht. Bleibt nach
einem Absturz zwischen den beiden Verschiebungen nur world.grw.bak übrig,
holt SaveStore sie beim Öffnen des Ordners zurück.

Neue Tests: ein offenes Handle auf world.grw.tmp, eine blockierte
Sicherung, die Wiederherstellung aus der Sicherung und dass eine
Sicherung einen vorhandenen Stand nie ersetzt.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
Steven Wroblewski
2026-10-01 13:16:02 +02:00
parent 68d063209c
commit 842213c574
2 changed files with 90 additions and 1 deletions
+53
View File
@@ -19,6 +19,7 @@ func test_a_save_is_written_and_read_back() -> void:
check(store.has_save(), "a save exists")
check_eq(store.read_save(), PackedByteArray([4, 5]), "the newest save is read")
check(not FileAccess.file_exists(directory.path_join(SaveStore.SAVE_FILE + ".tmp")), "no temporary file is left")
check(not FileAccess.file_exists(directory.path_join(SaveStore.BACKUP_FILE)), "no backup is left")
TestFiles.remove_dir(directory)
@@ -43,6 +44,58 @@ func test_a_save_that_cannot_be_written_keeps_the_previous_one() -> void:
TestFiles.remove_dir(directory)
func test_a_save_that_cannot_be_moved_into_place_keeps_the_previous_one() -> void:
var directory := TestFiles.temporary_dir("held")
var store := SaveStore.new(directory)
store.write_save(PackedByteArray([1, 2, 3]))
# The open handle stands for an outside program, for example a virus
# scanner. The new save can be written, but Windows refuses to move a file
# that is held open.
var holder := FileAccess.open(directory.path_join(SaveStore.SAVE_FILE + ".tmp"), FileAccess.WRITE)
check(not store.write_save(PackedByteArray([4, 5])), "the failed save is reported")
check_eq(store.read_save(), PackedByteArray([1, 2, 3]), "the previous save is untouched")
check(not FileAccess.file_exists(directory.path_join(SaveStore.BACKUP_FILE)), "no backup is left")
holder.close()
TestFiles.remove_dir(directory)
func test_a_save_that_cannot_move_the_previous_one_aside_keeps_it() -> void:
var directory := TestFiles.temporary_dir("aside-blocked")
var store := SaveStore.new(directory)
store.write_save(PackedByteArray([1, 2, 3]))
# A folder under the backup name keeps the previous save from moving.
DirAccess.make_dir_absolute(directory.path_join(SaveStore.BACKUP_FILE))
check(not store.write_save(PackedByteArray([4, 5])), "the failed save is reported")
check_eq(store.read_save(), PackedByteArray([1, 2, 3]), "the previous save is untouched")
check(not FileAccess.file_exists(directory.path_join(SaveStore.SAVE_FILE + ".tmp")), "no temporary file is left")
TestFiles.remove_dir(directory)
func test_an_interrupted_save_is_recovered_from_the_backup() -> void:
var directory := TestFiles.temporary_dir("recover")
# A crash between the two moves of write_save leaves only the backup.
var backup := directory.path_join(SaveStore.BACKUP_FILE)
var file := FileAccess.open(backup, FileAccess.WRITE)
file.store_buffer(PackedByteArray([7, 8, 9]))
file.close()
var store := SaveStore.new(directory)
check(store.has_save(), "the previous save is back")
check_eq(store.read_save(), PackedByteArray([7, 8, 9]), "with its content")
check(not FileAccess.file_exists(backup), "the backup is moved, not copied")
TestFiles.remove_dir(directory)
func test_a_backup_never_replaces_an_existing_save() -> void:
var directory := TestFiles.temporary_dir("keep")
SaveStore.new(directory).write_save(PackedByteArray([1, 2, 3]))
var file := FileAccess.open(directory.path_join(SaveStore.BACKUP_FILE), FileAccess.WRITE)
file.store_buffer(PackedByteArray([9, 9]))
file.close()
var store := SaveStore.new(directory)
check_eq(store.read_save(), PackedByteArray([1, 2, 3]), "the save is not replaced by the older backup")
TestFiles.remove_dir(directory)
func test_setting_aside_without_a_save_reports_nothing_moved() -> void:
var directory := TestFiles.temporary_dir("nothing")
check_eq(SaveStore.new(directory).set_aside_save(), "", "no save, nothing moved")