WebSVN – spk – Diff – //libspk/src/Packages.cpp

 	CyString		sSection;
 	CLinkList<SComponantEntry2>	lEntries;
 } SComponantEntry;
 Utils::String CPackages::m_sTempDir;
+//////////////////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////////////////
 CPackages::CPackages() : m_pCurrentGameExe(NULL),
 	_pOriginalFiles(NULL),
 	_pCurrentDir(NULL)
+{
 				if ( spk->IsAnotherMod() )
+				{
 					for ( CListNode<CBaseFile> *node = m_lInstallList.Front(); node; node = node->next() )
+					{
 						CBaseFile *p = node->Data();
-						if ( spk->GetOtherName().Compare(p->name()) && spk->GetOtherAuthor().Compare(p->author()) )
+						if ( spk->otherName().Compare(p->name()) && spk->otherAuthor().Compare(p->author()) )
+						{
 							m_lInstallList.insert(m_lInstallList.FindPos(p) + 2, package);
 							added = true;
 							break;
+						}
+				{
 					if ( node->Data()->GetType() != TYPE_SPK )
 						continue;
 					CSpkFile *spk = (CSpkFile *)node->Data();
-					if ( !spk->IsAnotherMod() )
+					if ( !spk->isAnotherMod() )
 						continue;
-					if ( spk->GetOtherName().Compare(package->name()) && spk->GetOtherAuthor().Compare(package->author()) )
+					if ( spk->otherName().Compare(package->name()) && spk->otherAuthor().Compare(package->author()) )
+					{
 						added = true;
 						m_lInstallList.insert(node->Data(), package);
 						break;
+					}
 int CPackages::GetAllPackageFiles(CLinkList<CBaseFile> *list, CLinkList<C_File> *fileList, bool includeChild)
+{
 	for ( CListNode<CBaseFile> *node = list->Front(); node; node = node->next() )
 		this->GetAllPackageFiles(node->Data(), fileList, includeChild);
 	return fileList->size();
 }
 /**
  * Add Log
+ *
  * Adds a log entry to displayed at end
  */
 			CBaseFile *p = node->Data();
 			if ( p->IsFileAdded(f) )
+			{
 				checkPackage = p;
 				break;
 			}
+		}
 		// update the progress count for the current file
 		if ( progress )
+		{
+ *
  * This searching all installed packages for a SPK Package matching the name and author
  */
 CBaseFile *CPackages::FindSpkPackage(CyString name, CyString author)
+{
+	return findSpkPackage(name.ToString(), author.ToString());
+}
+CBaseFile *CPackages::findSpkPackage(const Utils::String &name, const Utils::String &author) const
+{
 	// interate through all packages
 	for ( CListNode<CBaseFile> *node = m_lPackages.Front(); node; node = node->next() )
 	{
 		CBaseFile *file = node->Data();
 		// only look for spk packages
 		if ( file->GetType() != TYPE_SPK )
 			continue;
 		// now compare the name and author, "Compare" is a non case senseative check, opposed to ==.
-		if ( file->name().Compare(name.ToString()) &amp;& file->author().Compare(author.ToString()) )
+		if ( file->name().Compare(name) &amp;& file->author().Compare(author) )
 			return file;
 	}
 	// nothing found
 	return 0;
+}
 CBaseFile *CPackages::FindPackage(CyString name, CyString author)
 {
 	// interate through all packages
 	for ( CListNode<CBaseFile> *node = m_lPackages.Front(); node; node = node->next() )
+	{
 		CBaseFile *file = node->Data();
 		// now compare the name and author, "Compare" is a non case senseative check, opposed to ==.
 		if ( file->name().Compare(name.ToString()) && file->author().Compare(author.ToString()) )
 			return file;
+	}
 	// nothing found
 	return 0;
+}
 		CBaseFile *file = node->Data();
 		// only look for spk packages
 		if ( file->GetType() != TYPE_XSP )
 			continue;
 		// now compare the id, "Compare" is a non case senseative check, opposed to ==.
 		if ( ((CXspFile *)file)->GetShipID().Compare(id.ToString()) )
 			return file;
+	}
 	// nothing found
 	return 0;
 }
 /**
  * Update the used files count
+ *
  * counts how many packages are currently using the file
  */
 	return true;
+}
 bool CPackages::CheckInstalledDependacy(CyString name, CyString author, CyString version, bool onlyEnabled, bool includePrepared)
+{
+	bool ret = checkInstalledDependacy(name.ToString(), author.ToString(), version.ToString(), onlyEnabled, includePrepared);
+	m_lInstallList.RemoveEmpty();
+	return ret;
+}
+bool CPackages::checkInstalledDependacy(const Utils::String &name, const Utils::String &author, const Utils::String &version, bool onlyEnabled, bool includePrepared) const
+{
-	CBaseFile *p = this->FindSpkPackage(name, author);
+	CBaseFile *p = this->findSpkPackage(name, author);
 	if ( p )
+	{
 		// now check version
-		if ( version.CompareVersion(p->version()) == COMPARE_OLDER )
+		if (version.compareVersion(p->version()) == COMPARE_OLDER)
 			return false;
 		if ( onlyEnabled && !p->IsEnabled() )
 			return false;
 		return true;
+	}
 	// now check the prepared list
 	if ( includePrepared )
 	{
 		for ( CListNode<CBaseFile> *node = m_lInstallList.Front(); node; node = node->next() )
+		{
 			p = node->Data();
 			if ( !p )
 				continue;
-			if ( p->name().Compare(name.ToString()) &amp;& p->author().Compare(author.ToString()) )
+			if ( p->name().Compare(name) &amp;& p->author().Compare(author) )
 			{
-				if ( version.CompareVersion(p->version()) == COMPARE_OLDER )
+				if (version.compareVersion(p->version()) == COMPARE_OLDER)
 					continue;
 				if ( onlyEnabled && !p->IsEnabled() )
 					continue;
 				return true;
+			}
+		}
+	}
+	return false;
+}
+bool CPackages::findAllNeededDependacies(CBaseFile *p, const CLinkList<CBaseFile> &packages, CLinkList<CBaseFile> *foundPackages, bool onlyEnabled, bool includePrepared) const
+{
+	CLinkList<SNeededLibrary> *neededList = p->GetNeededLibraries();
+	if (neededList)
+	{
+		for (CListNode<SNeededLibrary> *node = neededList->Front(); node; node = node->next())
+		{
+			SNeededLibrary *nl = node->Data();
+			if (!checkInstalledDependacy((nl->sName.Compare("<package>")) ? p->name() : nl->sName, (nl->sAuthor.Compare("<author>")) ? p->author() : nl->sAuthor, nl->sMinVersion, (nl->sName.Compare("<package>")) ? false : onlyEnabled, (nl->sName.Compare("<package>")) ? false : includePrepared))
+			{
+				bool found = true;
+				for (auto itr = packages.Front(); itr; itr = itr->next())
+				{
+					if (itr->Data()->name().Compare(nl->sName) && itr->Data()->author().Compare(nl->sAuthor))
+					{
+						if (!findAllNeededDependacies(itr->Data(), packages, foundPackages, onlyEnabled, includePrepared))
+							return false;
+						if (foundPackages)
+						{
+							bool added = false;
+							for (auto itr2 = foundPackages->Front(); itr2; itr2 = itr2->next())
+							{
+								if (itr->Data() == itr2->Data() || (itr->Data()->name().Compare(itr2->Data()->name()) && itr->Data()->author().Compare(itr2->Data()->author())))
+								{
+									added = true;
+									break;
+								}
+							}
+							if(!added)
+								foundPackages->push_front(itr->Data());
+						}
+						found = true;
+						break;
+					}
+				}
+				if (!found)
+					return false;
+			}
+		}
+	}
+	if (p->GetType() == TYPE_SPK)
+	{
+		CSpkFile *spk = (CSpkFile *)p;
+		if (spk->isAnotherMod())
+		{
+			bool found = true;
+			if (!this->findSpkPackage(spk->otherName(), spk->otherAuthor()))
+			{
+				if (includePrepared)
+				{
+					found = false;
+					for (CListNode<CBaseFile> *pNode = m_lInstallList.Front(); pNode; pNode = pNode->next())
+					{
+						CBaseFile *checkP = pNode->Data();
+						if (p->author().Compare(checkP->author()) && p->name().Compare(checkP->name()))
+						{
+							found = true;
+							break;
+						}
+					}
+				}
+				else
+					found = false;
+			}
+			if (!found)
+			{
+				for (auto itr = packages.Front(); itr; itr = itr->next())
+				{
+					if (itr->Data()->name().Compare(spk->otherName()) && itr->Data()->author().Compare(spk->otherAuthor()))
+					{
+						if (!findAllNeededDependacies(itr->Data(), packages, foundPackages, onlyEnabled, includePrepared))
+							return false;
+						if(foundPackages)
+						{
+							bool added = false;
+							for (auto itr2 = foundPackages->Front(); itr2; itr2 = itr2->next())
+							{
+								if (itr->Data() == itr2->Data() || (itr->Data()->name().Compare(itr2->Data()->name()) && itr->Data()->author().Compare(itr2->Data()->author())))
+								{
+									added = true;
+									break;
+								}
+							}
+							if (!added)
+								foundPackages->push_front(itr->Data());
+						}
+						found = true;
+						break;
+					}
+				}
+				if(!found)
+					return false;
 			}
+		}
-		m_lInstallList.RemoveEmpty();
+	}
-	return false;
+	return true;
-}
+}
-int CPackages::GetMissingDependacies(CBaseFile *p, CyStringList *list, bool onlyEnabled, bool includePrepared)
+int CPackages::GetMissingDependacies(CBaseFile *p, Utils::CStringList *list, bool onlyEnabled, bool includePrepared)
+{
 	int count = 0;
 	CLinkList<SNeededLibrary> *neededList = p->GetNeededLibraries();
 	if ( neededList )
+	{
+		{
 			SNeededLibrary *nl = node->Data();
 			if ( !CheckInstalledDependacy((nl->sName.Compare("<package>")) ? p->name() : nl->sName, (nl->sAuthor.Compare("<author>")) ? p->author() : nl->sAuthor, nl->sMinVersion, (nl->sName.Compare("<package>")) ? false : onlyEnabled, (nl->sName.Compare("<package>")) ? false : includePrepared) )
+			{
 				if ( list )
-					list->PushBack(((nl->sName.Compare("<package>")) ? CyString(p->name()) : nl->sName) + "|" + nl->sMinVersion, (nl->sAuthor.Compare("<author>;")) ? CyString(p->author()) : nl->sAuthor);
+					list->pushBack(((nl->sName.Compare("<package>")) ? p->name() : nl->sName) + "|" + nl->sMinVersion, (nl->sAuthor.Compare("<author>;")) ? p->author() : nl->sAuthor);
 				++count;
+			}
+		}
+	}
 	if ( p->GetType() == TYPE_SPK )
+	{
 		CSpkFile *spk = (CSpkFile *)p;
 		if ( spk->IsAnotherMod() )
 		{
 			bool found = true;
 			if ( !this->FindSpkPackage(spk->GetOtherName(), spk->GetOtherAuthor()) )
+			{
 				if ( includePrepared )
+				{
+			}
 			if ( !found )
+			{
 				if ( list )
-					list->PushBack(CyString(spk->GetOtherName()), CyString(spk->GetOtherAuthor()));
+					list->pushBack(spk->GetOtherName(), spk->GetOtherAuthor());
 				++count;
 			}
 		}
 	}
 	return count;
+}
 int CPackages::CheckPreparedInstallRequired(CLinkList<CBaseFile> *list)
+{
 	// loop through all packages
 				list->push_back(p);
+			}
 			else
 				node->DeleteData();
 			++count;
 		}
 	}
 	m_lInstallList.RemoveEmpty();
 	return count;
