Use memoization for file tree, contents and validity of ModInfo.

1 files changed, 24 insertions, 7 deletions

diff --git a/src/modinfowithconflictinfo.h b/src/modinfowithconflictinfo.h
index 68675397..3adbb998 100644
--- a/src/modinfowithconflictinfo.h
+++ b/src/modinfowithconflictinfo.h
@@ -3,6 +3,7 @@
 
 #include <ifiletree.h>
 
+#include "thread_utils.h"
 #include "modinfo.h"
 
 #include <QTime>
@@ -21,6 +22,11 @@ public:
   virtual bool isValid() const override;
 
   /**
+   * @return a list of content types contained in a mod
+   */
+  virtual std::vector<EContent> getContents() const override;
+
+  /**
    * @brief clear all caches held for this mod
    */
   virtual void clearCaches() override;
@@ -49,13 +55,20 @@ public slots:
 protected:
 
   /**
-   * @brief check if the content of this mod is valid.
+   * @brief Check if the content of this mod is valid.
    *
-   * @return true if the content is valid, false otherwize.
+   * @return true if the content is valid, false otherwise.
    **/
   virtual bool doTestValid() const;
 
   /**
+   * @brief Compute the contents for this mod.
+   *
+   * @return the contents for this mod.
+   **/
+  virtual std::vector<EContent> doGetContents() const { return {}; }
+
+  /**
    * @brief Retrieve a file tree corresponding to the underlying disk content
    *     of this mod.
    *
@@ -122,12 +135,16 @@ protected:
 
 private:
 
-  // Mutex:
-  mutable std::mutex m_Mutex;
+  /**
+   * @return a file tree for this mod.
+   */
+  std::shared_ptr<const MOBase::IFileTree> updateFileTree() const;
 
-  // File tree representing the content of the disk. A null pointer indicates
-  // that the content needs to be loaded from the disk:
-  mutable std::shared_ptr<const MOBase::IFileTree> m_FileTree = nullptr;
+  MOShared::MemoizedLocked<
+    std::shared_ptr<const MOBase::IFileTree>, 
+    decltype(&ModInfoWithConflictInfo::updateFileTree)> m_FileTree;
+  MOShared::MemoizedLocked<bool, decltype(&ModInfoWithConflictInfo::doTestValid)> m_Valid;
+  MOShared::MemoizedLocked<std::vector<EContent>, decltype(&ModInfoWithConflictInfo::doGetContents)> m_Contents;
 
   MOShared::DirectoryEntry **m_DirectoryStructure;