Restore packs after purge in rpc mode

Author: edriouk

tools/projmgr/src/ProjMgrRpcServer.cpp

@@ -322,6 +322,7 @@ RpcArgs::SuccessResult RpcHandler::LoadPacks(void) {
 RpcArgs::SuccessResult RpcHandler::LoadSolution(const string& solution, const string& activeTarget) {
   m_bUseAllPacks = false; // loading solution will first use only listed packs
   m_packReferences.clear(); // will be updated
+  m_manager.Clear();
   m_solutionLoaded = false; // assume not loaded yet
   auto globalModel = ProjMgrKernel::Get()->GetGlobalModel();
   // remove non-existing and explicit packs
@@ -338,6 +339,13 @@ RpcArgs::SuccessResult RpcHandler::LoadSolution(const string& solution, const st
     result.message = solution + " is not a *.csolution.yml file";
     return result;
   }
+  if(purged) {
+    // we need to add available packs to model again (the packs are already loaded)
+    m_worker.InitializeModel();
+    m_worker.SetLoadPacksPolicy(LoadPacksPolicy::ALL);
+    result.success = m_worker.LoadAllRelevantPacks();
+    m_worker.SetLoadPacksPolicy(LoadPacksPolicy::DEFAULT);
+  }
   // we disregard return value of m_manager.LoadSolution() here, because we tolerate some errors
   m_manager.LoadSolution(csolutionFile, activeTarget);
   map<string, ContextItem>* contexts = nullptr;
@@ -880,6 +888,7 @@ RpcArgs::ConvertSolutionResult RpcHandler::ConvertSolution(const string& solutio
   m_bUseAllPacks = false; // loading solution will first use only listed packs
   m_packReferences.clear(); // will be updated
   m_solutionLoaded = false; // assume not loaded
+  m_manager.Clear();
   auto globalModel = ProjMgrKernel::Get()->GetGlobalModel();
   // remove non-existing and explicit packs
   // clear model and projects if at least one pack is deleted

tools/projmgr/src/ProjMgrWorker.cpp

@@ -548,7 +548,7 @@ bool ProjMgrWorker::LoadAllRelevantPacks() {
     return false;
   }
   // Get installed packs
-  if (m_rpcMode || pdscFiles.empty() || (m_loadPacksPolicy == LoadPacksPolicy::ALL) || (m_loadPacksPolicy == LoadPacksPolicy::LATEST)) {
+  if (pdscFiles.empty() || (m_loadPacksPolicy == LoadPacksPolicy::ALL) || (m_loadPacksPolicy == LoadPacksPolicy::LATEST)) {
     const bool latest = (m_loadPacksPolicy == LoadPacksPolicy::LATEST) || (m_loadPacksPolicy == LoadPacksPolicy::DEFAULT);
     if (!m_kernel->GetEffectivePdscFiles(pdscFiles, latest)) {
       ProjMgrLogger::Get().Error("parsing installed packs failed");