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

 					break;
+				}
+			}
+		}
+	}
+	readAvailablePackages();
 	// check the purged time
 	this->PurgeGameObjects();
 	m_bLoaded = true;
 			Utils::String model = data.token(";", i);
 			Utils::String modelExt = model.right(4);
 			// check file extension
 			if ( modelExt.Compare(".bod") || modelExt.Compare(".pbd") )
 				data = data.replaceToken(";", i, model.left(-4));
 		}
 		xsp->SetShipData(data);
+	}
 	// any extra files that are in director folder
 				else
+				{
 					for ( CListNode<C_File> *node = oldPackage->GetFileList()->Front(); node; node = node->next() )
+					{
 						if ( !node->Data() )
 							continue;
 						if ( node->Data()->GetFileType() != FILETYPE_MOD )
 							continue;
 						// we only need the cat file
 						if ( !node->Data()->CheckFileExt("cat") )
 							continue;
+						{
 							Utils::String oldFilePointer = match->filePointer();
 							match->setDir("");
 							match->changeBaseName(next);
 							if ( CFileIO(oldFilePointer).Rename(m_sCurrentDir + "/" + match->getNameDirectory(package)) )
 								match->setFilename(m_sCurrentDir + "/" + match->getNameDirectory(package));
 						}
+					}
 					else
+					{
 						C_File *match = package->FindMatchingMod(f->Data());
 							if ( CFileIO(match->filePointer()).Rename(m_sCurrentDir + "/" + match->getNameDirectory(package)) )
 								match->setFilename(m_sCurrentDir + "/" + match->getNameDirectory(package));
+						}
+					}
+				}
 			}
 			package->GetFileList()->RemoveEmpty();
 			((CSpkFile *)oldPackage)->MergePackage(package);
 			delete package;
 			package = oldPackage;
+			{
 				if ( !Dir.create("PluginManager") )
 					ready = false;
+			}
 			if ( ready && !Dir.exists("PluginManager/Icons") )
 			{
 				if ( !Dir.create("PluginManager/Icons") )
 					ready = false;
+			}
 			if ( ready )
 					CFileIO iconFile(m_sCurrentDir + "/PluginManager/Icons/" + package->author() + "_" + package->name() + "." + package->iconExt());
 					if ( iconFile.WriteData((const char *)icon->GetData(), icon->GetDataSize()) )
+					{
 						icon->SetFilename(CyString(package->author()) + "_" + package->name() + "." + package->iconExt());
 						icon->SetFullDir(m_sCurrentDir + "/PluginManager/Icons");
 					}
 					else
 						package->SetIcon(NULL, "");
+				}
+			}
 									added = true;
 									break;
+								}
+							}
 							if(!added)
 								foundPackages->push_front(itr->Data());
 						}
 						found = true;
 						break;
+					}
+				}
 				if (!found)
 					return false;
+			}
 int CPackages::RemoveUnusedSharedFiles(CyStringList *errors, CProgressInfo *progress)
+{
 	UpdateUsedFiles();
 	int files = 0;
 	int done = 0;
 	for ( CListNode<C_File> *node = m_lFiles.Back(); node; node = node->prev() )
+	{
 		if ( progress )
 			progress->UpdateProgress(files, m_lFiles.size());
 		files++;
 		C_File *file = node->Data();
 		// only do marked shared files
 		if ( !file->IsShared() )
 			continue;
 		// only do ones that are no longer needed
 		if ( file->getUsed() )
 			continue;
 		if ( RemoveSharedFile(file, errors) )
 			++done;
 		node->ChangeData(NULL);
+	}
 	m_lFiles.RemoveEmpty();
 	return done;
+}
 /**
  * Any Unused Shared
  *
  * Checks if theres any unused shared files available
+ *
  * Any file thats marked as shared, and is no longer connected to any installed package
  */
 bool CPackages::AnyUnusedShared()