+}
 			C_File *checkFile = fNode->Data();
 			if ( checkFile->GetFileType() != FILETYPE_SCRIPT )
 				continue;
 			if ( checkFile->GetFilename().Compare(file->GetFilename()) )
 			{
 				found = true;
 				break;
+			}
+		}
 		// not found a matching file, we can safetly remove it
 		if ( !found )
 					for ( CListNode<SComponantEntry2> *cNode = found->lEntries.Front(); cNode; cNode = cNode->next() )
+					{
 						if ( cNode->Data()->sSection.Compare(CyString(dummy->sSection2)) )
+						{
 							found2 = cNode->Data();
 							break;
 						}
+					}
 					if ( !found2 )
+					{
 						found2 = new SComponantEntry2;
 		CFileIO WriteFile(m_sTempDir + "/Components.txt");
 		if ( WriteFile.WriteFile(&lines) )
+		{
 			this->PackFile(&WriteFile, "types\\Components.pck");
 			WriteFile.remove();
 		}
 	}
 }
 bool CPackages::readWares(int iLang, CLinkList<SWareEntry> &list)
+{
 	if ( iLang == 0 ) iLang = m_iLanguage;
 	Utils::String empWares = this->empWaresForGame();
 	for(CListNode<CBaseFile> *node = m_lPackages.Front(); node; node = node->next()) {
 		if ( !node->Data()->IsEnabled() ) continue;
 		node->Data()->readWares(iLang, list, empWares);
 	}
 	return true;
 }
 bool CPackages::readCommands(int iLang, CLinkList<SCommandSlot> &list)
