WebSVN – spk – Diff – /PluginManager/src/Forms/MainGui.cpp

+	{
 		for ( int i = 0; i < this->ListPackages->Items->Count; i++ )
 			this->ListPackages->Items[i]->Selected = false;
 		PackageListSelected(ListPackages, gcnew System::EventArgs());
+	}
+	void MainGui::FindPackages()
+	{
+		if (m_lAvailablePackages)
+			m_lAvailablePackages->MemoryClear();
+		if (!m_lAvailablePackages)
+			m_lAvailablePackages = new CLinkList<CBaseFile>;
+		String ^curDir = System::IO::FileInfo(System::Windows::Forms::Application::ExecutablePath).DirectoryName;
+		m_pPackages->findAllPackages(*m_lAvailablePackages, _S(curDir));
+		// find packages from registry key
+		RegistryKey ^searchKey = Registry::CurrentUser->OpenSubKey("Software\\Egosoft\\SuperBox");
+		if (searchKey)
+		{
+			String ^dir = System::Convert::ToString(searchKey->GetValue("Addons"));
+			if (dir)
+				m_pPackages->findPackageDirectories(*m_lAvailablePackages, _S(dir));
+		}
+		// find packages from DVD
+		cli::array<IO::DriveInfo ^> ^Drives = IO::DriveInfo::GetDrives();
+		if (Drives)
+		{
+			for (int i = 0; i < Drives->Length; i++)
+			{
+				IO::DriveInfo ^info = Drives[i];
+				if (info->DriveType != IO::DriveType::CDRom)
+					continue;
+				if (info->IsReady)
+					m_pPackages->findPackageDirectories(*m_lAvailablePackages, _S(info->RootDirectory + "XPluginManager"));
+			}
+		}
+		int num = 0;
+		for (CBaseFile *p = m_lAvailablePackages->First(); p; p = m_lAvailablePackages->Next())
+		{
+			p->SetNum(num);
+			++num;
+		}
+	}
 	bool MainGui::StartInstalling(bool builtin, bool background, bool archive)
