Re-index BSAs

components/vfs/archive.hpp

@@ -21,8 +21,8 @@ namespace VFS
     public:
         virtual ~Archive() {}
 
-        /// Clears cached data for archives that may change.
+        /// Clears cached data.
-        virtual void resetIfNotStatic(){};
+        virtual void reset() = 0;
 
         /// List all resources contained in this archive, and run the resource names through the given normalize function.
         virtual void listResources(std::map<std::string, File*>& out, char (*normalize_function) (char)) = 0;

components/vfs/bsaarchive.cpp

@@ -5,14 +5,15 @@ namespace VFS
 
 
 BsaArchive::BsaArchive(const std::string &filename)
+    : mFileName(filename)
 {
-    mFile.open(filename);
+    load();
+}
 
-    const Bsa::BSAFile::FileList &filelist = mFile.getList();
+void BsaArchive::reset()
-    for(Bsa::BSAFile::FileList::const_iterator it = filelist.begin();it != filelist.end();++it)
 {
-        mResources.push_back(BsaArchiveFile(&*it, &mFile));
+    mResources.clear();
-    }
+    load();
 }
 
 void BsaArchive::listResources(std::map<std::string, File *> &out, char (*normalize_function)(char))
@@ -26,6 +27,17 @@ void BsaArchive::listResources(std::map<std::string, File *> &out, char (*normal
     }
 }
 
+void BsaArchive::load()
+{
+    mFile.open(mFileName);
+
+    const Bsa::BSAFile::FileList &filelist = mFile.getList();
+    for(Bsa::BSAFile::FileList::const_iterator it = filelist.begin();it != filelist.end();++it)
+    {
+        mResources.push_back(BsaArchiveFile(&*it, &mFile));
+    }
+}
+
 // ------------------------------------------------------------------------------
 
 BsaArchiveFile::BsaArchiveFile(const Bsa::BSAFile::FileStruct *info, Bsa::BSAFile* bsa)

components/vfs/bsaarchive.hpp

@@ -24,9 +24,14 @@ namespace VFS
     public:
         BsaArchive(const std::string& filename);
 
+        virtual void reset();
+
         virtual void listResources(std::map<std::string, File*>& out, char (*normalize_function) (char));
 
     private:
+        void load();
+
+        std::string mFileName;
         Bsa::BSAFile mFile;
 
         std::vector<BsaArchiveFile> mResources;

components/vfs/filesystemarchive.cpp

@@ -12,7 +12,7 @@ namespace VFS
 
     }
 
-    void FileSystemArchive::resetIfNotStatic()
+    void FileSystemArchive::reset()
     {
         mIndex.clear();
         mBuiltIndex = false;

components/vfs/filesystemarchive.hpp

@@ -23,7 +23,7 @@ namespace VFS
     public:
         FileSystemArchive(const std::string& path);
 
-        virtual void resetIfNotStatic();
+        virtual void reset();
 
         virtual void listResources(std::map<std::string, File*>& out, char (*normalize_function) (char));
 

components/vfs/manager.cpp

@@ -60,7 +60,7 @@ namespace VFS
     void Manager::rebuildIndex()
     {
         for (std::vector<Archive*>::const_iterator it = mArchives.begin(); it != mArchives.end(); ++it)
-            (*it)->resetIfNotStatic();
+            (*it)->reset();
 
         buildIndex();
     }