Split profiles method into profileNames and getProfile

Author: JonathanFeenstra

src/organizercore.cpp

@@ -614,21 +614,22 @@ void OrganizerCore::setCurrentProfile(const QString& profileName)
   m_ProfileChanged(oldProfile.get(), m_CurrentProfile.get());
 }
 
-std::vector<std::shared_ptr<const MOBase::IProfile>> OrganizerCore::profiles() const
+QStringList OrganizerCore::profileNames() const
 {
   QDir profilesDir(m_Settings.paths().profiles());
-  std::vector<std::shared_ptr<const MOBase::IProfile>> profiles;
-  for (auto info : profilesDir.entryInfoList(QDir::AllDirs | QDir::NoDotAndDotDot)) {
-    try {
-      profiles.push_back(std::make_shared<const Profile>(
-          info.absoluteFilePath(), managedGame(), gameFeatures()));
-    } catch (std::exception& e) {
-      log::error("failed to load profile '{}': {}", info.fileName(), e.what());
-      continue;
-    }
+  return profilesDir.entryList(QDir::AllDirs | QDir::NoDotAndDotDot);
+}
+
+std::shared_ptr<const MOBase::IProfile>
+OrganizerCore::getProfile(const QString& profileName) const
+{
+  QDir profileDir(m_Settings.paths().profiles());
+  profileDir.cd(profileName);
+  if (!profileDir.exists()) {
+    return nullptr;
   }
 
-  return profiles;
+  return std::make_shared<Profile>(profileDir, managedGame(), gameFeatures());
 }
 
 MOBase::IModRepositoryBridge* OrganizerCore::createNexusBridge() const

src/organizercore.h

@@ -273,7 +273,8 @@ class OrganizerCore : public QObject, public MOBase::IPluginDiagnose
   Profile* currentProfile() const { return m_CurrentProfile.get(); }
   void setCurrentProfile(const QString& profileName);
 
-  std::vector<std::shared_ptr<const MOBase::IProfile>> profiles() const;
+  QStringList profileNames() const;
+  std::shared_ptr<const MOBase::IProfile> getProfile(const QString& profileName) const;
 
   std::vector<QString> enabledArchives();
 

src/organizerproxy.cpp

@@ -17,7 +17,6 @@
 #include <QObject>
 
 #include <memory>
-#include <vector>
 
 using namespace MOBase;
 using namespace MOShared;
@@ -376,9 +375,15 @@ MOBase::IProfile* OrganizerProxy::profile() const
   return m_Proxied->currentProfile();
 }
 
-std::vector<std::shared_ptr<const MOBase::IProfile>> OrganizerProxy::profiles() const
+QStringList OrganizerProxy::profileNames() const
 {
-  return m_Proxied->profiles();
+  return m_Proxied->profileNames();
+}
+
+std::shared_ptr<const MOBase::IProfile>
+OrganizerProxy::getProfile(const QString& name) const
+{
+  return m_Proxied->getProfile(name);
 }
 
 MOBase::IPluginGame const* OrganizerProxy::managedGame() const

src/organizerproxy.h

@@ -66,7 +66,10 @@ class OrganizerProxy : public MOBase::IOrganizer
   MOBase::IPluginList* pluginList() const override;
   MOBase::IModList* modList() const override;
   MOBase::IProfile* profile() const override;
-  std::vector<std::shared_ptr<const MOBase::IProfile>> profiles() const override;
+  QStringList profileNames() const override;
+  std::shared_ptr<const MOBase::IProfile>
+  getProfile(const QString& name) const override;
+
   MOBase::IGameFeatures* gameFeatures() const override;
 
   HANDLE startApplication(const QString& executable,