preparing for multiple origins shell menus

split exec() from createMenu()

2 files changed, 27 insertions, 1 deletions

diff --git a/src/shared/directoryentry.cpp b/src/shared/directoryentry.cpp
index 819075ae..460431a4 100644
--- a/src/shared/directoryentry.cpp
+++ b/src/shared/directoryentry.cpp
@@ -104,6 +104,17 @@ public:
     return m_Origins[ID];

   }

 

+  const FilesOrigin* findByID(Index ID) const

+  {

+    auto itor = m_Origins.find(ID);

+

+    if (itor == m_Origins.end()) {

+      return nullptr;

+    } else {

+      return &itor->second;

+    }

+  }

+

   FilesOrigin &getByName(const std::wstring &name)

   {

     std::map<std::wstring, int>::iterator iter = m_OriginsNameMap.find(name);

@@ -736,6 +747,11 @@ FilesOrigin &DirectoryEntry::getOriginByName(const std::wstring &name) const
   return m_OriginConnection->getByName(name);

 }

 

+const FilesOrigin* DirectoryEntry::findOriginByID(int ID) const

+{

+  return m_OriginConnection->findByID(ID);

+}

+

 int DirectoryEntry::anyOrigin() const

 {

   bool ignore;

diff --git a/src/shared/directoryentry.h b/src/shared/directoryentry.h
index b5a1dced..69eb7574 100644
--- a/src/shared/directoryentry.h
+++ b/src/shared/directoryentry.h
@@ -63,7 +63,16 @@ class FileEntry
 public:

   typedef unsigned int Index;

   typedef boost::shared_ptr<FileEntry> Ptr;

-  typedef std::vector<std::pair<int, std::pair<std::wstring, int>>> AlternativesVector;

+

+  // a vector of {originId, {archiveName, order}}

+  //

+  // if a file is in an archive, archiveName is the name of the bsa and order

+  // is the order of the associated plugin in the plugins list

+  //

+  // is a file is not in an archive, archiveName is empty and order is usually

+  // -1

+  typedef std::vector<std::pair<int, std::pair<std::wstring, int>>>

+    AlternativesVector;

 

   FileEntry();

   FileEntry(Index index, const std::wstring &name, DirectoryEntry *parent);

@@ -339,6 +348,7 @@ public:
   bool originExists(const std::wstring &name) const;

   FilesOrigin &getOriginByID(int ID) const;

   FilesOrigin &getOriginByName(const std::wstring &name) const;

+  const FilesOrigin* findOriginByID(int ID) const;

 

   int anyOrigin() const;