From 04d2ab9dc7c5e42daa56c56dbe4165d81a181942 Mon Sep 17 00:00:00 2001 From: Guillaume Jacquemin Date: Thu, 28 Mar 2024 13:32:34 +0100 Subject: [PATCH] {Mass,Profile}Manager: move into new namespace. --- src/Application/Application.h | 12 ++++---- src/CMakeLists.txt | 8 ++--- .../MassManager.cpp => Managers/Mass.cpp} | 30 +++++++++---------- .../MassManager.h => Managers/Mass.h} | 8 ++--- .../Profile.cpp} | 30 +++++++++---------- .../ProfileManager.h => Managers/Profile.h} | 8 ++--- 6 files changed, 48 insertions(+), 48 deletions(-) rename src/{MassManager/MassManager.cpp => Managers/Mass.cpp} (91%) rename src/{MassManager/MassManager.h => Managers/Mass.h} (91%) rename src/{ProfileManager/ProfileManager.cpp => Managers/Profile.cpp} (94%) rename src/{ProfileManager/ProfileManager.h => Managers/Profile.h} (93%) diff --git a/src/Application/Application.h b/src/Application/Application.h index 1c22d37..9b0b247 100644 --- a/src/Application/Application.h +++ b/src/Application/Application.h @@ -38,8 +38,8 @@ #include -#include "../ProfileManager/ProfileManager.h" -#include "../MassManager/MassManager.h" +#include "../Managers/Mass.h" +#include "../Managers/Profile.h" #include "../ToastQueue/ToastQueue.h" #include "../UpdateChecker/UpdateChecker.h" @@ -236,11 +236,11 @@ class Application: public Platform::Sdl2Application, public efsw::FileWatchListe SDL_TimerID _gameCheckTimerId = 0; - Containers::Pointer _profileManager; - GameObjects::Profile* _currentProfile = nullptr; + Containers::Pointer _profileManager; + GameObjects::Profile* _currentProfile = nullptr; - Containers::Pointer _massManager; - GameObjects::Mass* _currentMass = nullptr; + Containers::Pointer _massManager; + GameObjects::Mass* _currentMass = nullptr; GameObjects::Weapon* _currentWeapon = nullptr; diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3055025..d4310bd 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -183,10 +183,10 @@ add_executable(MassBuilderSaveTool GameObjects/Weapon.h GameObjects/Weapon.cpp GameObjects/WeaponPart.h - ProfileManager/ProfileManager.h - ProfileManager/ProfileManager.cpp - MassManager/MassManager.h - MassManager/MassManager.cpp + Managers/Mass.h + Managers/Mass.cpp + Managers/Profile.h + Managers/Profile.cpp Maps/ArmourSlots.hpp Maps/BulletLauncherAttachmentStyles.hpp Maps/BulletLauncherSockets.hpp diff --git a/src/MassManager/MassManager.cpp b/src/Managers/Mass.cpp similarity index 91% rename from src/MassManager/MassManager.cpp rename to src/Managers/Mass.cpp index fb3a84a..62e263e 100644 --- a/src/MassManager/MassManager.cpp +++ b/src/Managers/Mass.cpp @@ -21,13 +21,13 @@ #include "../Logger/Logger.h" -#include "MassManager.h" +#include "Mass.h" using namespace Containers::Literals; -namespace mbst { +namespace mbst { namespace Managers { -MassManager::MassManager(Containers::StringView save_path, Containers::StringView account, bool demo, +Mass::Mass(Containers::StringView save_path, Containers::StringView account, bool demo, Containers::StringView staging_dir): _saveDirectory{save_path}, _account{account}, _demo{demo}, _stagingAreaDirectory{staging_dir} { @@ -42,17 +42,17 @@ MassManager::MassManager(Containers::StringView save_path, Containers::StringVie } Containers::StringView -MassManager::lastError() { +Mass::lastError() { return _lastError; } GameObjects::Mass& -MassManager::hangar(std::int32_t hangar) { +Mass::hangar(std::int32_t hangar) { return _hangars[hangar]; } void -MassManager::refreshHangar(std::int32_t hangar) { +Mass::refreshHangar(std::int32_t hangar) { if(hangar < 0 || hangar >= 32) { _lastError = "Hangar index out of range."; LOG_ERROR(_lastError); @@ -66,7 +66,7 @@ MassManager::refreshHangar(std::int32_t hangar) { } bool -MassManager::importMass(Containers::StringView staged_fn, std::int32_t hangar) { +Mass::importMass(Containers::StringView staged_fn, std::int32_t hangar) { if(hangar < 0 || hangar >= 32) { _lastError = "Hangar index out of range."; LOG_ERROR(_lastError); @@ -109,7 +109,7 @@ MassManager::importMass(Containers::StringView staged_fn, std::int32_t hangar) { } bool -MassManager::exportMass(std::int32_t hangar) { +Mass::exportMass(std::int32_t hangar) { if(hangar < 0 || hangar >= 32) { _lastError = "Hangar index out of range."_s; LOG_ERROR(_lastError); @@ -136,7 +136,7 @@ MassManager::exportMass(std::int32_t hangar) { } bool -MassManager::moveMass(std::int32_t source, std::int32_t destination) { +Mass::moveMass(std::int32_t source, std::int32_t destination) { if(source < 0 || source >= 32) { _lastError = "Source hangar index out of range."_s; LOG_ERROR(_lastError); @@ -174,7 +174,7 @@ MassManager::moveMass(std::int32_t source, std::int32_t destination) { } bool -MassManager::deleteMass(std::int32_t hangar) { +Mass::deleteMass(std::int32_t hangar) { if(hangar < 0 || hangar >= 32) { _lastError = "Hangar index out of range."_s; LOG_ERROR(_lastError); @@ -191,12 +191,12 @@ MassManager::deleteMass(std::int32_t hangar) { } const std::map& -MassManager::stagedMasses() { +Mass::stagedMasses() { return _stagedMasses; } void -MassManager::refreshStagedMasses() { +Mass::refreshStagedMasses() { _stagedMasses.clear(); using Utility::Path::ListFlag; @@ -229,7 +229,7 @@ MassManager::refreshStagedMasses() { } void -MassManager::refreshStagedMass(Containers::StringView filename) { +Mass::refreshStagedMass(Containers::StringView filename) { LOG_INFO_FORMAT("Refreshing staged unit with filename {}.", filename); bool file_exists = Utility::Path::exists(Utility::Path::join(_stagingAreaDirectory, filename)); @@ -250,7 +250,7 @@ MassManager::refreshStagedMass(Containers::StringView filename) { } bool -MassManager::deleteStagedMass(Containers::StringView filename) { +Mass::deleteStagedMass(Containers::StringView filename) { if(_stagedMasses.find(filename) == _stagedMasses.cend()) { _lastError = "The file "_s + filename + " couldn't be found in the list of staged M.A.S.S.es."_s; LOG_ERROR(_lastError); @@ -266,4 +266,4 @@ MassManager::deleteStagedMass(Containers::StringView filename) { return true; } -} +}} diff --git a/src/MassManager/MassManager.h b/src/Managers/Mass.h similarity index 91% rename from src/MassManager/MassManager.h rename to src/Managers/Mass.h index 71fcf3b..62db95b 100644 --- a/src/MassManager/MassManager.h +++ b/src/Managers/Mass.h @@ -26,11 +26,11 @@ using namespace Corrade; -namespace mbst { +namespace mbst { namespace Managers { -class MassManager { +class Mass { public: - MassManager(Containers::StringView save_path, Containers::StringView account, bool demo, Containers::StringView staging_dir); + Mass(Containers::StringView save_path, Containers::StringView account, bool demo, Containers::StringView staging_dir); auto lastError() -> Containers::StringView; @@ -63,4 +63,4 @@ class MassManager { std::map _stagedMasses; }; -} +}} diff --git a/src/ProfileManager/ProfileManager.cpp b/src/Managers/Profile.cpp similarity index 94% rename from src/ProfileManager/ProfileManager.cpp rename to src/Managers/Profile.cpp index e48f7c0..893d3c3 100644 --- a/src/ProfileManager/ProfileManager.cpp +++ b/src/Managers/Profile.cpp @@ -29,13 +29,13 @@ #include "../Logger/Logger.h" -#include "ProfileManager.h" +#include "Profile.h" using namespace Containers::Literals; -namespace mbst { +namespace mbst { namespace Managers { -ProfileManager::ProfileManager(Containers::StringView save_dir, Containers::StringView backup_dir): +Profile::Profile(Containers::StringView save_dir, Containers::StringView backup_dir): _saveDirectory{save_dir}, _backupsDirectory{backup_dir} { @@ -43,22 +43,22 @@ ProfileManager::ProfileManager(Containers::StringView save_dir, Containers::Stri } bool -ProfileManager::ready() const { +Profile::ready() const { return _ready; } Containers::StringView -ProfileManager::lastError() { +Profile::lastError() { return _lastError; } Containers::ArrayView -ProfileManager::profiles() { +Profile::profiles() { return _profiles; } bool -ProfileManager::refreshProfiles() { +Profile::refreshProfiles() { LOG_INFO("Refreshing profiles."); _profiles = Containers::Array{}; @@ -100,12 +100,12 @@ ProfileManager::refreshProfiles() { } GameObjects::Profile* -ProfileManager::getProfile(std::size_t index) { +Profile::getProfile(std::size_t index) { return index <= _profiles.size() ? &(_profiles[index]) : nullptr; } bool -ProfileManager::deleteProfile(std::size_t index, bool delete_builds) { +Profile::deleteProfile(std::size_t index, bool delete_builds) { if(!Utility::Path::remove(Utility::Path::join(_saveDirectory, _profiles[index].filename()))) { _lastError = Utility::format("Couldn't delete {} (filename: {}).", _profiles[index].companyName(), @@ -136,7 +136,7 @@ ProfileManager::deleteProfile(std::size_t index, bool delete_builds) { } bool -ProfileManager::backupProfile(std::size_t index, bool backup_builds) { +Profile::backupProfile(std::size_t index, bool backup_builds) { std::time_t timestamp = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now()); std::tm* time = std::localtime(×tamp); auto& profile = _profiles[index]; @@ -213,12 +213,12 @@ ProfileManager::backupProfile(std::size_t index, bool backup_builds) { } Containers::ArrayView -ProfileManager::backups() { +Profile::backups() { return _backups; } void -ProfileManager::refreshBackups() { +Profile::refreshBackups() { _backups = Containers::Array{}; using Utility::Path::ListFlag; @@ -303,7 +303,7 @@ ProfileManager::refreshBackups() { } bool -ProfileManager::deleteBackup(std::size_t index) { +Profile::deleteBackup(std::size_t index) { if(!Utility::Path::remove(Utility::Path::join(_backupsDirectory, _backups[index].filename))) { _lastError = "Couldn't delete " + _backups[index].filename; LOG_ERROR(_lastError); @@ -321,7 +321,7 @@ ProfileManager::deleteBackup(std::size_t index) { } bool -ProfileManager::restoreBackup(std::size_t index) { +Profile::restoreBackup(std::size_t index) { const Backup& backup = _backups[index]; auto error_format = "Extraction of file {} failed: {}"_s; @@ -380,4 +380,4 @@ ProfileManager::restoreBackup(std::size_t index) { return true; } -} +}} diff --git a/src/ProfileManager/ProfileManager.h b/src/Managers/Profile.h similarity index 93% rename from src/ProfileManager/ProfileManager.h rename to src/Managers/Profile.h index b5565c3..8c2474b 100644 --- a/src/ProfileManager/ProfileManager.h +++ b/src/Managers/Profile.h @@ -27,7 +27,7 @@ using namespace Corrade; -namespace mbst { +namespace mbst { namespace Managers { struct Backup { Containers::String filename; @@ -44,9 +44,9 @@ struct Backup { Containers::Array includedFiles; }; -class ProfileManager { +class Profile { public: - explicit ProfileManager(Containers::StringView save_dir, Containers::StringView backup_dir); + explicit Profile(Containers::StringView save_dir, Containers::StringView backup_dir); auto ready() const -> bool; auto lastError() -> Containers::StringView; @@ -75,4 +75,4 @@ class ProfileManager { Containers::Array _backups; }; -} +}}