evert/osb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Backups are now placed in their own directory

Browse Source
This commit is contained in:
Kae 2023-08-02 22:56:36 +10:00
parent b2cabc7567
commit 6abad768a6
4 changed files with 36 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/core/StarFile.cpp
View File

@ -102,16 +102,22 @@ void File::overwriteFileWithRename(String const& data, String const& filename, S
overwriteFileWithRename(data.utf8Ptr(), data.utf8Size(), filename, newSuffix); overwriteFileWithRename(data.utf8Ptr(), data.utf8Size(), filename, newSuffix);
} }
void File::backupFileInSequence(String const& targetFile, unsigned maximumBackups, String const& backupExtensionPrefix) { void File::backupFileInSequence(String const& initialFile, String const& targetFile, unsigned maximumBackups, String const& backupExtensionPrefix) {
for (unsigned i = maximumBackups; i > 0; --i) { for (unsigned i = maximumBackups; i > 0; --i) {
String curExtension = i == 1 ? "" : strf("{}{}", backupExtensionPrefix, i - 1); bool initial = i == 1;
String const& sourceFile = initial ? initialFile : targetFile;
String curExtension = initial ? "" : strf("{}{}", backupExtensionPrefix, i - 1);
String nextExtension = strf("{}{}", backupExtensionPrefix, i); String nextExtension = strf("{}{}", backupExtensionPrefix, i);
if (File::isFile(targetFile + curExtension)) if (File::isFile(sourceFile + curExtension))
File::copy(targetFile + curExtension, targetFile + nextExtension); File::copy(sourceFile + curExtension, targetFile + nextExtension);
} }
} }
void File::backupFileInSequence(String const& targetFile, unsigned maximumBackups, String const& backupExtensionPrefix) {
backupFileInSequence(targetFile, targetFile, maximumBackups, backupExtensionPrefix);
}
File::File() File::File()
: IODevice(IOMode::Closed) { : IODevice(IOMode::Closed) {
m_file = 0; m_file = 0;

1
source/core/StarFile.hpp
View File

@ -91,6 +91,7 @@ public:
static void overwriteFileWithRename(ByteArray const& data, String const& filename, String const& newSuffix = ".new"); static void overwriteFileWithRename(ByteArray const& data, String const& filename, String const& newSuffix = ".new");
static void overwriteFileWithRename(String const& data, String const& filename, String const& newSuffix = ".new"); static void overwriteFileWithRename(String const& data, String const& filename, String const& newSuffix = ".new");
static void backupFileInSequence(String const& initialFile, String const& targetFile, unsigned maximumBackups, String const& backupExtensionPrefix = ".");
static void backupFileInSequence(String const& targetFile, unsigned maximumBackups, String const& backupExtensionPrefix = "."); static void backupFileInSequence(String const& targetFile, unsigned maximumBackups, String const& backupExtensionPrefix = ".");
static FilePtr open(String const& filename, IOMode mode); static FilePtr open(String const& filename, IOMode mode);

36
source/game/StarPlayerStorage.cpp
View File

@ -14,7 +14,7 @@ namespace Star {
PlayerStorage::PlayerStorage(String const& storageDir) { PlayerStorage::PlayerStorage(String const& storageDir) {
m_storageDirectory = storageDir; m_storageDirectory = storageDir;
m_backupDirectory = File::relativeTo(m_storageDirectory, File::convertDirSeparators("backup"));
if (!File::isDirectory(m_storageDirectory)) { if (!File::isDirectory(m_storageDirectory)) {
Logger::info("Creating player storage directory"); Logger::info("Creating player storage directory");
File::makeDirectory(m_storageDirectory); File::makeDirectory(m_storageDirectory);
@ -183,23 +183,25 @@ void PlayerStorage::deletePlayer(Uuid const& uuid) {
m_savedPlayersCache.remove(uuid); m_savedPlayersCache.remove(uuid);
auto filePrefix = File::relativeTo(m_storageDirectory, uuid.hex()); auto uuidHex = uuid.hex();
auto storagePrefix = File::relativeTo(m_storageDirectory, uuidHex);
auto backupPrefix = File::relativeTo(m_backupDirectory, uuidHex);
auto removeIfExists = [&filePrefix](String suffix) { auto removeIfExists = [](String const& prefix, String const& suffix) {
if (File::exists(filePrefix + suffix)) { if (File::exists(prefix + suffix)) {
File::remove(filePrefix + suffix); File::remove(prefix + suffix);
} }
}; };
removeIfExists(".player"); removeIfExists(storagePrefix, ".player");
removeIfExists(".shipworld"); removeIfExists(storagePrefix, ".shipworld");
auto configuration = Root::singleton().configuration(); auto configuration = Root::singleton().configuration();
unsigned playerBackupFileCount = configuration->get("playerBackupFileCount").toUInt(); unsigned playerBackupFileCount = configuration->get("playerBackupFileCount").toUInt();
for (unsigned i = 1; i <= playerBackupFileCount; ++i) { for (unsigned i = 1; i <= playerBackupFileCount; ++i) {
removeIfExists(strf(".player.bak{}", i)); removeIfExists(backupPrefix, strf(".player.bak{}", i));
removeIfExists(strf(".shipworld.bak{}", i)); removeIfExists(backupPrefix, strf(".shipworld.bak{}", i));
} }
} }
@ -243,9 +245,19 @@ void PlayerStorage::backupCycle(Uuid const& uuid) {
unsigned playerBackupFileCount = configuration->get("playerBackupFileCount").toUInt(); unsigned playerBackupFileCount = configuration->get("playerBackupFileCount").toUInt();
auto& fileName = uuidFileName(uuid); auto& fileName = uuidFileName(uuid);
File::backupFileInSequence(File::relativeTo(m_storageDirectory, strf("{}.player", fileName)), playerBackupFileCount, ".bak"); auto path = [&](String const& dir, String const& extension) {
File::backupFileInSequence(File::relativeTo(m_storageDirectory, strf("{}.shipworld", fileName)), playerBackupFileCount, ".bak"); return File::relativeTo(dir, strf("{}.{}", fileName, extension));
File::backupFileInSequence(File::relativeTo(m_storageDirectory, strf("{}.metadata", fileName)), playerBackupFileCount, ".bak"); };
if (!File::isDirectory(m_backupDirectory)) {
Logger::info("Creating player backup directory");
File::makeDirectory(m_backupDirectory);
return;
}
File::backupFileInSequence(path(m_storageDirectory, "player"), path(m_backupDirectory, "player"), playerBackupFileCount, ".bak");
File::backupFileInSequence(path(m_storageDirectory, "shipworld"), path(m_backupDirectory, "shipworld"), playerBackupFileCount, ".bak");
File::backupFileInSequence(path(m_storageDirectory, "metadata"), path(m_backupDirectory, "metadata"), playerBackupFileCount, ".bak");
} }
void PlayerStorage::setMetadata(String key, Json value) { void PlayerStorage::setMetadata(String key, Json value) {

1
source/game/StarPlayerStorage.hpp
View File

@ -49,6 +49,7 @@ private:
mutable RecursiveMutex m_mutex; mutable RecursiveMutex m_mutex;
String m_storageDirectory; String m_storageDirectory;
String m_backupDirectory;
OrderedHashMap<Uuid, Json> m_savedPlayersCache; OrderedHashMap<Uuid, Json> m_savedPlayersCache;
BiMap<Uuid, String> m_playerFileNames; BiMap<Uuid, String> m_playerFileNames;
JsonObject m_metadata; JsonObject m_metadata;