+{
 	if ( iLang == 0 ) iLang = m_iLanguage;
 	for(CListNode<CBaseFile> *node = m_lPackages.Front(); node; node = node->next()) {
 		if ( !node->Data()->IsEnabled() ) continue;
 		node->Data()->readCommands(iLang, list);
+	}
 	return true;
+}
 bool CPackages::readWingCommands(int iLang, CLinkList<SCommandSlot> &list)
 {
 	if ( iLang == 0 ) iLang = m_iLanguage;
 	for(CListNode<CBaseFile> *node = m_lPackages.Front(); node; node = node->next()) {
 		if ( !node->Data()->IsEnabled() ) continue;
 		node->Data()->readWingCommands(iLang, list);
 		if ( node->Data()->type == type && node->Data()->bNotority ) {
 			if ( node->Data()->type == Ware_Custom && !id.Compare(node->Data()->id) ) continue;
 			else if ( node->Data()->type != Ware_Custom && node->Data()->pos != pos ) continue;
 			(*noto) = node->Data()->notority;
 			return true;
+		}
+	}
 	return false;
+}
 						if ( !added )
 							tshipsList.PushBack(line);
 						--count;
 						if ( count < 0 )
 							break;
 					}
+				}
 				delete lines;
 			}
 			File.remove();
 			// assign the ship buffer
 			if ( !m_iShipBuffer )
 				m_iShipBuffer = tshipsList.Count() + 15;
 			// there seems to be too many additional entries, we have no choise but to change the buffer
 			else if ( m_iShipBuffer <= tshipsList.Count() )
 				m_iShipBuffer = tshipsList.Count() + 15;
 			CyString bufferStart;
 			if ( m_iGame == GAME_X3 )
 				bufferStart = "0;0;0;0;0;2;499999;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0.049988;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;4;1;0;0;0;0;0;0;2092;1;1;-1;0;0;1;1;0;1;1;1;0;0;0;;-1;0;0;0;0;0;0;0;0;0;";
 			else
 				bufferStart = "0;0;0;0;0;SG_SH_M5;499999;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0.049988;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;4;1;0;0;0;0;0;0;OBJ_BEACON;1;1;-1;0;0;1;1;0;1;1;1;0;0;0;;-1;0;0;0;0;0;0;0;0;0;";
 			if ( WriteFile.WriteFile(&tshipsList) )
