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

Game can now load players with non-uuid filenames

Browse Source
This commit is contained in:
Kae 2023-08-02 22:25:20 +10:00
parent 98949574a8
commit b2cabc7567
2 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
source/game/StarPlayerStorage.cpp
View File

@ -39,9 +39,11 @@ PlayerStorage::PlayerStorage(String const& storageDir) {
String filename = File::relativeTo(m_storageDirectory, file.first); String filename = File::relativeTo(m_storageDirectory, file.first);
if (filename.endsWith(".player")) { if (filename.endsWith(".player")) {
try { try {
Uuid uuid(file.first.rsplit('.').at(0)); auto json = VersionedJson::readFile(filename);
Uuid uuid(json.content.getString("uuid"));
auto& playerCacheData = m_savedPlayersCache[uuid]; auto& playerCacheData = m_savedPlayersCache[uuid];
playerCacheData = entityFactory->loadVersionedJson(VersionedJson::readFile(filename), EntityType::Player); playerCacheData = entityFactory->loadVersionedJson(json, EntityType::Player);
m_playerFileNames.insert(uuid, file.first.rsplit('.').at(0));
} catch (std::exception const& e) { } catch (std::exception const& e) {
Logger::error("Error loading player file, ignoring! {} : {}", filename, outputException(e, false)); Logger::error("Error loading player file, ignoring! {} : {}", filename, outputException(e, false));
} }
@ -131,11 +133,13 @@ Json PlayerStorage::savePlayer(PlayerPtr const& player) {
auto uuid = player->uuid(); auto uuid = player->uuid();
auto& playerCacheData = m_savedPlayersCache[uuid]; auto& playerCacheData = m_savedPlayersCache[uuid];
if (!m_playerFileNames.hasLeftValue(uuid))
m_playerFileNames.insert(uuid, uuid.hex());
auto newPlayerData = player->diskStore(); auto newPlayerData = player->diskStore();
if (playerCacheData != newPlayerData) { if (playerCacheData != newPlayerData) {
playerCacheData = newPlayerData; playerCacheData = newPlayerData;
VersionedJson versionedJson = entityFactory->storeVersionedJson(EntityType::Player, playerCacheData); VersionedJson versionedJson = entityFactory->storeVersionedJson(EntityType::Player, playerCacheData);
VersionedJson::writeFile(versionedJson, File::relativeTo(m_storageDirectory, strf("{}.player", uuid.hex()))); VersionedJson::writeFile(versionedJson, File::relativeTo(m_storageDirectory, strf("{}.player", uuidFileName(uuid))));
} }
return newPlayerData; return newPlayerData;
} }
@ -204,7 +208,7 @@ WorldChunks PlayerStorage::loadShipData(Uuid const& uuid) {
if (!m_savedPlayersCache.contains(uuid)) if (!m_savedPlayersCache.contains(uuid))
throw PlayerException(strf("No such stored player with uuid '{}'", uuid.hex())); throw PlayerException(strf("No such stored player with uuid '{}'", uuid.hex()));
String filename = File::relativeTo(m_storageDirectory, strf("{}.shipworld", uuid.hex())); String filename = File::relativeTo(m_storageDirectory, strf("{}.shipworld", uuidFileName(uuid)));
try { try {
if (File::exists(filename)) if (File::exists(filename))
return WorldStorage::getWorldChunksFromFile(filename); return WorldStorage::getWorldChunksFromFile(filename);
@ -223,9 +227,8 @@ void PlayerStorage::applyShipUpdates(Uuid const& uuid, WorldChunks const& update
if (updates.empty()) if (updates.empty())
return; return;
String filePath = File::relativeTo(m_storageDirectory, strf("{}.shipworld", uuidFileName(uuid)));
String filename = File::relativeTo(m_storageDirectory, strf("{}.shipworld", uuid.hex())); WorldStorage::applyWorldChunksUpdateToFile(filePath, updates);
WorldStorage::applyWorldChunksUpdateToFile(filename, updates);
} }
void PlayerStorage::moveToFront(Uuid const& uuid) { void PlayerStorage::moveToFront(Uuid const& uuid) {
@ -238,10 +241,11 @@ void PlayerStorage::backupCycle(Uuid const& uuid) {
auto configuration = Root::singleton().configuration(); auto configuration = Root::singleton().configuration();
unsigned playerBackupFileCount = configuration->get("playerBackupFileCount").toUInt(); unsigned playerBackupFileCount = configuration->get("playerBackupFileCount").toUInt();
auto& fileName = uuidFileName(uuid);
File::backupFileInSequence(File::relativeTo(m_storageDirectory, strf("{}.player", uuid.hex())), playerBackupFileCount, ".bak"); File::backupFileInSequence(File::relativeTo(m_storageDirectory, strf("{}.player", fileName)), playerBackupFileCount, ".bak");
File::backupFileInSequence(File::relativeTo(m_storageDirectory, strf("{}.shipworld", uuid.hex())), playerBackupFileCount, ".bak"); File::backupFileInSequence(File::relativeTo(m_storageDirectory, strf("{}.shipworld", fileName)), playerBackupFileCount, ".bak");
File::backupFileInSequence(File::relativeTo(m_storageDirectory, strf("{}.metadata", uuid.hex())), playerBackupFileCount, ".bak"); File::backupFileInSequence(File::relativeTo(m_storageDirectory, strf("{}.metadata", fileName)), playerBackupFileCount, ".bak");
} }
void PlayerStorage::setMetadata(String key, Json value) { void PlayerStorage::setMetadata(String key, Json value) {
@ -256,6 +260,13 @@ Json PlayerStorage::getMetadata(String const& key) {
return m_metadata.value(key); return m_metadata.value(key);
} }
String const& PlayerStorage::uuidFileName(Uuid const& uuid) const {
if (auto fileName = m_playerFileNames.rightPtr(uuid))
return *fileName;
else
throw PlayerException::format("No matching filename for uuid '{}'", uuid.hex());
}
void PlayerStorage::writeMetadata() { void PlayerStorage::writeMetadata() {
JsonArray order; JsonArray order;
for (auto const& p : m_savedPlayersCache) for (auto const& p : m_savedPlayersCache)

2
source/game/StarPlayerStorage.hpp
View File

@ -44,11 +44,13 @@ public:
Json getMetadata(String const& key); Json getMetadata(String const& key);
private: private:
String const& uuidFileName(Uuid const& uuid) const;
void writeMetadata(); void writeMetadata();
mutable RecursiveMutex m_mutex; mutable RecursiveMutex m_mutex;
String m_storageDirectory; String m_storageDirectory;
OrderedHashMap<Uuid, Json> m_savedPlayersCache; OrderedHashMap<Uuid, Json> m_savedPlayersCache;
BiMap<Uuid, String> m_playerFileNames;
JsonObject m_metadata; JsonObject m_metadata;
}; };