remove LoadFileRaw from ArchiveManager, move to protected in `Arc…

…hive` (#459)
Kenix3 · Mar 6, 2024 · f79b19a · f79b19a
1 parent d70fd7d
commit f79b19a
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 25 deletions.
diff --git a/src/resource/archive/Archive.h b/src/resource/archive/Archive.h
@@ -37,13 +37,13 @@ class Archive {
 
     virtual bool Open() = 0;
     virtual bool Close() = 0;
-    virtual std::shared_ptr<File> LoadFileRaw(const std::string& filePath) = 0;
-    virtual std::shared_ptr<File> LoadFileRaw(uint64_t hash) = 0;
 
   protected:
     void SetLoaded(bool isLoaded);
     void SetGameVersion(uint32_t gameVersion);
     void IndexFile(const std::string& filePath);
+    virtual std::shared_ptr<File> LoadFileRaw(const std::string& filePath) = 0;
+    virtual std::shared_ptr<File> LoadFileRaw(uint64_t hash) = 0;
 
   private:
     static std::shared_ptr<ResourceInitData> CreateDefaultResourceInitData();

diff --git a/src/resource/archive/ArchiveManager.cpp b/src/resource/archive/ArchiveManager.cpp
@@ -60,25 +60,6 @@ std::shared_ptr<File> ArchiveManager::LoadFile(uint64_t hash, std::shared_ptr<Re
     return file;
 }
 
-std::shared_ptr<File> ArchiveManager::LoadFileRaw(const std::string& filePath) {
-    if (filePath == "") {
-        return nullptr;
-    }
-
-    return LoadFileRaw(CRC64(filePath.c_str()));
-}
-
-std::shared_ptr<File> ArchiveManager::LoadFileRaw(uint64_t hash) {
-    const auto archive = mFileToArchive[hash];
-    if (archive == nullptr) {
-        return nullptr;
-    }
-
-    auto file = archive->LoadFileRaw(hash);
-    file->Parent = archive;
-    return file;
-}
-
 bool ArchiveManager::HasFile(const std::string& filePath) {
     return HasFile(CRC64(filePath.c_str()));
 }

diff --git a/src/resource/archive/ArchiveManager.h b/src/resource/archive/ArchiveManager.h
@@ -22,8 +22,6 @@ class ArchiveManager {
     bool IsArchiveLoaded();
     std::shared_ptr<File> LoadFile(const std::string& filePath, std::shared_ptr<ResourceInitData> initData = nullptr);
     std::shared_ptr<File> LoadFile(uint64_t hash, std::shared_ptr<ResourceInitData> initData = nullptr);
-    std::shared_ptr<File> LoadFileRaw(const std::string& filePath);
-    std::shared_ptr<File> LoadFileRaw(uint64_t hash);
     bool HasFile(const std::string& filePath);
     bool HasFile(uint64_t hash);
     std::shared_ptr<std::vector<std::string>> ListFiles(const std::string& filter);

diff --git a/src/resource/archive/O2rArchive.h b/src/resource/archive/O2rArchive.h
@@ -22,10 +22,11 @@ class O2rArchive : virtual public Archive {
 
     bool Open();
     bool Close();
+
+  protected:
     std::shared_ptr<File> LoadFileRaw(const std::string& filePath);
     std::shared_ptr<File> LoadFileRaw(uint64_t hash);
 
-  protected:
   private:
     zip_t* mZipArchive;
 };

diff --git a/src/resource/archive/OtrArchive.h b/src/resource/archive/OtrArchive.h
@@ -26,10 +26,11 @@ class OtrArchive : virtual public Archive {
 
     bool Open();
     bool Close();
+
+  protected:
     std::shared_ptr<File> LoadFileRaw(const std::string& filePath);
     std::shared_ptr<File> LoadFileRaw(uint64_t hash);
 
-  protected:
   private:
     HANDLE mHandle;
 };