williamjcm/MassBuilderSaveTool
williamjcm/MassBuilderSaveTool
1
0
Fork 0
Code Issues 15 Pull requests Releases 21 Wiki Activity

{Mass,Profile}Manager: rename classes.

Browse source 
Partial revert of 04d2ab9dc7.

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.
This commit is contained in:
Guillaume Jacquemin 2024-03-30 16:03:11 +01:00
parent 8a809b7752
commit 9f0386d5b3
Signed by: williamjcm
SSH key fingerprint: SHA256:AYLOg+iTV0ElElnlu4vqM4edFazVdRiuQB0Y5LoKc4A
6 changed files with 40 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/Application/Application.h
View file

@ -38,8 +38,8 @@
#include <efsw/efsw.hpp>
#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<Managers::Profile> _profileManager;
GameObjects::Profile* _currentProfile = nullptr;
Containers::Pointer<Managers::ProfileManager> _profileManager;
GameObjects::Profile* _currentProfile = nullptr;
Containers::Pointer<Managers::Mass> _massManager;
GameObjects::Mass* _currentMass = nullptr;
Containers::Pointer<Managers::MassManager> _massManager;
GameObjects::Mass* _currentMass = nullptr;
GameObjects::Weapon* _currentWeapon = nullptr;

8
src/CMakeLists.txt
View file

@ -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

26
src/Managers/Mass.cpp → src/Managers/MassManager.cpp
View file

@ -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<Containers::String, Containers::String>&
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);

4
src/Managers/Mass.h → src/Managers/MassManager.h
View file

@ -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;

26
src/Managers/Profile.cpp → src/Managers/ProfileManager.cpp
View file

@ -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<GameObjects::Profile>
Profile::profiles() {
ProfileManager::profiles() {
return _profiles;
}
bool
Profile::refreshProfiles() {
ProfileManager::refreshProfiles() {
LOG_INFO("Refreshing profiles.");
_profiles = Containers::Array<GameObjects::Profile>{};
@ -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(&timestamp);
auto& profile = _profiles[index];
@ -213,12 +213,12 @@ Profile::backupProfile(std::size_t index, bool backup_builds) {
}
Containers::ArrayView<Backup>
Profile::backups() {
ProfileManager::backups() {
return _backups;
}
void
Profile::refreshBackups() {
ProfileManager::refreshBackups() {
_backups = Containers::Array<Backup>{};
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;

4
src/Managers/Profile.h → src/Managers/ProfileManager.h
View file

@ -44,9 +44,9 @@ struct Backup {
Containers::Array<Containers::String> 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;