From 9fb639a00e1a809a9ea9b5e68777ec46f534761c Mon Sep 17 00:00:00 2001
From: Mikaël Capelle <capelle.mikael@gmail.com>
Date: Sun, 24 May 2020 13:27:40 +0200
Subject: Update ModInfo to use a single file tree for all content-related
 operations.

---
 src/modinfowithconflictinfo.cpp | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'src/modinfowithconflictinfo.cpp')

diff --git a/src/modinfowithconflictinfo.cpp b/src/modinfowithconflictinfo.cpp
index 0c67b4f7..45ecffb7 100644
--- a/src/modinfowithconflictinfo.cpp
+++ b/src/modinfowithconflictinfo.cpp
@@ -296,14 +296,30 @@ bool ModInfoWithConflictInfo::hasHiddenFiles() const
   return m_HasHiddenFiles;
 }
 
+void ModInfoWithConflictInfo::diskContentModified() {
+  std::unique_lock lock(m_Mutex);
+  m_FileTree = nullptr;
+}
+
+std::shared_ptr<const IFileTree> ModInfoWithConflictInfo::contentFileTree() const {
+  std::unique_lock lock(m_Mutex);
+  if (!m_FileTree) {
+    m_FileTree = QDirFileTree::makeTree(absolutePath());
+  }
+  return m_FileTree;
+}
 
 bool ModInfoWithConflictInfo::doTestValid() const {
   auto mdc = m_GamePlugin->feature<ModDataChecker>();
 
   if (mdc) {
-    auto qdirfiletree = QDirFileTree::makeTree(absolutePath());
+    auto qdirfiletree = contentFileTree();
     return mdc->dataLooksValid(qdirfiletree);
   }
 
   return true;
 }
+
+bool ModInfoWithConflictInfo::isValid() const {
+  return doTestValid();
+}
-- 
cgit v1.3.1