hide std::enable_shared_from_this constructors

Author: moritz-h

libsave/include/SatisfactorySave/Pak/AbstractPakFile.h

@@ -12,8 +12,12 @@ namespace SatisfactorySave {
     class PakManager;
 
     class SATISFACTORYSAVE_API AbstractPakFile : public std::enable_shared_from_this<AbstractPakFile> {
+    protected:
+        struct Private {
+            explicit Private() = default;
+        };
+
     public:
-        explicit AbstractPakFile(std::shared_ptr<PakManager> pakManager) : pakManager_(std::move(pakManager)) {}
         virtual ~AbstractPakFile() = default;
 
         [[nodiscard]] virtual std::vector<std::string> getAllAssetFilenames() const = 0;
@@ -27,6 +31,9 @@ namespace SatisfactorySave {
         AssetFile readAsset(const std::string& filename);
 
     protected:
+        explicit AbstractPakFile(Private, std::shared_ptr<PakManager> pakManager)
+            : pakManager_(std::move(pakManager)) {}
+
         std::shared_ptr<PakManager> pakManager_;
     };
 } // namespace SatisfactorySave

libsave/include/SatisfactorySave/Pak/IoStoreFile.h

@@ -34,7 +34,12 @@ namespace SatisfactorySave {
 
     class SATISFACTORYSAVE_API IoStoreFile : public AbstractPakFile {
     public:
-        IoStoreFile(std::shared_ptr<PakManager> pakManager, const std::filesystem::path& path);
+        static std::shared_ptr<IoStoreFile> create(std::shared_ptr<PakManager> pakManager,
+            const std::filesystem::path& path) {
+            return std::make_shared<IoStoreFile>(Private(), std::move(pakManager), path);
+        }
+
+        IoStoreFile(Private p, std::shared_ptr<PakManager> pakManager, const std::filesystem::path& path);
 
         [[nodiscard]] std::vector<std::string> getAllAssetFilenames() const override;
 

libsave/include/SatisfactorySave/Pak/PakFile.h

@@ -105,7 +105,12 @@ namespace SatisfactorySave {
 
     class SATISFACTORYSAVE_API PakFile : public AbstractPakFile {
     public:
-        PakFile(std::shared_ptr<PakManager> pakManager, const std::filesystem::path& pakPath);
+        static std::shared_ptr<PakFile> create(std::shared_ptr<PakManager> pakManager,
+            const std::filesystem::path& path) {
+            return std::make_shared<PakFile>(Private(), std::move(pakManager), path);
+        }
+
+        PakFile(Private p, std::shared_ptr<PakManager> pakManager, const std::filesystem::path& pakPath);
 
         [[nodiscard]] std::vector<std::string> getAllAssetFilenames() const override;
 

libsave/include/SatisfactorySave/Pak/PakManager.h

@@ -15,6 +15,10 @@
 namespace SatisfactorySave {
 
     class SATISFACTORYSAVE_API PakManager : public std::enable_shared_from_this<PakManager> {
+        struct Private {
+            explicit Private() = default;
+        };
+
     public:
         struct FScriptObjectDesc {
             std::string Name;
@@ -46,13 +50,13 @@ namespace SatisfactorySave {
         }
 
         static std::shared_ptr<PakManager> create(const std::filesystem::path& gameDir) {
-            auto pakManager = std::make_shared<PakManager>();
+            auto pakManager = std::make_shared<PakManager>(Private());
             // Do two-phase init because shared_from_this() is required.
             pakManager->init(gameDir);
             return pakManager;
-        };
+        }
 
-        PakManager() = default;
+        PakManager(Private) {};
         ~PakManager() = default;
 
         [[nodiscard]] std::vector<std::string> getAllAssetFilenames() const;

libsave/src/Pak/IoStoreFile.cpp

@@ -39,8 +39,9 @@ void SatisfactorySave::DirectoryIndexReader::parseFile(uint32_t file_idx, const
     parseFile(entry.NextFileEntry, path);
 }
 
-SatisfactorySave::IoStoreFile::IoStoreFile(std::shared_ptr<PakManager> pakManager, const std::filesystem::path& path)
-    : AbstractPakFile(std::move(pakManager)) {
+SatisfactorySave::IoStoreFile::IoStoreFile(Private p, std::shared_ptr<PakManager> pakManager,
+    const std::filesystem::path& path)
+    : AbstractPakFile(p, std::move(pakManager)) {
     if (!std::filesystem::is_regular_file(path)) {
         throw std::runtime_error("IoStore utoc file invalid: " + path.string());
     }

libsave/src/Pak/PakFile.cpp

@@ -6,8 +6,9 @@
 #include "IO/ZlibUtils.h"
 #include "Utils/StringUtils.h"
 
-SatisfactorySave::PakFile::PakFile(std::shared_ptr<PakManager> pakManager, const std::filesystem::path& pakPath)
-    : AbstractPakFile(std::move(pakManager)),
+SatisfactorySave::PakFile::PakFile(Private p, std::shared_ptr<PakManager> pakManager,
+    const std::filesystem::path& pakPath)
+    : AbstractPakFile(p, std::move(pakManager)),
       NumEntries(0),
       PathHashSeed(0) {
     if (!std::filesystem::is_regular_file(pakPath)) {

libsave/src/Pak/PakManager.cpp

@@ -18,7 +18,7 @@ void SatisfactorySave::PakManager::init(const std::filesystem::path& gameDir) {
     if (!std::filesystem::is_regular_file(globalUtocPath)) {
         throw std::runtime_error("Global utoc file not found!");
     }
-    auto globalUtoc = std::make_shared<IoStoreFile>(shared_from_this(), globalUtocPath);
+    auto globalUtoc = IoStoreFile::create(shared_from_this(), globalUtocPath);
     const auto globalBuf = globalUtoc->readChunkContent(0);
     IStreamArchive globalAr(globalBuf);
     globalAr << GlobalNameMap;
@@ -31,13 +31,13 @@ void SatisfactorySave::PakManager::init(const std::filesystem::path& gameDir) {
     if (!std::filesystem::is_regular_file(mainPakPath)) {
         throw std::runtime_error("Main pak file not found!");
     }
-    pakFiles_.push_back(std::make_shared<PakFile>(shared_from_this(), mainPakPath));
+    pakFiles_.push_back(PakFile::create(shared_from_this(), mainPakPath));
     cacheLatestPakNames();
 
     if (!std::filesystem::is_regular_file(mainUtocPath)) {
         throw std::runtime_error("Main utoc file not found!");
     }
-    pakFiles_.push_back(std::make_shared<IoStoreFile>(shared_from_this(), mainUtocPath));
+    pakFiles_.push_back(IoStoreFile::create(shared_from_this(), mainUtocPath));
     cacheLatestPakNames();
 
     // Search for Mod pak/utoc files.
@@ -76,9 +76,9 @@ void SatisfactorySave::PakManager::init(const std::filesystem::path& gameDir) {
         std::shared_ptr<AbstractPakFile> pak;
         try {
             if (is_pak) {
-                pak = std::make_shared<PakFile>(shared_from_this(), filePath);
+                pak = PakFile::create(shared_from_this(), filePath);
             } else if (is_utoc) {
-                pak = std::make_shared<IoStoreFile>(shared_from_this(), filePath);
+                pak = IoStoreFile::create(shared_from_this(), filePath);
             }
         } catch (const std::exception& ex) {
             spdlog::error("Error reading pak/utoc file: {}", ex.what());