From 77d554594fa7bbbc902c28da2e7bd8ddf60eea1d Mon Sep 17 00:00:00 2001 From: Evil Eye Date: Sun, 19 May 2024 20:39:23 +0200 Subject: [PATCH] Add ReadersCache::clear --- apps/opencs/model/world/data.cpp | 12 +++++------- apps/opencs/model/world/data.hpp | 2 +- components/esm3/readerscache.cpp | 8 ++++++++ components/esm3/readerscache.hpp | 2 ++ 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/apps/opencs/model/world/data.cpp b/apps/opencs/model/world/data.cpp index 2927a47b28..dddbb8a850 100644 --- a/apps/opencs/model/world/data.cpp +++ b/apps/opencs/model/world/data.cpp @@ -1065,11 +1065,9 @@ int CSMWorld::Data::startLoading(const std::filesystem::path& path, bool base, b { Log(Debug::Info) << "Loading content file " << path; - if (!mReaders) - mReaders.emplace(); mDialogue = nullptr; - auto reader = mReaders->get(mReaderIndex++); + ESM::ReadersCache::BusyItem reader = mReaders.get(mReaderIndex++); reader->setEncoder(&mEncoder); reader->open(path); @@ -1133,14 +1131,14 @@ void CSMWorld::Data::loadFallbackEntries() bool CSMWorld::Data::continueLoading(CSMDoc::Messages& messages) { - if (mReaderIndex == 0 || !mReaders) + if (mReaderIndex == 0) throw std::logic_error("can't continue loading, because no load has been started"); - ESM::ReadersCache::BusyItem reader = mReaders->get(mReaderIndex - 1); + ESM::ReadersCache::BusyItem reader = mReaders.get(mReaderIndex - 1); if (!reader->isOpen()) throw std::logic_error("can't continue loading, because no load has been started"); reader->setEncoder(&mEncoder); reader->setIndex(static_cast(mReaderIndex - 1)); - reader->resolveParentFileIndices(*mReaders); + reader->resolveParentFileIndices(mReaders); if (!reader->hasMoreRecs()) { @@ -1411,7 +1409,7 @@ void CSMWorld::Data::finishLoading() mTopicInfos.sort(mTopicInfoOrder); mJournalInfos.sort(mJournalInfoOrder); // Release file locks so we can actually write to the file we're editing - mReaders.reset(); + mReaders.clear(); } bool CSMWorld::Data::hasId(const std::string& id) const diff --git a/apps/opencs/model/world/data.hpp b/apps/opencs/model/world/data.hpp index febb4070de..0cf25883af 100644 --- a/apps/opencs/model/world/data.hpp +++ b/apps/opencs/model/world/data.hpp @@ -123,7 +123,7 @@ namespace CSMWorld std::unique_ptr mActorAdapter; std::vector mModels; std::map mModelIndex; - std::optional mReaders; + ESM::ReadersCache mReaders; const ESM::Dialogue* mDialogue; // last loaded dialogue bool mBase; bool mProject; diff --git a/components/esm3/readerscache.cpp b/components/esm3/readerscache.cpp index deae2a3dc7..732a2a22ba 100644 --- a/components/esm3/readerscache.cpp +++ b/components/esm3/readerscache.cpp @@ -86,4 +86,12 @@ namespace ESM it->mState = State::Closed; } } + + void ReadersCache::clear() + { + mIndex.clear(); + mBusyItems.clear(); + mFreeItems.clear(); + mClosedItems.clear(); + } } diff --git a/components/esm3/readerscache.hpp b/components/esm3/readerscache.hpp index 5d8c2afcbd..80ca5d1ef3 100644 --- a/components/esm3/readerscache.hpp +++ b/components/esm3/readerscache.hpp @@ -55,6 +55,8 @@ namespace ESM BusyItem get(std::size_t index); + void clear(); + private: const std::size_t mCapacity; std::map::iterator> mIndex;