+{
 			continue;
 		// we need to rename it
 		int current = findNextTextFile();
 		if ( current < f->GetTextFileID() )
 		{
 			CFileIO moveFile(f->filePointer());
 			Utils::String newName = SPK::FormatTextName(current, m_iLanguage, (m_iGameFlags & EXEFLAG_TCTEXT)) + "." + moveFile.extension();
 			if ( moveFile.Rename(m_sCurrentDir + "/t/" + newName) )
+			{
 	// lets make sure our order is correct
 	// find Lowest Fake Patch Installed
 	CLinkList<C_File> doneList;
 	int lowest = FindLowestFakePatchInstalled();
 	if ( check < lowest ) lowest = check; // gap at the beginning, lets use that
 	// find all packages that need to go before or after other packages
 	std::set<CBaseFile*> packagesBefore;
 	std::map<CBaseFile*, std::set<CBaseFile*>> packagesAfter;
 	for (CListNode<CBaseFile>* pNode = m_lPackages.Front(); pNode; pNode = pNode->next())
+	{
 		// search for any fake patches in package
 		if (!p->IsEnabled()) continue;
 		if (!p->AnyFileType(FILETYPE_MOD)) continue;
 		if (p->AnyDependacies())
 		{
 			for (SNeededLibrary* nl = p->GetNeededLibraries()->First(); nl; nl = p->GetNeededLibraries()->Next())
 			{
 				auto package = FindPackage(nl->sName, nl->sAuthor);
 				if (package)
 				{
 					packagesBefore.insert(package);
 					packagesAfter[p].insert(package);
 				}
 			}
 		}
 		CSpkFile* spk = dynamic_cast<CSpkFile*>(p);
 		if (spk)
 		{
 			if (spk->IsAnotherMod())
 			{
 				auto package = FindPackage(spk->otherName(), spk->otherAuthor());
 				if (package)
+				{
 					packagesBefore.insert(package);
 					packagesAfter[p].insert(package);
+	{
 		CFileIO File(Dir.file("lang.dat"));
 		size_t size;
 		char *data = File.ReadToData(&size);
 		if ( data )
+		{
 			Utils::String str(data);
 			m_iLanguage = str.token("\n", 1).token(" ", 1).toInt();
+		}
 					useId = 49;
 				// if we have not found a valid language yet, we will use this one
 				else if ( !useId )
 					useId = num;
+			}
 		}
 		if (found)
+		{
 			CLEANSPLIT(data, size);
 			continue;
+		}
 		if ( !useId )
 			useId = data[0].toInt();
 		if ( !useId )
 			useId = -1;
 		CLEANSPLIT(data, size);
 		RenameTextFile((*itr)->str, useId, errors);
+	}
+}
 /**
  * Rename a text file
+ *
  * Creates a new text file for the selected langage by copying an existing one
  */
 	if ( !addFile )
 		addFile = FindFile(FILETYPE_TEXT, newFilename + ".pck");
 	// we have found the file, lets just add it to our scripts
 	if ( addFile )
 	{
 		AddTextFileToScripts(addFile, textid);
 		return true;
+	}
 	// first we need to find our text file
 	return 0;
+}
 size_t CPackages::addFoundPackages(const Utils::String& dir)
 {
 	return findPackageDirectories(m_lFoundPackages, dir);
+}
 int CPackages::findAllPackages(CLinkList<CBaseFile> &packages, const Utils::String &dir)
+{
+		{
 			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 (!done)
 					f->DeleteData();
+			}
 			packages.push_back(p);
 			++count;
 		}
 	}
 	return count;
+}
 Utils::String CPackages::ConvertLanguage(int lang)
 	// check if file exists and remove it
 	if ( File.exists() )
+	{
 		// if we cant remove it, we dont have enough rights
 		if ( !File.remove() )
 			return false;
 		// if its still there, we dont have enough rights
 		if ( File.exists() )
 			return false;
+	}
 		CCatFile cat;
 		if ( cat.open(file.ToString(), this->getAddonDir(), CATREAD_CATDECRYPT, false) != CATERR_NONE )
 			return false;
 		if ( !cat.ExtractFile("types\\TShips.pck", m_sTempDir + "/tships.txt") )
 			return false;
 		File.open(m_sTempDir + "/tships.txt");
 		deleteFile = true;
+	}
 	// otherwise its a normal file
 	else if ( CFileIO(file).isFileExtension("pck") )
+	{
 		C_File f(file.ToString());
 		f.SetFilename(m_sTempDir + "/tships.txt");
 		if ( !f.writeFilePointer() )
 			return false;
 		File.open(m_sTempDir + "/tships.txt");
 		deleteFile = true;
 	}
 	else
 		File.open(file.ToString());
 	if ( !File.exists() )
 		return false;
 	bool ret = false;
 	CyStringList *lines = File.ReadLinesStr();
