weyne/dcs_liberation
1
0
Fork 0
mirror of https://github.com/dcs-liberation/dcs_liberation.git synced 2025-11-10 14:22:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tolerate saving when temp is on another FS.

Browse Source 
Fixes https://github.com/dcs-liberation/dcs_liberation/issues/2748.
This commit is contained in:
Dan Albert 2023-03-13 19:46:29 -07:00
parent bc0dacf974
commit bcb7d059c0
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
game/persistence/savegamebundle.py
View File

@ -1,5 +1,6 @@
from __future__ import annotations from __future__ import annotations
import logging
import pickle import pickle
import shutil import shutil
from pathlib import Path from pathlib import Path
@ -100,4 +101,18 @@ class SaveGameBundle:
with zip_bundle.open(name, "w") as entry: with zip_bundle.open(name, "w") as entry:
pickle.dump(game, entry) pickle.dump(game, entry)
temp_file_path.replace(self.bundle_path) try:
temp_file_path.replace(self.bundle_path)
except OSError:
# The file might be copyable but not movable if the temp and saved game
# directories are on different file systems.
# https://github.com/dcs-liberation/dcs_liberation/issues/2748
shutil.copy(temp_file_path, self.bundle_path)
temp_file_path.unlink()
logging.warning(
"Save game %s was copyable from temporary location %s but not "
"moveable. The temp directory and save game directory might be on "
"different file systems. This makes saving the game slower.",
self.bundle_path,
temp_file_path,
)