Remove most instances of GameInfo::getname, and transfer getDLCPlugins to the plugingame interface

Also commented out startDownloadNexusFile as it doesn't appear to be used anywhere

1 files changed, 15 insertions, 9 deletions

diff --git a/src/modinfo.cpp b/src/modinfo.cpp
index e0d888e6..59205b12 100644
--- a/src/modinfo.cpp
+++ b/src/modinfo.cpp
@@ -203,7 +203,7 @@ unsigned int ModInfo::findMod(const boost::function<bool (ModInfo::Ptr)> &filter
 }
 
 
-void ModInfo::updateFromDisc(const QString &modDirectory, DirectoryEntry **directoryStructure, bool displayForeign)
+void ModInfo::updateFromDisc(const QString &modDirectory, DirectoryEntry **directoryStructure, bool displayForeign, MOBase::IPluginGame const *game)
 {
   QMutexLocker lock(&s_Mutex);
   s_Collection.clear();
@@ -219,19 +219,25 @@ void ModInfo::updateFromDisc(const QString &modDirectory, DirectoryEntry **direc
   }
 
   { // list plugins in the data directory and make a foreign-managed mod out of each
-    std::vector<std::wstring> dlcPlugins = GameInfo::instance().getDLCPlugins();
-    QDir dataDir(QDir::fromNativeSeparators(ToQString(GameInfo::instance().getGameDirectory())) + "/data");
-    foreach (const QFileInfo &file, dataDir.entryInfoList(QStringList() << "*.esp" << "*.esm")) {
-      if ((file.baseName() != "Update") // hide update
-          && (file.baseName() != ToQString(GameInfo::instance().getGameName())) // hide the game esp
+    QStringList dlcPlugins = game->getDLCPlugins();
+    QStringList mainPlugins = game->getPrimaryPlugins();
+    QDir dataDir(game->dataDirectory());
+    for (const QString &file : dataDir.entryList({ "*.esp", "*.esm" })) {
+      if (std::find_if(mainPlugins.begin(), mainPlugins.end(),
+                       [&file](QString const &p) {
+                          return p.compare(file, Qt::CaseInsensitive) == 0; }) == mainPlugins.end()
           && (displayForeign // show non-dlc bundles only if the user wants them
-              || std::find(dlcPlugins.begin(), dlcPlugins.end(), ToWString(file.fileName())) != dlcPlugins.end())) {
+              || std::find_if(dlcPlugins.begin(), dlcPlugins.end(),
+                              [&file](QString const &p) {
+                                  return p.compare(file, Qt::CaseInsensitive) == 0; }) != dlcPlugins.end())) {
+
+        QFileInfo f(file); //Just so I can get a basename...
         QStringList archives;
-        foreach (const QString archiveName, dataDir.entryList(QStringList() << file.baseName() + "*.bsa")) {
+        for (const QString &archiveName : dataDir.entryList({ f.baseName() + "*.bsa" })) {
           archives.append(dataDir.absoluteFilePath(archiveName));
         }
 
-        createFromPlugin(file.fileName(), archives, directoryStructure);
+        createFromPlugin(file, archives, directoryStructure);
       }
     }
   }