+	{
 		// no packages to install
 		if ( !m_pPackages->GetNumPackagesInQueue() )
 		// lets install them now
 		CLinkList<CBaseFile> lCheckPackages;
 		if ( m_pPackages->CheckPreparedInstallRequired(&lCheckPackages) )
+		{
+			CLinkList<CBaseFile> *installRequired = new CLinkList<CBaseFile>();
 			for ( CListNode<CBaseFile> *pNode = lCheckPackages.Front(); pNode; pNode = pNode->next() )
+			{
 				CBaseFile *package = pNode->Data();
 				CSpkFile *spk = (CSpkFile *)package;
-				CyStringList missingList;
-				if ( m_pPackages-&gt;GetMissingDependacies(package, &missingList) )
+				if (m_pPackages-&gt;findAllNeededDependacies(package, *m_lAvailablePackages, installRequired, false, true))
+				{
+					bool added = false;
+					for (auto itr = installRequired->Front(); itr; itr = itr->next())
+					{
+						if (itr->Data() == package || (itr->Data()->name().Compare(package->name()) && itr->Data()->author().Compare(package->author())))
+						{
+							added = true;
+							break;
+						}
+					}
+					if (!added)
+						installRequired->push_back(package);
+					continue;
+				}
+				Utils::CStringList missingList;
+				if ( m_pPackages->GetMissingDependacies(package, &missingList) )
+				{
-					CyString requires;
+					Utils::String requires;
-					for ( SStringList *strNode = missingList.Head(); strNode; strNode = strNode->next )
+					for (auto itr = missingList.begin(); itr != missingList.end(); itr++)
+					{
+						Utils::String name = (*itr)->str;;
+						Utils::String author = (*itr)->data;
+						Utils::String version;
-						if ( strNode->str.IsIn("|") )
+						if (name.contains("|"))
+						{
+							version = name.token("|", 2);
+							name = name.token("|", 1);
+						}
+						if (!version.empty())
-							requires += strNode->str.GetToken("|", 1, 1) + " V" + strNode->str.GetToken("|", 2, 2) + " by " + strNode-&gt;data;
+							requires += name + " V" + version + &quot; by " + author;
 						else
-							requires += strNode->str + " by &quot; + strNode->data;
+							requires += name + " by &quot; + author;
 						requires += "\n";
+					}
-					this->DisplayMessageBox(false, "Installing", "Missing Package for " + SystemStringFromCyString(package->GetLanguageName(m_pPackages->GetLanguage())) + "\nRequires:\n" + SystemStringFromCyString(requires), MessageBoxButtons::OK, MessageBoxIcon::Exclamation);
+					this->DisplayMessageBox(false, "Installing", "Missing Package for " + SystemStringFromCyString(package->GetLanguageName(m_pPackages->GetLanguage())) + "\nRequires:\n" + _US(requires), MessageBoxButtons::OK, MessageBoxIcon::Exclamation);
+				}
+			}
+			bool restart = false;
+			if (installRequired->size())
+			{
+				bool errored = false;
+				for (auto itr = installRequired->Front(); itr; itr = itr->next())
+				{
+					CBaseFile *package = NULL;
+					int error = 0;
+					if (CFileIO::Exists(itr->Data()->filename()))
+						if (!this->InstallPackage(_US(itr->Data()->filename()), false, builtin, background))
+							errored = true;
+				}
+				if (!errored)
+					restart = true;
+			}
+			delete installRequired;
+			lCheckPackages.MemoryClear();
+			if(restart)
+				return StartInstalling(builtin, background);
+		}
 		// no packages to install
 		if ( !m_pPackages->GetNumPackagesInQueue() )
+		{
 				//m_pPackages->RestoreSaves();
 			m_pPackages->UpdatePackages();
 			m_pPackages->ReadGameLanguage(true);
 			System::String ^mod = PluginManager::ReadRegistryValue(m_pPackages->GetModKey());
 			m_pPackages->SetMod(CyStringFromSystemString(mod));
+			if(m_lAvailablePackages)
+				m_lAvailablePackages->MemoryClear();
+			this->FindPackages();
+		}
 		else
+		{
 			this->DisplayMessageBox(true, "Error", "unable to open new directory", MessageBoxButtons::OK, MessageBoxIcon::Error);
 			this->CloseCurrentDirectory();
 				this->DisplayMessageBox(false, "Enable Error", "Error enabling package\n" + SystemStringFromCyString(p->GetFullPackageName(m_pPackages->GetLanguage())) + "\n\nParent mod is not enabled", MessageBoxButtons::OK, MessageBoxIcon::Warning);
 			else if ( m_pPackages->GetError() == PKERR_MODIFIED )
 				this->DisplayMessageBox(false, "Enable Error", "Error enabling package\n" + SystemStringFromCyString(p->GetFullPackageName(m_pPackages->GetLanguage())) + "\n\nPackage is modified and game is currently set to vanilla\nSwitch to modified mode to enable", MessageBoxButtons::OK, MessageBoxIcon::Warning);
 			else if ( m_pPackages->GetError() == PKERR_MISSINGDEP )
+			{
-				CyStringList depList;
+				Utils::CStringList depList;
 				m_pPackages->GetMissingDependacies(p, &depList, true);
-				CyString sDep;
+				Utils::String sDep;
-				for ( SStringList *strNode = depList.Head(); strNode; strNode = strNode->;next )
+				for(auto itr = depList.begin(); itr != depList.end(); itr++)
+				{
-					if ( strNode->str.IsIn("|") )
+					if ( (*itr)->str.contains("|") )
-						sDep = strNode->str.GetToken("|", 1, 1) + " V" + strNode-&gt;str.GetToken("|", 2, 2) + " by " + strNode->data + "\n";
+						sDep = (*itr)->str.token("|", 1) + " V" + (*itr)->str.token("|", 2) + &quot; by " + (*itr)->data + "\n";
 					else
-						sDep = strNode->str + " by " + strNode->data + "\n";
+						sDep = (*itr)->str + " by " + (*itr)->data + "\n";
+				}
-				this->DisplayMessageBox(false, "Enable Error", "Error enabling package\n" + SystemStringFromCyString(p->GetFullPackageName(m_pPackages->GetLanguage())) + "\n\nMissing Enabled Dependacies:\n" + SystemStringFromCyString(sDep), MessageBoxButtons::OK, MessageBoxIcon::Warning);
+				this->DisplayMessageBox(false, "Enable Error", "Error enabling package\n" + SystemStringFromCyString(p->GetFullPackageName(m_pPackages->GetLanguage())) + "\n\nMissing Enabled Dependacies:\n" + _US(sDep), MessageBoxButtons::OK, MessageBoxIcon::Warning);
+			}
 			else
 				this->DisplayMessageBox(false, "Enable Error", "Error enabling package\n" + SystemStringFromCyString(p->GetFullPackageName(m_pPackages->GetLanguage())) + "\n\nUnknown Error", MessageBoxButtons::OK, MessageBoxIcon::Warning);
 			return false;
+		}
+	}
 	void MainGui::PackageBrowserEvent(System::Object ^Sender, System::EventArgs ^E)
+	{
 		this->Enabled = false;
-		PackageBrowser ^mod = gcnew PackageBrowser(m_pPackages, this->imageList1);
+		PackageBrowser ^mod = gcnew PackageBrowser(m_pPackages, m_lAvailablePackages, this->imageList1);
 		if ( !mod->AnyPackages() )
+		{
 			System::String ^game = _US(m_pPackages->getGameName());
 			this->DisplayMessageBox(false, "No Available Packages", "No available packages found for " + game, MessageBoxButtons::OK, MessageBoxIcon::Exclamation);

Subversion Repositories spk

(root)/PluginManager/src/Forms/MainGui.cpp – Rev 129 → 133