+{
 	// not a valid file
 	if ( !file ) return false;
 	if ( file->GetFileType() != FILETYPE_MOD ) return false;
 	if ( !file->GetFileExt().Compare("cat") ) return false;
 	// we need to read the file list for the mod
 	CCatFile cat;
 	if ( cat.open(file->filePointer(), this->getAddonDir(), CATREAD_JUSTCONTENTS, false) == CATERR_NONE )
+	{
 		for (unsigned int i = 0; i < cat.GetNumFiles(); i++ )
 			return true;
 		m_lAvailablePackages.remove(p);
+	}
 	m_lAvailablePackages.push_back(package);
+	saveAvailablePackages();
 	return true;
+}
+void CPackages::saveAvailablePackages()
+{
+	std::vector<Utils::String> lines;
+	lines.push_back("Version;1;" + Utils::String::Number(m_lAvailablePackages.size()));
+	for (auto itr = m_lAvailablePackages.First(); itr; itr = m_lAvailablePackages.Next())
+	{
+		Utils::String l = "Package";
+		l += ";" + itr->sName.findReplace(";", ":&COL&:");
+		l += ";" + itr->sAuthor.findReplace(";", ":&COL&:");
+		l += ";" + itr->sVersion.findReplace(";", ":&COL&:");
+		l += ";" + itr->sFilename;
+		l += ";" + itr->sDesc.findReplace(";", ":&COL&:");
+		l += ";" + itr->sUpdated;
+		l += ";" + Utils::String::Number(itr->lGames.size());
+		for (auto g = itr->lGames.First(); g; g = itr->lGames.Next())
+			l += ";" + Utils::String::Number(g->iGame) + ";" + Utils::String::Number(g->iVersion) + ";" + g->sVersion;
+		l += ";" + Utils::String::Number(itr->iType);
+		l += ";" + Utils::String::Number(itr->iPluginType);
+		l += ";" + Utils::String::Number(itr->iScriptType);
+		l += ";" + Utils::String::Number(itr->iChanging);
+		l += ";" + Utils::String::Number(itr->iEase);
+		l += ";" + Utils::String::Number(itr->iRec);
+		l += itr->bSigned ? ";1" : ";0";
+		lines.push_back(l);
+	}
+	// write out the file
+	CDirIO dir(m_sCurrentDir + "/PluginManager");
+	if (!dir.exists())
+		dir.create();
+	CFileIO file(dir.file("packagecache.new"));
+	if (file.writeFile(&lines))
+	{
+		if (CFileIO::Exists(dir.file("packagecache.new")))
+		{
+			if (CFileIO::Exists(dir.file("packagecache.dat")))
+				CFileIO::Remove(dir.file("packagecache.dat"));
+			file.Rename(dir.file("packagecache.dat"));
+		}
+	}
+}
+void CPackages::readAvailablePackages()
+{
+	m_lAvailablePackages.MemoryClear();
+	CDirIO dir(m_sCurrentDir + "/PluginManager");
+	CFileIO file(dir.file("packagecache.dat"));
+	if (file.exists())
+	{
+		size_t version = 0;
+		size_t count = 0;
+		std::vector<Utils::String> lines;
+		if (file.readLines(lines))
+		{
+			for (auto itr = lines.begin(); itr != lines.end(); itr++)
+			{
+				Utils::String cmd = itr->token(";", 1);
+				if (cmd == "Version")
+				{
+					version = itr->token(";", 2).toInt();
+					count = itr->token(";", 3).toInt();
+				}
+				else if (cmd == "Package")
+				{
+					int max = 0;
+					Utils::String *str = itr->tokenise(";", &max);
+					SAvailablePackage* package = new SAvailablePackage;
+					int pos = 1;
+					package->sName = str[pos++].findReplace(":&COL&:", ";");
+					package->sAuthor = str[pos++].findReplace(":&COL&:", ";");
+					package->sVersion = str[pos++].findReplace(":&COL&:", ";");
+					package->sFilename = str[pos++].findReplace(":&COL&:", ";");
+					package->sDesc = str[pos++].findReplace(":&COL&:", ";");
+					package->sUpdated = str[pos++].findReplace(":&COL&:", ";");
+					size_t games = str[pos++].toInt();
+					for (size_t i = 0; i < games; i++)
+					{
+						SGameCompat* g = new SGameCompat;
+						g->iGame = str[pos++].toInt();
+						g->iVersion = str[pos++].toInt();
+						g->sVersion = str[pos++];
+						package->lGames.push_back(g);
+					}
+					package->iType = str[pos++].toInt();
+					package->iPluginType = str[pos++].toInt();
+					package->iScriptType = str[pos++].toInt();
+					package->iChanging = str[pos++].toInt();
+					package->iEase = str[pos++].toInt();
+					package->iRec = str[pos++].toInt();
+					package->bSigned = (str[pos] == "1");
+					CLEANSPLIT(str, max);
+					addAvailablePackage(package);
+				}
+			}
+		}
+	}
+}
 bool CPackages::AnyAvailablePackages(int type)
+{
 	if ( type == -1 ) return !m_lAvailablePackages.empty();

Subversion Repositories spk

(root)//libspk/src/Packages.cpp – Rev 164 → 166