MassManager: move some fields to SaveTool.

src/MassManager/MassManager.cpp

@@ -24,11 +24,11 @@
 
 static const std::string empty_string = "";
 
-MassManager::MassManager(const std::string& save_path, const std::string& steam_id, bool demo):
+MassManager::MassManager(const std::string& save_path, const std::string& steam_id, bool demo, const std::string& staging_dir):
     _saveDirectory{save_path},
     _steamId{steam_id},
     _demo{demo},
-    _stagingAreaDirectory{Utility::Directory::join(Utility::Directory::path(Utility::Directory::executableLocation()), "staging")}
+    _stagingAreaDirectory{staging_dir}
 {
     Containers::arrayReserve(_hangars, 32);
 
@@ -45,14 +45,6 @@ MassManager::MassManager(const std::string& save_path, const std::string& steam_
     refreshStagedMasses();
 }
 
-auto MassManager::saveDirectory() -> std::string const& {
-    return _saveDirectory;
-}
-
-auto MassManager::stagingAreaDirectory() -> std::string const& {
-    return _stagingAreaDirectory;
-}
-
 auto MassManager::lastError() -> std::string const& {
     return _lastError;
 }

src/MassManager/MassManager.h

@@ -27,10 +27,7 @@ using namespace Corrade;
 
 class MassManager {
     public:
-        MassManager(const std::string& save_path, const std::string& steam_id, bool demo);
+        MassManager(const std::string& save_path, const std::string& steam_id, bool demo, const std::string& staging_dir);
-
-        auto saveDirectory() -> std::string const&;
-        auto stagingAreaDirectory() -> std::string const&;
 
         auto lastError() -> std::string const&;
 
@@ -50,15 +47,15 @@ class MassManager {
         auto deleteStagedMass(const std::string& filename) -> bool;
 
     private:
-        std::string _saveDirectory;
+        const std::string& _saveDirectory;
-        std::string _steamId;
+        const std::string& _steamId;
         bool _demo;
 
         std::string _lastError;
 
         Containers::Array<Mass> _hangars;
 
-        const std::string _stagingAreaDirectory;
+        const std::string& _stagingAreaDirectory;
 
         std::map<std::string, std::string> _stagedMasses;
 };

src/ProfileManager/ProfileManager.cpp

@@ -33,20 +33,10 @@
 
 using namespace Corrade;
 
-ProfileManager::ProfileManager(const std::string& base_path):
+ProfileManager::ProfileManager(const std::string& save_dir, const std::string& backup_dir):
-    _backupsDirectory{Utility::Directory::join(Utility::Directory::path(Utility::Directory::executableLocation()), "backups")}
+    _saveDirectory{save_dir},
+    _backupsDirectory{backup_dir}
 {
-    _saveDirectory = Utility::Directory::join(base_path, "Saved/SaveGames");
-
-    if(!Utility::Directory::exists(_backupsDirectory)) {
-        Utility::Directory::mkpath(_backupsDirectory);
-    }
-
-    if(!Utility::Directory::exists(_saveDirectory)) {
-        _lastError = "Couldn't find the profile directory. Make sure you played enough of the game.";
-        return;
-    }
-
     _ready = refreshProfiles();
 }
 
@@ -58,14 +48,6 @@ auto ProfileManager::lastError() -> std::string const& {
     return _lastError;
 }
 
-auto ProfileManager::saveDirectory() -> std::string const& {
-    return _saveDirectory;
-}
-
-auto ProfileManager::backupsDirectory() -> std::string const& {
-    return _backupsDirectory;
-}
-
 auto ProfileManager::profiles() -> std::vector<Profile> const& {
     return _profiles;
 }

src/ProfileManager/ProfileManager.h

@@ -38,14 +38,11 @@ struct Backup {
 
 class ProfileManager {
     public:
-        ProfileManager(const std::string& base_path);
+        explicit ProfileManager(const std::string& save_dir, const std::string& backup_dir);
 
         auto ready() const -> bool;
         auto lastError() -> std::string const&;
 
-        auto saveDirectory() -> std::string const&;
-        auto backupsDirectory() -> std::string const&;
-
         auto profiles() -> std::vector<Profile> const&;
         auto refreshProfiles() -> bool;
 
@@ -61,10 +58,10 @@ class ProfileManager {
 
     private:
         bool _ready = false;
-        std::string _lastError = "";
+        std::string _lastError;
 
-        std::string _saveDirectory;
+        const std::string& _saveDirectory;
-        const std::string _backupsDirectory;
+        const std::string& _backupsDirectory;
 
         std::vector<Profile> _profiles;
         std::vector<Backup> _backups;

src/SaveTool/SaveTool.cpp

@@ -87,6 +87,17 @@ SaveTool::SaveTool(const Arguments& arguments):
         exit(EXIT_FAILURE);
     }
 
+    _backupsDir = Utility::Directory::join(Utility::Directory::path(Utility::Directory::executableLocation()), "backups");
+    _stagingDir = Utility::Directory::join(Utility::Directory::path(Utility::Directory::executableLocation()), "staging");
+
+    if(!Utility::Directory::exists(_backupsDir)) {
+        Utility::Directory::mkpath(_backupsDir);
+    }
+
+    if(!Utility::Directory::exists(_stagingDir)) {
+        Utility::Directory::mkpath(_stagingDir);
+    }
+
     if(!findGameDataDirectory()) {
         SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Error initialising the app", _lastError.c_str(), window());
         exit(EXIT_FAILURE);
@@ -304,7 +315,7 @@ void SaveTool::initialiseManager() {
     SDL_zero(event);
     event.type = _initEventId;
 
-    _profileManager.emplace(_gameDataDir);
+    _profileManager.emplace(_saveDir, _backupsDir);
     if(!_profileManager->ready()) {
         event.user.code = ProfileManagerFailure;
         SDL_PushEvent(&event);
@@ -337,17 +348,18 @@ auto SaveTool::findGameDataDirectory() -> bool {
 void SaveTool::initialiseMassManager() {
     _currentProfile->refreshValues();
 
-    _massManager.emplace(_profileManager->saveDirectory(),
+    _massManager.emplace(_saveDir,
                          _currentProfile->steamId(),
-                         _currentProfile->type() == ProfileType::Demo);
+                         _currentProfile->type() == ProfileType::Demo,
+                         _stagingDir);
 
     initialiseFileWatcher();
 }
 
 void SaveTool::initialiseFileWatcher() {
     _fileWatcher.emplace();
-    _watchIDs[SaveDir] = _fileWatcher->addWatch(_profileManager->saveDirectory(), this, false);
+    _watchIDs[SaveDir] = _fileWatcher->addWatch(_saveDir, this, false);
-    _watchIDs[StagingDir] = _fileWatcher->addWatch(_massManager->stagingAreaDirectory(), this, false);
+    _watchIDs[StagingDir] = _fileWatcher->addWatch(_stagingDir, this, false);
     _fileWatcher->watch();
 }
 

src/SaveTool/SaveTool.h

@@ -165,6 +165,9 @@ class SaveTool: public Platform::Sdl2Application, public efsw::FileWatchListener
         std::string _saveDir;
         std::string _screenshotsDir;
 
+        std::string _backupsDir;
+        std::string _stagingDir;
+
         enum class GameState : UnsignedByte {
                 Unknown, NotRunning, Running
         } _gameState{GameState::Unknown};

src/SaveTool/SaveTool_MainManager.cpp

@@ -19,6 +19,7 @@
 #include <algorithm>
 
 #include <Corrade/Containers/Reference.h>
+#include <Corrade/Utility/Directory.h>
 #include <Corrade/Utility/FormatStl.h>
 #include <Corrade/Utility/String.h>
 
@@ -528,7 +529,7 @@ void SaveTool::drawMassManager() {
         ImGui::TextUnformatted("Staging area");
         ImGui::SameLine();
         if(ImGui::SmallButton(ICON_FA_FOLDER_OPEN " Open staging folder")) {
-            openUri(_massManager->stagingAreaDirectory());
+            openUri(Utility::Directory::toNativeSeparators(_stagingDir));
         }
 
         for(const auto& pair : _massManager->stagedMasses()) {

src/SaveTool/SaveTool_drawMainMenu.cpp

@@ -41,12 +41,12 @@ void SaveTool::drawMainMenu() {
             }
 
             if(ImGui::BeginMenu(ICON_FA_FOLDER_OPEN " Open manager directory")) {
-                if(ImGui::MenuItem(ICON_FA_EXCHANGE_ALT " Staging area", nullptr, false, _massManager != nullptr)) {
+                if(ImGui::MenuItem(ICON_FA_FILE_ARCHIVE " Profile backups", nullptr, false, _profileManager != nullptr)) {
-                    openUri(Utility::Directory::toNativeSeparators(_massManager->stagingAreaDirectory()));
+                    openUri(Utility::Directory::toNativeSeparators(_backupsDir));
                 }
 
-                if(ImGui::MenuItem(ICON_FA_FILE_ARCHIVE " Profile backups", nullptr, false, _profileManager != nullptr)) {
+                if(ImGui::MenuItem(ICON_FA_EXCHANGE_ALT " Staging area", nullptr, false, _massManager != nullptr)) {
-                    openUri(Utility::Directory::toNativeSeparators(_profileManager->backupsDirectory()));
+                    openUri(Utility::Directory::toNativeSeparators(_stagingDir));
                 }
 
                 ImGui::EndMenu();