+			{
 				this->PackFile(&WriteFile, "types/TShips.pck");
 				WriteFile.remove();
+			}
 		}
 	}
 }
 bool CPackages::PackFile(CyString filename)
+{
 	// compress the file
 	CFileIO File(filename);
 	if ( fileData && fileSize)
+	{
 		size_t newFileSize;
 		unsigned char *pckData = PCKData((unsigned char *)fileData, fileSize, &newFileSize, true);
 		if ( pckData )
 		{
 			CyString ext = "pck";
 			if ( File.CheckFileExtension("bob") )
 				ext = "pbb";
 			else if ( File.CheckFileExtension("bod") )
 				ext = "pbd";
 			return true;
+		}
+	}
 	return false;
 }
 bool CPackages::UnPackFile(CyString filename, bool checkxml)
+{
 	// compress the file
 	CFileIO File(filename);
+	{
 		size_t newFileSize;
 		unsigned char *pckData = UnPCKData((unsigned char *)fileData, fileSize, &newFileSize, false);
 		if ( !pckData )
 			pckData = UnPCKData((unsigned char *)fileData, fileSize, &newFileSize, true);
 		if ( pckData )
+		{
 			CyString ext = "txt";
 			if ( File.CheckFileExtension("pbb") )
 				ext = "bob";
 				CDirIO(pckFile.dir()).Create();
 			pckFile.WriteData((char *)pckData, newFileSize);
 			// check for xml and rename
 			if ( checkxml )
 			{
 				int readmaxlines = 20;
 				bool isxml = false;
 				do {
 					CyString line = pckFile.readEndOfLine();
 					if ( line.IsIn("<language id=") )
 bool CPackages::generatePackagerScript(CBaseFile *baseFile, bool wildcard, Utils::CStringList *list, int game, bool datafile) const
+{
 	if (!baseFile)
 		return false;
 	Utils::CStringList gameAddons;
 	for (unsigned int i = 0; i < m_gameExe.gameCount(); ++i)
+	{
 		SGameExe *exe = m_gameExe.GetGame(i);
 		if (!exe->sAddon.empty())
 					if ( rest.contains(strVar->str) )
 						rest = rest.findReplace(strVar->str, strVar->data);
+				}
 				if ( variables )
 				{
 					for (Utils::SStringList *strVar = variables->first(); strVar; strVar = variables->next())
+					{
 						if ( rest.contains(strVar->str) )
 							rest = rest.findReplace(strVar->str, strVar->data);
+					}
 			// mydocuments
 			if ( rest.isin("$MYDOCUMENTS") )
+			{
 				if ( !m_sMyDoc.empty() )
 					rest = rest.findReplace("$MYDOCUMENTS", m_sMyDoc);
 			}
 			// current path
 			if ( rest.isin("$PATH") )
+			{
 				Utils::String currentDir = CFileIO(filename).dir();
 				if ( !currentDir.empty() )
+			{
 				C_File *f = node->Data();
 				if (f->game() && f->game() != GAME_ALLNEW && !(f->game() & (1 << game)))
 					continue;
 				package->extractFile(f, itr->second, game, gameAddons);
 			}
 		}
+	}
 	if (package->autoExporter())
+	{
 		for (auto itr = package->autoExporter()->begin(); itr != package->autoExporter()->end(); itr++)
+}
 CyString CPackages::GetLanguageName() const
+{
 	return CPackages::ConvertLanguage(m_iLanguage);
+}
+int CPackages::findAllPackages(CLinkList<CBaseFile> &packages, const Utils::String &dir)
+{
+	int count = 0;
+	if (!dir.empty())
+	{
+		count += findPackageDirectories(packages, dir + "/Addons");
+		count += findPackageDirectories(packages, dir + "/Downloads");
+	}
+	count += findPackageDirectories(packages, "./Addons");
+	count += findPackageDirectories(packages, "./Downloads");
+	if (_pCurrentDir)
+	{
+		count += findPackageDirectories(packages, _pCurrentDir->dir + "/Addons");
+		count += findPackageDirectories(packages, _pCurrentDir->dir + "/Downloads");
+		count += findPackageDirectories(packages, _pCurrentDir->dir + "/ExtraContent");
+	}
+	return count;
+}
+int CPackages::findPackageDirectories(CLinkList<CBaseFile> &packages, const Utils::String &dir)
+{
+	CDirIO Dir(dir);
+	int count = 0;
+	Utils::CStringList files;
+	if (Dir.dirList(files))
+	{
+		for (auto itr = files.begin(); itr != files.end(); itr++)
+		{
+			Utils::String d = Dir.file((*itr)->str);
+			if (CDirIO(d).isDir())
+				count += findPackageDirectories(packages, d);
+		}
+	}
+	count += findPackageFiles(packages, dir);
+	return count;
+}
+int CPackages::findPackageFiles(CLinkList<CBaseFile> &packages, const Utils::String &dir)
+{
+	CDirIO Dir(dir);
+	int count = 0;
+	for (int type = 0; type < 2; type++)
+	{
+		Utils::CStringList files;
+		if (type == 0)
+			Dir.dirList(files, Utils::String::Null(), "*.spk");
+		else if(type == 1)
+			Dir.dirList(files, Utils::String::Null(), "*.xsp");
+		else
+			break;
+		for(auto itr = files.begin(); itr != files.end(); itr++)
+		{
+			Utils::String f = Dir.file((*itr)->str);
+			int error = 0;
+			CBaseFile *p = this->OpenPackage(f, &error, 0, SPKREAD_NODATA, READFLAG_NOUNCOMPRESS);
+			if (!p)
+				continue;
+			if (p->IsMod() || this->FindSpkPackage(p->name(), p->author()))
+			{
+				delete p;
+				continue;
+			}
+			// check its for the correct game
+			if (!p->CheckGameCompatability(this->GetGame()))
+			{
+				delete p;
+				continue;
+			}
+			// check if its already on the list
+			bool found = false;
+			for (CBaseFile *checkp = packages.First(); checkp; checkp = packages.Next())
+			{
+				if (p->name().Compare(checkp->name()) && p->author().Compare(checkp->author()))
+				{
+					found = true;
+					break;
+				}
+			}
+			if (found)
+			{
+				delete p;
+				continue;
+			}
+			if (p->GetIcon())
+			{
+				bool addedIcon = false;
+				p->ReadIconFileToMemory();
+				p->GetIcon()->SetFilename(this->tempDirectory().findReplace("\\", "/") + "/" + p->author() + "_" + p->name() + "." + p->GetIconExt().ToString());
+				p->GetIcon()->SetFullDir(this->tempDirectory());
+				if (p->GetIcon()->UncompressData())
+				{
+					if (p->GetIcon()->writeFilePointer())
+						addedIcon = true;
+				}
+				if (!addedIcon)
+					p->SetIcon(NULL, "");
+			}
+			// get an advert to display
+			if (p->GetFirstFile(FILETYPE_ADVERT))
+			{
+				bool done = false;
+				C_File *f = p->GetFirstFile(FILETYPE_ADVERT);
+				if (p->ReadFileToMemory(f))
+				{
+					f->SetFullDir(this->tempDirectory());
+					if (f->UncompressData())
+					{
+						if (f->writeFilePointer())
+							done = true;
+					}
+				}
+				if (!done)
+					f->DeleteData();
+			}
+			packages.push_back(p);
+			++count;
+		}
+	}
+	return count;
+}
 Utils::String CPackages::ConvertLanguage(int lang)
+{
 	switch ( lang )

Subversion Repositories spk

(root)//libspk/src/Packages.cpp – Rev 131 → 133