From 9f0386d5b3b6caceb46f1f030cc485ed28fa55a1 Mon Sep 17 00:00:00 2001 From: Guillaume Jacquemin Date: Sat, 30 Mar 2024 16:03:11 +0100 Subject: [PATCH] {Mass,Profile}Manager: rename classes. Partial revert of 04d2ab9dc7c5e42daa56c56dbe4165d81a181942. I forgot about the Backup struct when I was working on the backup manager, and was about to run into a conflict sooner or later. --- src/Application/Application.h | 12 ++++----- src/CMakeLists.txt | 8 +++--- src/Managers/{Mass.cpp => MassManager.cpp} | 26 +++++++++---------- src/Managers/{Mass.h => MassManager.h} | 4 +-- .../{Profile.cpp => ProfileManager.cpp} | 26 +++++++++---------- src/Managers/{Profile.h => ProfileManager.h} | 4 +-- 6 files changed, 40 insertions(+), 40 deletions(-) rename src/Managers/{Mass.cpp => MassManager.cpp} (91%) rename src/Managers/{Mass.h => MassManager.h} (92%) rename src/Managers/{Profile.cpp => ProfileManager.cpp} (95%) rename src/Managers/{Profile.h => ProfileManager.h} (94%) diff --git a/src/Application/Application.h b/src/Application/Application.h index 9b0b247..f9dc920 100644 --- a/src/Application/Application.h +++ b/src/Application/Application.h @@ -38,8 +38,8 @@ #include -#include "../Managers/Mass.h" -#include "../Managers/Profile.h" +#include "../Managers/MassManager.h" +#include "../Managers/ProfileManager.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 3197799..5bdf541 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -185,10 +185,10 @@ add_executable(MassBuilderSaveTool GameObjects/Weapon.h GameObjects/Weapon.cpp GameObjects/WeaponPart.h - Managers/Mass.h - Managers/Mass.cpp - Managers/Profile.h - Managers/Profile.cpp + Managers/MassManager.h + Managers/MassManager.cpp + Managers/ProfileManager.h + Managers/ProfileManager.cpp Maps/ArmourSlots.hpp Maps/BulletLauncherAttachmentStyles.hpp Maps/BulletLauncherSockets.hpp diff --git a/src/Managers/Mass.cpp b/src/Managers/MassManager.cpp similarity index 91% rename from src/Managers/Mass.cpp rename to src/Managers/MassManager.cpp index 62e263e..1947711 100644 --- a/src/Managers/Mass.cpp +++ b/src/Managers/MassManager.cpp @@ -21,13 +21,13 @@ #include "../Logger/Logger.h" -#include "Mass.h" +#include "MassManager.h" using namespace Containers::Literals; namespace mbst { namespace Managers { -Mass::Mass(Containers::StringView save_path, Containers::StringView account, bool demo, +MassManager::MassManager(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 @@ Mass::Mass(Containers::StringView save_path, Containers::StringView account, boo } Containers::StringView -Mass::lastError() { +MassManager::lastError() { return _lastError; } GameObjects::Mass& -Mass::hangar(std::int32_t hangar) { +MassManager::hangar(std::int32_t hangar) { return _hangars[hangar]; } void -Mass::refreshHangar(std::int32_t hangar) { +MassManager::refreshHangar(std::int32_t hangar) { if(hangar < 0 || hangar >= 32) { _lastError = "Hangar index out of range."; LOG_ERROR(_lastError); @@ -66,7 +66,7 @@ Mass::refreshHangar(std::int32_t hangar) { } bool -Mass::importMass(Containers::StringView staged_fn, std::int32_t hangar) { +MassManager::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 @@ Mass::importMass(Containers::StringView staged_fn, std::int32_t hangar) { } bool -Mass::exportMass(std::int32_t hangar) { +MassManager::exportMass(std::int32_t hangar) { if(hangar < 0 || hangar >= 32) { _lastError = "Hangar index out of range."_s; LOG_ERROR(_lastError); @@ -136,7 +136,7 @@ Mass::exportMass(std::int32_t hangar) { } bool -Mass::moveMass(std::int32_t source, std::int32_t destination) { +MassManager::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 @@ Mass::moveMass(std::int32_t source, std::int32_t destination) { } bool -Mass::deleteMass(std::int32_t hangar) { +MassManager::deleteMass(std::int32_t hangar) { if(hangar < 0 || hangar >= 32) { _lastError = "Hangar index out of range."_s; LOG_ERROR(_lastError); @@ -191,12 +191,12 @@ Mass::deleteMass(std::int32_t hangar) { } const std::map& -Mass::stagedMasses() { +MassManager::stagedMasses() { return _stagedMasses; } void -Mass::refreshStagedMasses() { +MassManager::refreshStagedMasses() { _stagedMasses.clear(); using Utility::Path::ListFlag; @@ -229,7 +229,7 @@ Mass::refreshStagedMasses() { } void -Mass::refreshStagedMass(Containers::StringView filename) { +MassManager::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 @@ Mass::refreshStagedMass(Containers::StringView filename) { } bool -Mass::deleteStagedMass(Containers::StringView filename) { +MassManager::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); diff --git a/src/Managers/Mass.h b/src/Managers/MassManager.h similarity index 92% rename from src/Managers/Mass.h rename to src/Managers/MassManager.h index 62db95b..7ebf8f8 100644 --- a/src/Managers/Mass.h +++ b/src/Managers/MassManager.h @@ -28,9 +28,9 @@ using namespace Corrade; namespace mbst { namespace Managers { -class Mass { +class MassManager { public: - Mass(Containers::StringView save_path, Containers::StringView account, bool demo, Containers::StringView staging_dir); + MassManager(Containers::StringView save_path, Containers::StringView account, bool demo, Containers::StringView staging_dir); auto lastError() -> Containers::StringView; diff --git a/src/Managers/Profile.cpp b/src/Managers/ProfileManager.cpp similarity index 95% rename from src/Managers/Profile.cpp rename to src/Managers/ProfileManager.cpp index 893d3c3..2786e85 100644 --- a/src/Managers/Profile.cpp +++ b/src/Managers/ProfileManager.cpp @@ -29,13 +29,13 @@ #include "../Logger/Logger.h" -#include "Profile.h" +#include "ProfileManager.h" using namespace Containers::Literals; namespace mbst { namespace Managers { -Profile::Profile(Containers::StringView save_dir, Containers::StringView backup_dir): +ProfileManager::ProfileManager(Containers::StringView save_dir, Containers::StringView backup_dir): _saveDirectory{save_dir}, _backupsDirectory{backup_dir} { @@ -43,22 +43,22 @@ Profile::Profile(Containers::StringView save_dir, Containers::StringView backup_ } bool -Profile::ready() const { +ProfileManager::ready() const { return _ready; } Containers::StringView -Profile::lastError() { +ProfileManager::lastError() { return _lastError; } Containers::ArrayView -Profile::profiles() { +ProfileManager::profiles() { return _profiles; } bool -Profile::refreshProfiles() { +ProfileManager::refreshProfiles() { LOG_INFO("Refreshing profiles."); _profiles = Containers::Array{}; @@ -100,12 +100,12 @@ Profile::refreshProfiles() { } GameObjects::Profile* -Profile::getProfile(std::size_t index) { +ProfileManager::getProfile(std::size_t index) { return index <= _profiles.size() ? &(_profiles[index]) : nullptr; } bool -Profile::deleteProfile(std::size_t index, bool delete_builds) { +ProfileManager::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 @@ Profile::deleteProfile(std::size_t index, bool delete_builds) { } bool -Profile::backupProfile(std::size_t index, bool backup_builds) { +ProfileManager::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 @@ Profile::backupProfile(std::size_t index, bool backup_builds) { } Containers::ArrayView -Profile::backups() { +ProfileManager::backups() { return _backups; } void -Profile::refreshBackups() { +ProfileManager::refreshBackups() { _backups = Containers::Array{}; using Utility::Path::ListFlag; @@ -303,7 +303,7 @@ Profile::refreshBackups() { } bool -Profile::deleteBackup(std::size_t index) { +ProfileManager::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 @@ Profile::deleteBackup(std::size_t index) { } bool -Profile::restoreBackup(std::size_t index) { +ProfileManager::restoreBackup(std::size_t index) { const Backup& backup = _backups[index]; auto error_format = "Extraction of file {} failed: {}"_s; diff --git a/src/Managers/Profile.h b/src/Managers/ProfileManager.h similarity index 94% rename from src/Managers/Profile.h rename to src/Managers/ProfileManager.h index 8c2474b..d1bbb7e 100644 --- a/src/Managers/Profile.h +++ b/src/Managers/ProfileManager.h @@ -44,9 +44,9 @@ struct Backup { Containers::Array includedFiles; }; -class Profile { +class ProfileManager { public: - explicit Profile(Containers::StringView save_dir, Containers::StringView backup_dir); + explicit ProfileManager(Containers::StringView save_dir, Containers::StringView backup_dir); auto ready() const -> bool; auto lastError() -> Containers::StringView;