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



	if ( m_pEnabledMod )
	{
		C_File *f;
		for ( f = m_pEnabledMod->GetFirstFile(FILETYPE_MOD); f; f = m_pEnabledMod->GetNextFile(f) )
		{
			if (f->IsFakePatch()) continue;
			if (f->checkFileExt("cat")) break;
		}
 
		if ( f )
			m_pGameVFS.LoadFilesystem(m_sCurrentDir, f->filePointer(), 0);
		else

						newFile->setGame(game);
						newFile->SetOriginalName(origName);
						newFile->SetDisabled(disabled);
						newFile->setFileType((FileType)line.token(":", 1).toLong());
						newFile->SetCreationTime((time_t)line.token(":", 2).toLong());
						newFile->setDir(line.token(":", 3));
						if ( line.token(":", 4).toLong() )
							newFile->SetShared(true);
						newFile->UpdateSigned();
 
						m_lFiles.push_back(newFile);

				else if ( cmd == "uninstall" )
				{
					C_File *uf = new C_File();
					uf->setFileType(FILETYPE_SCRIPT);
					uf->SetCreationTime(rest.token(" ", 1).toLong());
					uf->setFilename(m_sCurrentDir + "/Scripts/" + rest.tokens(" ", 2));
					m_lUninstallFiles.push_back(uf);
				}
				else if ( cmd == "nonremovedfile" )
				{
					if ( !CFileIO::Remove(rest) )

			int count = 0;
			int noncount = 0;
 
			// check for some of the files
			for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() ) {
				if ( node->Data()->fullDir().contains("::") ) {
					if (CFileIO(node->Data()->fullDir().token("::", 1)).filename().Compare("PlugMan_Fake.cat") ) {
						Utils::String filename = node->Data()->filePointer().token("::", 2);
						filename = filename.findReplace("/", "\\");
						if ( openFile.FindData(filename) )
							++count;
						else
							++noncount;

	// any extra files that are in director folder
	if ( package->AnyFileType(FILETYPE_EXTRA) )
	{
		for ( C_File *f = package->GetFirstFile(FILETYPE_EXTRA); f; f = package->GetNextFile(f) )
		{
			if ( !f->dir().Compare("director") )
				continue;
			if (f->checkFileExt("xml") || f->checkFileExt("pck"))
			{
				f->setDir("");
				f->setFileType(FILETYPE_MISSION);
			}
		}

	if ( CCatFile::Opened(cat.open(m_sCurrentDir + "/PluginManager/PlugMan_Fake.cat", this->getAddonDir(), CATREAD_DAT)) ) {
		for ( CListNode<C_File> *f = pPackage->GetFileList()->Front(); f; f = f->next() ) {
			if ( f->Data()->GetFileType() != FILETYPE_SHIPSCENE && f->Data()->GetFileType() != FILETYPE_COCKPITSCENE && f->Data()->GetFileType() != FILETYPE_SHIPMODEL && f->Data()->GetFileType() != FILETYPE_SHIPOTHER ) {
				continue;
			}
			if ( CCatFile::IsAddonDir(f->Data()->getNameDirectory(pPackage)) ) {
				continue;
			}
			// check if its already in the fake patch
			if ( f->Data()->fullDir().contains("::") ) {
				continue;
			}
			Utils::String toFile;
			if ( cat.AppendFile(f->Data()->filePointer(), f->Data()->getNameDirectory(pPackage), true, (m_iGameFlags & EXEFLAG_NOXOR) ? false : true, &toFile) ) {
				CLog::logf(CLog::Log_Install, 2, "Adding file: %s into the fake patch", f->Data()->getNameDirectory(pPackage).c_str());
				CFileIO::Remove(f->Data()->filePointer());
				f->Data()->setFilename(m_sCurrentDir + "/PluginManager/PlugMan_Fake.cat::" + toFile);
			}
		}
	}

			for ( CListNode<C_File> *f = package->GetFileList()->Front(); f; f = f->next() )
			{
				if ( f->Data()->GetFileType() != FILETYPE_MOD )
					continue;
 
				f->Data()->setDir("temp");
				if ( f->Data()->IsFakePatch() ) {
					CLog::logf(CLog::Log_Install, 2, "Moving fake package to temporary location to preper for update, %s", f->Data()->filePointer().c_str());
					f->Data()->setName("Fake_" + f->Data()->name());
				}
			}
		}
	}
 

				if ( !f->Data() )
					continue;
				if ( f->Data()->GetFileType() != FILETYPE_MOD )
					continue;
				// we only need the cat file
				if (!f->Data()->checkFileExt("cat"))
					continue;
 
				// if fake patch, find first fake patch in package
				C_File *findMatching = NULL;
				if ( f->Data()->baseName().left(5).Compare("fake_") )
				{
					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;
						if ( !node->Data()->IsFakePatch() )
							continue;
 
						findMatching = node->Data();

						if ( !node->Data() )
							continue;
						if ( node->Data()->GetFileType() != FILETYPE_MOD )
							continue;
						// we only need the cat file
						if (!node->Data()->checkFileExt("cat"))
							continue;
 
						if ( node->Data()->name().Compare(f->Data()->name()) )
						{
							findMatching = node->Data();
							break;
						}
					}

					}
				}
				// no matching file, then we shall just renaming back
				else
				{
					if ( f->Data()->baseName().left(5).Compare("fake_") )
					{
						shuffle = true;
						C_File *match = package->findMatchingMod(f->Data());
						Utils::String next = Utils::String::PadNumber(this->FindNextFakePatch(), 2);
						
						Utils::String oldFilePointer = f->Data()->filePointer();
						f->Data()->setDir("");
						f->Data()->changeBaseName(next);
						if ( CFileIO(oldFilePointer).Rename(m_sCurrentDir + "/" + f->Data()->getNameDirectory(package)) )
							f->Data()->setFilename(m_sCurrentDir + "/" + f->Data()->getNameDirectory(package));
 

					else
					{
						C_File *match = package->findMatchingMod(f->Data());
 
						f->Data()->setDir("");
						if ( CFileIO(f->Data()->filePointer()).Rename(m_sCurrentDir + "/" + f->Data()->getNameDirectory(package)) )
							f->Data()->setFilename(m_sCurrentDir + "/" + f->Data()->getNameDirectory(package));
						if ( match )
						{
							match->setDir("");
							if ( CFileIO(match->filePointer()).Rename(m_sCurrentDir + "/" + match->getNameDirectory(package)) )

				}
 
				// remove from hard drive
				if ( !dontRemove && RemoveFile(f, errors) )
				{
					CLog::logf(CLog::Log_Install, 1, "Removed unused file: %s", f->filePointer().c_str());
					// if a fake patch, we need to shufle
					if ( f->IsFakePatch() )
						shuffle = true;
					else if ( f->isAutoTextFile() )
						shuffle = true;

	return true;
}
 
bool CPackages::UninstallPreparedPackages(CyStringList *errors, CProgressInfo *progress, CLinkList<CBaseFile> *uninstalledPackages, CLinkList<CBaseFile> *disabledPackages)
{
	Utils::CStringList lErrors;
 
	if ( m_lInstallList.empty() ) return false;
 
	// update the used status, excluding all packages we are about to remove
	UpdateUsedFiles(&m_lInstallList);
 
	Utils::CStringList removeDirs;
	CLinkList<C_File> uninstallFiles;
	CLinkList<C_File> fileList;
	bool readme = false, original = false, shuffle = false;
 
	// find all files that need to be removed

 
		if ( f->GetFileType() == FILETYPE_README )
			readme = true;
		else if ( f->GetFileType() == FILETYPE_UNINSTALL || f->GetFileType() == FILETYPE_MAP || f->GetFileType() == FILETYPE_SOUND || f->GetFileType() == FILETYPE_EXTRA || f->GetFileType() == FILETYPE_SHIPSCENE || f->GetFileType() == FILETYPE_COCKPITSCENE || f->GetFileType() == FILETYPE_SHIPOTHER || f->GetFileType() == FILETYPE_SHIPMODEL || f->GetFileType() == FILETYPE_ADVERT )
		{
			Utils::String dir = f->getDirectory(NULL);
			if(!removeDirs.contains(dir))
				removeDirs.pushBack(dir);
			dir = dir.findReplace("\\", "/");
			if ( dir.contains("/") )
			{
				for ( int i = dir.countToken("/"); i; i-- )
				{
					Utils::String remDir = dir.tokens("/", 1, i);
					if(!removeDirs.contains(remDir))
						removeDirs.pushBack(remDir);
				}
			}
		}
 
		if (f->GetFileType() == FILETYPE_EXTRA && f->dir().left(6).lower() == "extras")
		{
			if (!removeDirs.contains("Extras"))
				removeDirs.pushBack("Extras");
		}
 
		if ( RemoveFile(f, errors) )
 
			original = _pOriginalFiles->restoreFile(f, errors);
 
		else // problem removeing (try when the program closes)
			m_lNonRemovedFiles.pushBack(f->filePointer());
 
		// check for fake patchs
		if ( f->IsFakePatch() )

	m_lInstallList.clear();
 
	// check unistall files
	if ( !uninstallFiles.empty() )
	{
		removeDirs.pushBack("PluginManager/Uninstall");
 
		// make sure the scripts directory is created, even thou it should always be there anyways
		CDirIO scriptDir(m_sCurrentDir);
		if ( !scriptDir.exists("scripts") )
		{

	uninstallFiles.clear();
 
	// remove all directies that we're not using
	if ( readme )
	{
		removeDirs.pushBack("PluginManager/Readme");
		removeDirs.pushBack("Readme");
	}
	if ( original ) {
		removeDirs.pushBack("PluginManager/Original/Replacements");
		removeDirs.pushBack("PluginManager/Original");
	}
	removeDirs.pushBack("PluginManager/Disabled");
	removeUnusedDirectories(removeDirs, &lErrors);
 
	// finally lets shuffle any fake patchs to fill in gaps
	if ( shuffle )
	{
		ShuffleFakePatches(errors);

	{
		// base mode for Reunion
		if ( m_iGame == GAME_X3 && m_pEnabledMod )
		{
			C_File *fDat = m_pEnabledMod->GetFirstFile(FILETYPE_MOD);
			while (fDat && !fDat->IsFakePatch() && !fDat->checkFileExt("dat"))
				fDat = m_pEnabledMod->GetNextFile(fDat);
 
			if ( fDat )
			{
				C_File *fCat = m_pEnabledMod->GetFirstFile(FILETYPE_MOD);
				while ( fCat && !fCat->IsFakePatch() && !fCat->checkFileExt("cat") && !fCat->baseName().Compare(fDat->baseName()) )
					fCat = m_pEnabledMod->GetNextFile(fCat);
 
				if ( fCat )
				{
					CFileIO(fDat->filePointer()).copy(m_sCurrentDir + "/mods/PluginManager.dat");
					CFileIO(fCat->filePointer()).copy(m_sCurrentDir + "/mods/PluginManager.cat");
				}
			}
		}
		else if ( m_iGame == GAME_X3 && !m_sSetMod.empty() && CFileIO::Exists(m_sCurrentDir + "/mods/" + m_sSetMod + ".cat") && CFileIO::Exists(m_sCurrentDir + "/mods/" + m_sSetMod + ".dat"))
		{
			CLog::log(CLog::Log_Directory, 2, "Copying mod file: " + m_sSetMod + ", to PluginManager.cat");
			CFileIO(m_sCurrentDir + "/mods/" + m_sSetMod + ".dat").copy(m_sCurrentDir + "/mods/PluginManager.dat");
			CFileIO(m_sCurrentDir + "/mods/" + m_sSetMod + ".cat").copy(m_sCurrentDir + "/mods/PluginManager.cat");
		}

		{
			if ( !Dir.exists(f->getDirectory(package)) )
			{
				if ( !Dir.create(f->getDirectory(package)) )
				{
					this->AddLogEntry(SPKINSTALL_CREATEDIRECTORY_FAIL, f->getDirectory(package), errors);
					continue;
				}
				this->AddLogEntry(SPKINSTALL_CREATEDIRECTORY, f->getDirectory(package), errors);
			}
		}
 
		// check if theres an original file to backup
		_pOriginalFiles->doBackup(f, errors);

		if ( f->IsDisabled() )
			continue;
 
		// readmes, uninstall and extra files dont need to be disabled
		// Extra files not in the "Extras" directory could be anywhere, so these should be disabled incase they are game changing files, ie in "types"
		if ( f->GetFileType() == FILETYPE_README || f->GetFileType() == FILETYPE_UNINSTALL || (f->GetFileType() == FILETYPE_EXTRA && f->dir().left(5).lower() == "Extra") )
			continue;
 
		// check if there is a matching uninstall file, ie there the script file is also an uninstall script file for a previously uninstalled package that has yet to be removed
		if ( f->GetFileType() == FILETYPE_SCRIPT )
		{

 
			if ( found )
				continue;
		}
 
		if ( f->GetFileType() == FILETYPE_MOD && !f->IsFakePatch() && f->checkFileExt("cat") )
		{
			if ( f->baseName().Compare(m_sSetMod) )
				m_sSetMod = Utils::String::Null();
		}
 

				shuffle = true;
			}
		}
		// otherwise we can just use the standard filename
		else
			newFilename = Utils::String(m_sCurrentDir) + "/PluginManager/Disabled/" + f->getNameDirectory(checkPackage);
 
		// now to move the file by renameing it to its new location
		// !!error checking!!
		// check the file, if it doesn't exist, and exists as disabled, we should just adjust the setting instead of an error
		CFileIO currentFile(f->filePointer());
		if ( !currentFile.exists() )
		{
			if ( !CFileIO(newFilename).exists() )
			{
				this->AddLogEntry(SPKINSTALL_MISSINGFILE, f->getNameDirectory(checkPackage), errors);
				continue;
			}
		}
		// otherwise the file must exists, so lets move it
		else if ( !currentFile.Rename(newFilename) )
		{
			this->AddLogEntry(SPKINSTALL_DISABLEFILE_FAIL, f->getNameDirectory(checkPackage), errors);
			continue;
		}
 
		// must have been fine
		this->AddLogEntry(SPKINSTALL_DISABLEFILE, f->getNameDirectory(checkPackage), errors);
 
		original = _pOriginalFiles->restoreFile(f, errors);
 
		// extra file thats not in the extras directory
		if ( f->GetFileType() == FILETYPE_EXTRA || f->GetFileType() == FILETYPE_MAP || f->GetFileType() == FILETYPE_SOUND )
			removeDirs.PushBack(CyString(f->getDirectory(checkPackage)), NullString, true);
 
		// change the filename
		f->setFilename(newFilename);
 
		// finally mark the file as disabled so we know not to try to move it again
		f->SetDisabled(true);
	}
 

 *
 * Removes a single uninstall file
 */
bool CPackages::RemoveUninstallFile(C_File *file, CyStringList *errors)
{
	CFileIO fio(file->filePointer());
	if ( fio.exists() )
	{
		if ( fio.remove() ) {
			this->AddLogEntry(SPKINSTALL_UNINSTALL_REMOVE, file->getNameDirectory(NULL), errors);
			return true;
		}
		else if ( errors )
			this->AddLogEntry(SPKINSTALL_UNINSTALL_REMOVE_FAIL, file->getNameDirectory(NULL), errors);
	}
 
	return false;
}
 

 *
 * Removes a single file
 */
bool CPackages::RemoveSharedFile(C_File *file, CyStringList *errors)
{
	CFileIO fio(file->filePointer());
	if ( fio.exists() )
	{
		if ( fio.remove() ) {
			this->AddLogEntry(SPKINSTALL_SHARED, file->getNameDirectory(NULL), errors);
			delete file;
			return true;
		}
		else if ( errors )
			this->AddLogEntry(SPKINSTALL_SHARED_FAIL, file->getNameDirectory(NULL), errors);
	}
 
	return false;
}
 

		if ( !f->isAutoTextFile() )
			continue;
 
		// we need to rename it
		int current = findNextTextFile();
		if ( current < f->textFileID() )
		{
			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) )
			{
				this->AddLogEntry(SPKINSTALL_AUTOTEXT, f->name() + "~" + newName, errors);
				f->setName(newName);
			}
			else
				this->AddLogEntry(SPKINSTALL_AUTOTEXT_FAIL, f->name() + "~" + newName, errors);
		}
	}

			while ( true )
			{
				C_File *lowestFile = NULL;
				for ( C_File *file = package->GetFirstFile(FILETYPE_MOD); file; file = package->GetNextFile(file) )
				{
					if (!file->IsFakePatch()) continue;
					if (!file->checkFileExt("cat")) continue; // only do the cat file, we can shuffle the dat file to match later
					if (doneList.FindData(file)) continue; // already done?
 
					if ( !lowestFile )
						lowestFile = file;
					else
					{
						if ( file->baseName().toInt() < lowestFile->baseName().toInt() )
							lowestFile = file;
					}
				}
 
				if ( !lowestFile ) // no more files ?

		// check if the file is a fake patch
		if ( !f->IsFakePatch() )
			continue;
 
		// we only want cat and dat files, all fake patchs should be, but incase theres an error in the package somewhere we can check
		if (!f->checkFileExt("cat"))
			continue;
 
		// now lets check if its greater than our gap
		int check = FindNextFakePatch();
		int patchNum = f->filename().token(".", 1).toInt();

		// now find the matching pairing if it exists
		for ( CListNode<C_File> *node2 = m_lFiles.Front(); node2; node2 = node2->next() )
		{
			C_File *f2 = node2->Data();
 
			if ( f2->IsDisabled() || !f2->IsFakePatch() || f2->checkFileExt(file->fileExt()))
				continue;
 
			// needs to be the same file
			if ( f2->baseName() != file->baseName() )
				continue;
 
			Utils::String newName2 = Utils::String::PadNumber(to, 2) + "." + f2->fileExt();
			CFileIO moveFile(f2->filePointer());
			if ( moveFile.Rename(m_sCurrentDir + "/" + newName2) )

		if ( !p->AnyFileType(FILETYPE_MOD) ) continue;
 
		// now get all fake patches
		for ( C_File *file = p->GetFirstFile(FILETYPE_MOD); file; file = p->GetNextFile(file) )
		{
			if (!file->IsFakePatch()) continue;
			if (file->checkFileExt("dat")) continue;
			int check = file->baseName().toInt();
			if ( check < lowest )
				lowest = check;
		}
	}
 

	CFileIO writeFile(m_sCurrentDir + "/" + addFile->getNameDirectory(NULL));
	if ( writeFile.writeFile(lines) )
	{
		this->addLogEntry(SPKINSTALL_WRITEFILE, addFile->getNameDirectory(NULL), errors);
 
		addFile->setFilename(m_sCurrentDir + "/" + addFile->getNameDirectory(NULL));
		// now we have the file wrriten, we need to add it to all scripts that need it
		// first we add it to the global list
		m_lFiles.push_back(addFile);
 
		// now add it to the scripts

		{
			C_File *tFile = fNode->Data();
			if ( tFile->GetFileType() != FILETYPE_TEXT )
				continue;
 
			Utils::String id = tFile->baseName().token("-", 1);
			if ( id == textid.ToString() )
			{
				found = true;
				break;
			}
		}

 
	Utils::String remFileStr = file->filePointer();
	remFileStr.findReplace(m_sCurrentDir, "");
 
	if ( file->filePointer().contains("::")) {
		CFileIO CatFile(file->filePointer().token("::", 1));
		if ( CatFile.exists() ) {
			CCatFile cat;
			if ( cat.open(CatFile.fullFilename(), this->getAddonDir(), CATREAD_DAT, false) == CATERR_NONE ) {
				Utils::String fileName = file->filePointer().token("::", 2);
				if ( cat.FindData(fileName) ) {
					if ( cat.removeFile(fileName) ) {
						this->AddLogEntry(SPKINSTALL_DELETEFILE, remFileStr, errors);
					}
					else {
						this->AddLogEntry(SPKINSTALL_DELETEFILE_FAIL, remFileStr, errors);
						return false;

 
	if (m_pEnabledMod && m_pEnabledMod->AnyFileType(FILETYPE_MOD))
	{
		for (C_File* file = m_pEnabledMod->GetFirstFile(FILETYPE_MOD); file; file = m_pEnabledMod->GetNextFile(file))
		{
			if (!file->checkFileExt("cat"))
				continue;
 
			CCatFile catFile;
			if (catFile.open(file->filePointer(), addonDir, CATREAD_CATDECRYPT, false) == CATERR_NONE)
			{

			{
				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;
					}

		C_File f(file.ToString());
		if ( !f.ReadFromFile() )
			return false;
		f.UnPCKFile();
 
		f.setFilename(m_sTempDir + "/tships.txt");
		if ( !f.writeFilePointer() )
			return false;
 
		File.open(m_sTempDir + "/tships.txt");
		deleteFile = true;

		C_File f(file.ToString());
		if ( !f.ReadFromFile() )
			return false;
		f.UnPCKFile();
 
		f.setFilename(m_sTempDir + "/textfile.xml");
		if ( !f.writeFilePointer() )
			return false;
 
		File.open(m_sTempDir + "/textfile.xml");
		deleteFile = true;

 *
 * This includes all types and text files
 *
 * Returns true if it finds any files
 */
bool CPackages::getModCompatabilityList(C_File *file, Utils::CStringList *list)
{
	// not a valid file
	if ( !file ) return false;
	if ( file->GetFileType() != FILETYPE_MOD ) return false;
	if ( !file->fileExt().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++ )
		{
			SInCatFile *f = cat.GetFile(i);
			Utils::String filename = f->sFile;
			filename = filename.findReplace("\\", "/");
			bool found = false;
			//TODO: rework this
			if ( filename.left(2).Compare("t/") || filename.left(6).Compare("types/") )
				found = true;
			else if (filename.left(8).Compare("addon/t/") || filename.left(12).Compare("addon/types/"))
				found = true;
			else if (filename.left(9).Compare("addon2/t/") || filename.left(13).Compare("addon2/types/"))
				found = true;
 
			if ( found ) {
				if ( list )
					list->pushBack(filename, Utils::String::Number(f->lSize));
				else
					return true;
			}
		}
	}
 
	if ( list && !list->empty() )
		return true;
 
	return false;
}
 

{
	// not a valid file
	if ( !from || !to ) return false;
	if ( from->GetFileType() != FILETYPE_MOD ) return false;
	if ( to->GetFileType() != FILETYPE_MOD ) return false;
	if (!from->fileExt().Compare("cat")) return false;
	if (!to->fileExt().Compare("cat")) return false;
 
	// get file lists from each file
	Utils::CStringList fromList;
	if (getModCompatabilityList(from, &fromList))
	{
		Utils::CStringList toList;
		if (getModCompatabilityList(to, &toList))
		{
			// both have files we need to check, compare them
			for(auto itr = fromList.begin(); itr != fromList.end(); itr++)
			{
				Utils::String fromFile = (*itr)->str;
				fromFile = fromFile.findReplace("\\", "/");
				fromFile = fromFile.findReplace("//", "/");
				for (auto toItr = toList.begin(); itr != toList.end(); itr++)
				{
					Utils::String toFile = (*toItr)->str;
					toFile = toFile.findReplace("\\", "/");
					toFile = toFile.findReplace("//", "/");
					if ( fromFile.Compare(toFile) )
					{
						if ( list )
							list->PushBack(CyString((from->filename() + "::" + (*itr)->str, to->filename() + "::" + (*itr)->str)).c_str());
						else
							return true;
					}
				}
			}

 
	int count = 0;
	for ( C_File *f = from->GetFirstFile(FILETYPE_MOD); f; f = from->GetNextFile(f) )
	{
		if ( !f->IsFakePatch() ) continue;
		if ( f->fileExt().Compare("dat") ) continue;
 
		for ( C_File *compareFile = to->GetFirstFile(FILETYPE_MOD); compareFile; compareFile = to->GetNextFile(compareFile) )
		{
			if ( compareFile == f ) continue; // same file we're checking against
			if ( !compareFile->IsFakePatch() ) continue;
			if ( compareFile->fileExt().Compare("dat") ) continue;
 
			// now we have to files to compare
			if ( CheckCompatabilityBetweenModFiles(f, compareFile, list) )
				++count;
		}

	for ( CListNode<C_File> *fNode = newFile->GetFileList()->Front(); fNode; fNode = fNode->next() )
	{
		C_File *f = fNode->Data();
		if ( f->GetFileType() != FILETYPE_MOD ) continue;
		if ( !f->IsFakePatch() ) continue;
		if (!f->checkFileExt("cat")) continue;
 
		if (newFile->extractFile(f, m_sTempDir) )
			f->setFullDir(m_sTempDir);
	}
 

	
	for ( CListNode<C_File> *fNode = newFile->GetFileList()->Front(); fNode; fNode = fNode->next() )
	{
		C_File *f = fNode->Data();
		CFileIO::Remove(f->filePointer());
		f->setFullDir("");
	}
 
	return count;
}
 

				C_File *f = NULL;
 
				if ( type == FILETYPE_SCRIPT_UNINSTALL ) {
					f = archive->addFile(CFileIO(fileName).filename(), "", FILETYPE_SCRIPT);
					if ( f ) {
						f->readFromFile(File.fullFilename());
					}
					type = FILETYPE_UNINSTALL;
				}
 
				if ( type == -1 )
					f = archive->addFile(CFileIO(fileName).filename(), CFileIO(fileName).dir(), FILETYPE_EXTRA);
				else
					f = archive->addFile(CFileIO(fileName).filename(), extradir, static_cast<FileType>(type));
				f->readFromFile(File.fullFilename());
			}
 
			File.remove();
		}
	}

Rev 177	Rev 178
Line 207...	Line 207...
207	`if ( m_pEnabledMod )`	207	`if ( m_pEnabledMod )`
208	`{`	208	`{`
209	`C_File *f;`	209	`C_File *f;`
210	`for ( f = m_pEnabledMod->GetFirstFile(FILETYPE_MOD); f; f = m_pEnabledMod->GetNextFile(f) )`	210	`for ( f = m_pEnabledMod->GetFirstFile(FILETYPE_MOD); f; f = m_pEnabledMod->GetNextFile(f) )`
211	`{`	211	`{`
212	`if ( f->IsFakePatch() ) continue;`	212	`if (f->IsFakePatch()) continue;`
213	`if ( f->CheckFileExt("cat") ) break;`	213	`if (f->checkFileExt("cat")) break;`
214	`}`	214	`}`
215		215
216	`if ( f )`	216	`if ( f )`
217	`m_pGameVFS.LoadFilesystem(m_sCurrentDir, f->filePointer(), 0);`	217	`m_pGameVFS.LoadFilesystem(m_sCurrentDir, f->filePointer(), 0);`
218	`else`	218	`else`
Line 352...	Line 352...
352	`newFile->setGame(game);`	352	`newFile->setGame(game);`
353	`newFile->SetOriginalName(origName);`	353	`newFile->SetOriginalName(origName);`
354	`newFile->SetDisabled(disabled);`	354	`newFile->SetDisabled(disabled);`
355	`newFile->setFileType((FileType)line.token(":", 1).toLong());`	355	`newFile->setFileType((FileType)line.token(":", 1).toLong());`
356	`newFile->SetCreationTime((time_t)line.token(":", 2).toLong());`	356	`newFile->SetCreationTime((time_t)line.token(":", 2).toLong());`
357	`newFile->SetDir(line.token(":", 3));`	357	`newFile->setDir(line.token(":", 3));`
358	`if ( line.token(":", 4).toLong() )`	358	`if ( line.token(":", 4).toLong() )`
359	`newFile->SetShared(true);`	359	`newFile->SetShared(true);`
360	`newFile->UpdateSigned();`	360	`newFile->UpdateSigned();`
361		361
362	`m_lFiles.push_back(newFile);`	362	`m_lFiles.push_back(newFile);`
Line 536...	Line 536...
536	`else if ( cmd == "uninstall" )`	536	`else if ( cmd == "uninstall" )`
537	`{`	537	`{`
538	`C_File *uf = new C_File();`	538	`C_File *uf = new C_File();`
539	`uf->setFileType(FILETYPE_SCRIPT);`	539	`uf->setFileType(FILETYPE_SCRIPT);`
540	`uf->SetCreationTime(rest.token(" ", 1).toLong());`	540	`uf->SetCreationTime(rest.token(" ", 1).toLong());`
541	`uf->SetFilename(m_sCurrentDir + "/Scripts/" + rest.tokens(" ", 2));`	541	`uf->setFilename(m_sCurrentDir + "/Scripts/" + rest.tokens(" ", 2));`
542	`m_lUninstallFiles.push_back(uf);`	542	`m_lUninstallFiles.push_back(uf);`
543	`}`	543	`}`
544	`else if ( cmd == "nonremovedfile" )`	544	`else if ( cmd == "nonremovedfile" )`
545	`{`	545	`{`
546	`if ( !CFileIO::Remove(rest) )`	546	`if ( !CFileIO::Remove(rest) )`
Line 904...	Line 904...
904	`int count = 0;`	904	`int count = 0;`
905	`int noncount = 0;`	905	`int noncount = 0;`
906		906
907	`// check for some of the files`	907	`// check for some of the files`
908	`for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() ) {`	908	`for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() ) {`
909	`if ( node->Data()->GetFullDir().IsIn("::") ) {`	909	`if ( node->Data()->fullDir().contains("::") ) {`
910	`if (CFileIO(node->Data()->GetFullDir().GetToken("::", 1, 1)).filename().Compare("PlugMan_Fake.cat") ) {`	910	`if (CFileIO(node->Data()->fullDir().token("::", 1)).filename().Compare("PlugMan_Fake.cat") ) {`
911	`Utils::String filename = node->Data()->GetFilePointer().GetToken("::", 2, 2).ToString();`	911	`Utils::String filename = node->Data()->filePointer().token("::", 2);`
912	`filename = filename.findReplace("/", "\\");`	912	`filename = filename.findReplace("/", "\\");`
913	`if ( openFile.FindData(filename) )`	913	`if ( openFile.FindData(filename) )`
914	`++count;`	914	`++count;`
915	`else`	915	`else`
916	`++noncount;`	916	`++noncount;`
Line 1042...	Line 1042...
1042	`// any extra files that are in director folder`	1042	`// any extra files that are in director folder`
1043	`if ( package->AnyFileType(FILETYPE_EXTRA) )`	1043	`if ( package->AnyFileType(FILETYPE_EXTRA) )`
1044	`{`	1044	`{`
1045	`for ( C_File *f = package->GetFirstFile(FILETYPE_EXTRA); f; f = package->GetNextFile(f) )`	1045	`for ( C_File *f = package->GetFirstFile(FILETYPE_EXTRA); f; f = package->GetNextFile(f) )`
1046	`{`	1046	`{`
1047	`if ( !f->GetDir().Compare("director") )`	1047	`if ( !f->dir().Compare("director") )`
1048	`continue;`	1048	`continue;`
1049	`if ( f->CheckFileExt("xml") \|\| f->CheckFileExt("pck") )`	1049	`if (f->checkFileExt("xml") \|\| f->checkFileExt("pck"))`
1050	`{`	1050	`{`
1051	`f->setDir("");`	1051	`f->setDir("");`
1052	`f->setFileType(FILETYPE_MISSION);`	1052	`f->setFileType(FILETYPE_MISSION);`
1053	`}`	1053	`}`
1054	`}`	1054	`}`
Line 1397...	Line 1397...
1397	`if ( CCatFile::Opened(cat.open(m_sCurrentDir + "/PluginManager/PlugMan_Fake.cat", this->getAddonDir(), CATREAD_DAT)) ) {`	1397	`if ( CCatFile::Opened(cat.open(m_sCurrentDir + "/PluginManager/PlugMan_Fake.cat", this->getAddonDir(), CATREAD_DAT)) ) {`
1398	`for ( CListNode<C_File> *f = pPackage->GetFileList()->Front(); f; f = f->next() ) {`	1398	`for ( CListNode<C_File> *f = pPackage->GetFileList()->Front(); f; f = f->next() ) {`
1399	`if ( f->Data()->GetFileType() != FILETYPE_SHIPSCENE && f->Data()->GetFileType() != FILETYPE_COCKPITSCENE && f->Data()->GetFileType() != FILETYPE_SHIPMODEL && f->Data()->GetFileType() != FILETYPE_SHIPOTHER ) {`	1399	`if ( f->Data()->GetFileType() != FILETYPE_SHIPSCENE && f->Data()->GetFileType() != FILETYPE_COCKPITSCENE && f->Data()->GetFileType() != FILETYPE_SHIPMODEL && f->Data()->GetFileType() != FILETYPE_SHIPOTHER ) {`
1400	`continue;`	1400	`continue;`
1401	`}`	1401	`}`
1402	`if ( CCatFile::IsAddonDir(f->Data()->GetNameDirectory(pPackage).ToString()) ) {`	1402	`if ( CCatFile::IsAddonDir(f->Data()->getNameDirectory(pPackage)) ) {`
1403	`continue;`	1403	`continue;`
1404	`}`	1404	`}`
1405	`// check if its already in the fake patch`	1405	`// check if its already in the fake patch`
1406	`if ( f->Data()->GetFullDir().IsIn("::") ) {`	1406	`if ( f->Data()->fullDir().contains("::") ) {`
1407	`continue;`	1407	`continue;`
1408	`}`	1408	`}`
1409	`Utils::String toFile;`	1409	`Utils::String toFile;`
1410	`if ( cat.AppendFile(f->Data()->filePointer(), f->Data()->GetNameDirectory(pPackage).ToString(), true, (m_iGameFlags & EXEFLAG_NOXOR) ? false : true, &toFile) ) {`	1410	`if ( cat.AppendFile(f->Data()->filePointer(), f->Data()->getNameDirectory(pPackage), true, (m_iGameFlags & EXEFLAG_NOXOR) ? false : true, &toFile) ) {`
1411	`CLog::logf(CLog::Log_Install, 2, "Adding file: %s into the fake patch", f->Data()->GetNameDirectory(pPackage).c_str());`	1411	`CLog::logf(CLog::Log_Install, 2, "Adding file: %s into the fake patch", f->Data()->getNameDirectory(pPackage).c_str());`
1412	`CFileIO::Remove(f->Data()->filePointer());`	1412	`CFileIO::Remove(f->Data()->filePointer());`
1413	`f->Data()->setFilename(m_sCurrentDir + "/PluginManager/PlugMan_Fake.cat::" + toFile);`	1413	`f->Data()->setFilename(m_sCurrentDir + "/PluginManager/PlugMan_Fake.cat::" + toFile);`
1414	`}`	1414	`}`
1415	`}`	1415	`}`
1416	`}`	1416	`}`
Line 1473...	Line 1473...
1473	`for ( CListNode<C_File> *f = package->GetFileList()->Front(); f; f = f->next() )`	1473	`for ( CListNode<C_File> *f = package->GetFileList()->Front(); f; f = f->next() )`
1474	`{`	1474	`{`
1475	`if ( f->Data()->GetFileType() != FILETYPE_MOD )`	1475	`if ( f->Data()->GetFileType() != FILETYPE_MOD )`
1476	`continue;`	1476	`continue;`
1477		1477
1478	`f->Data()->SetDir("temp");`	1478	`f->Data()->setDir("temp");`
1479	`if ( f->Data()->IsFakePatch() ) {`	1479	`if ( f->Data()->IsFakePatch() ) {`
1480	`CLog::logf(CLog::Log_Install, 2, "Moving fake package to temporary location to preper for update, %s", f->Data()->GetFilePointer().c_str());`	1480	`CLog::logf(CLog::Log_Install, 2, "Moving fake package to temporary location to preper for update, %s", f->Data()->filePointer().c_str());`
1481	`f->Data()->SetName(CyString("Fake_") + f->Data()->GetName());`	1481	`f->Data()->setName("Fake_" + f->Data()->name());`
1482	`}`	1482	`}`
1483	`}`	1483	`}`
1484	`}`	1484	`}`
1485	`}`	1485	`}`
1486		1486
Line 1538...	Line 1538...
1538	`if ( !f->Data() )`	1538	`if ( !f->Data() )`
1539	`continue;`	1539	`continue;`
1540	`if ( f->Data()->GetFileType() != FILETYPE_MOD )`	1540	`if ( f->Data()->GetFileType() != FILETYPE_MOD )`
1541	`continue;`	1541	`continue;`
1542	`// we only need the cat file`	1542	`// we only need the cat file`
1543	`if ( !f->Data()->CheckFileExt("cat") )`	1543	`if (!f->Data()->checkFileExt("cat"))`
1544	`continue;`	1544	`continue;`
1545		1545
1546	`// if fake patch, find first fake patch in package`	1546	`// if fake patch, find first fake patch in package`
1547	`C_File *findMatching = NULL;`	1547	`C_File *findMatching = NULL;`
1548	`if ( f->Data()->GetBaseName().Left(5).Compare("fake_") )`	1548	`if ( f->Data()->baseName().left(5).Compare("fake_") )`
1549	`{`	1549	`{`
1550	`for ( CListNode<C_File> *node = oldPackage->GetFileList()->Front(); node; node = node->next() )`	1550	`for ( CListNode<C_File> *node = oldPackage->GetFileList()->Front(); node; node = node->next() )`
1551	`{`	1551	`{`
1552	`if ( !node->Data() )`	1552	`if ( !node->Data() )`
1553	`continue;`	1553	`continue;`
1554	`if ( node->Data()->GetFileType() != FILETYPE_MOD )`	1554	`if ( node->Data()->GetFileType() != FILETYPE_MOD )`
1555	`continue;`	1555	`continue;`
1556	`// we only need the cat file`	1556	`// we only need the cat file`
1557	`if ( !node->Data()->CheckFileExt("cat") )`	1557	`if ( !node->Data()->checkFileExt("cat") )`
1558	`continue;`	1558	`continue;`
1559	`if ( !node->Data()->IsFakePatch() )`	1559	`if ( !node->Data()->IsFakePatch() )`
1560	`continue;`	1560	`continue;`
1561		1561
1562	`findMatching = node->Data();`	1562	`findMatching = node->Data();`
Line 1571...	Line 1571...
1571	`if ( !node->Data() )`	1571	`if ( !node->Data() )`
1572	`continue;`	1572	`continue;`
1573	`if ( node->Data()->GetFileType() != FILETYPE_MOD )`	1573	`if ( node->Data()->GetFileType() != FILETYPE_MOD )`
1574	`continue;`	1574	`continue;`
1575	`// we only need the cat file`	1575	`// we only need the cat file`
1576	`if ( !node->Data()->CheckFileExt("cat") )`	1576	`if (!node->Data()->checkFileExt("cat"))`
1577	`continue;`	1577	`continue;`
1578		1578
1579	`if ( node->Data()->GetName().Compare(f->Data()->GetName()) )`	1579	`if ( node->Data()->name().Compare(f->Data()->name()) )`
1580	`{`	1580	`{`
1581	`findMatching = node->Data();`	1581	`findMatching = node->Data();`
1582	`break;`	1582	`break;`
1583	`}`	1583	`}`
1584	`}`	1584	`}`
Line 1615...	Line 1615...
1615	`}`	1615	`}`
1616	`}`	1616	`}`
1617	`// no matching file, then we shall just renaming back`	1617	`// no matching file, then we shall just renaming back`
1618	`else`	1618	`else`
1619	`{`	1619	`{`
1620	`if ( f->Data()->GetBaseName().Left(5).Compare("fake_") )`	1620	`if ( f->Data()->baseName().left(5).Compare("fake_") )`
1621	`{`	1621	`{`
1622	`shuffle = true;`	1622	`shuffle = true;`
1623	`C_File *match = package->findMatchingMod(f->Data());`	1623	`C_File *match = package->findMatchingMod(f->Data());`
1624	`Utils::String next = Utils::String::PadNumber(this->FindNextFakePatch(), 2);`	1624	`Utils::String next = Utils::String::PadNumber(this->FindNextFakePatch(), 2);`
1625		1625
1626	`CyString oldFilePointer = f->Data()->GetFilePointer();`	1626	`Utils::String oldFilePointer = f->Data()->filePointer();`
1627	`f->Data()->setDir("");`	1627	`f->Data()->setDir("");`
1628	`f->Data()->changeBaseName(next);`	1628	`f->Data()->changeBaseName(next);`
1629	`if ( CFileIO(oldFilePointer).Rename(m_sCurrentDir + "/" + f->Data()->getNameDirectory(package)) )`	1629	`if ( CFileIO(oldFilePointer).Rename(m_sCurrentDir + "/" + f->Data()->getNameDirectory(package)) )`
1630	`f->Data()->setFilename(m_sCurrentDir + "/" + f->Data()->getNameDirectory(package));`	1630	`f->Data()->setFilename(m_sCurrentDir + "/" + f->Data()->getNameDirectory(package));`
1631		1631
Line 1641...	Line 1641...
1641	`else`	1641	`else`
1642	`{`	1642	`{`
1643	`C_File *match = package->findMatchingMod(f->Data());`	1643	`C_File *match = package->findMatchingMod(f->Data());`
1644		1644
1645	`f->Data()->setDir("");`	1645	`f->Data()->setDir("");`
1646	`if ( CFileIO(f->Data()->GetFilePointer()).Rename(m_sCurrentDir + "/" + f->Data()->getNameDirectory(package)) )`	1646	`if ( CFileIO(f->Data()->filePointer()).Rename(m_sCurrentDir + "/" + f->Data()->getNameDirectory(package)) )`
1647	`f->Data()->setFilename(m_sCurrentDir + "/" + f->Data()->getNameDirectory(package));`	1647	`f->Data()->setFilename(m_sCurrentDir + "/" + f->Data()->getNameDirectory(package));`
1648	`if ( match )`	1648	`if ( match )`
1649	`{`	1649	`{`
1650	`match->setDir("");`	1650	`match->setDir("");`
1651	`if ( CFileIO(match->filePointer()).Rename(m_sCurrentDir + "/" + match->getNameDirectory(package)) )`	1651	`if ( CFileIO(match->filePointer()).Rename(m_sCurrentDir + "/" + match->getNameDirectory(package)) )`
Line 1767...	Line 1767...
1767	`}`	1767	`}`
1768		1768
1769	`// remove from hard drive`	1769	`// remove from hard drive`
1770	`if ( !dontRemove && RemoveFile(f, errors) )`	1770	`if ( !dontRemove && RemoveFile(f, errors) )`
1771	`{`	1771	`{`
1772	`CLog::logf(CLog::Log_Install, 1, "Removed unused file: %s", f->GetFilePointer().c_str());`	1772	`CLog::logf(CLog::Log_Install, 1, "Removed unused file: %s", f->filePointer().c_str());`
1773	`// if a fake patch, we need to shufle`	1773	`// if a fake patch, we need to shufle`
1774	`if ( f->IsFakePatch() )`	1774	`if ( f->IsFakePatch() )`
1775	`shuffle = true;`	1775	`shuffle = true;`
1776	`else if ( f->isAutoTextFile() )`	1776	`else if ( f->isAutoTextFile() )`
1777	`shuffle = true;`	1777	`shuffle = true;`
Line 1818...	Line 1818...
1818	`return true;`	1818	`return true;`
1819	`}`	1819	`}`
1820		1820
1821	`bool CPackages::UninstallPreparedPackages(CyStringList errors, CProgressInfo progress, CLinkList<CBaseFile> uninstalledPackages, CLinkList<CBaseFile> disabledPackages)`	1821	`bool CPackages::UninstallPreparedPackages(CyStringList errors, CProgressInfo progress, CLinkList<CBaseFile> uninstalledPackages, CLinkList<CBaseFile> disabledPackages)`
1822	`{`	1822	`{`
-		1823	`Utils::CStringList lErrors;`
-		1824
1823	`if ( m_lInstallList.empty() ) return false;`	1825	`if ( m_lInstallList.empty() ) return false;`
1824		1826
1825	`// update the used status, excluding all packages we are about to remove`	1827	`// update the used status, excluding all packages we are about to remove`
1826	`UpdateUsedFiles(&m_lInstallList);`	1828	`UpdateUsedFiles(&m_lInstallList);`
1827		1829
1828	`CyStringList removeDirs;`	1830	`Utils::CStringList removeDirs;`
1829	`CLinkList<C_File> uninstallFiles;`	1831	`CLinkList<C_File> uninstallFiles;`
1830	`CLinkList<C_File> fileList;`	1832	`CLinkList<C_File> fileList;`
1831	`bool readme = false, original = false, shuffle = false;`	1833	`bool readme = false, original = false, shuffle = false;`
1832		1834
1833	`// find all files that need to be removed`	1835	`// find all files that need to be removed`
Line 1882...	Line 1884...
1882		1884
1883	`if ( f->GetFileType() == FILETYPE_README )`	1885	`if ( f->GetFileType() == FILETYPE_README )`
1884	`readme = true;`	1886	`readme = true;`
1885	`else if ( f->GetFileType() == FILETYPE_UNINSTALL \|\| f->GetFileType() == FILETYPE_MAP \|\| f->GetFileType() == FILETYPE_SOUND \|\| f->GetFileType() == FILETYPE_EXTRA \|\| f->GetFileType() == FILETYPE_SHIPSCENE \|\| f->GetFileType() == FILETYPE_COCKPITSCENE \|\| f->GetFileType() == FILETYPE_SHIPOTHER \|\| f->GetFileType() == FILETYPE_SHIPMODEL \|\| f->GetFileType() == FILETYPE_ADVERT )`	1887	`else if ( f->GetFileType() == FILETYPE_UNINSTALL \|\| f->GetFileType() == FILETYPE_MAP \|\| f->GetFileType() == FILETYPE_SOUND \|\| f->GetFileType() == FILETYPE_EXTRA \|\| f->GetFileType() == FILETYPE_SHIPSCENE \|\| f->GetFileType() == FILETYPE_COCKPITSCENE \|\| f->GetFileType() == FILETYPE_SHIPOTHER \|\| f->GetFileType() == FILETYPE_SHIPMODEL \|\| f->GetFileType() == FILETYPE_ADVERT )`
1886	`{`	1888	`{`
1887	`CyString dir = f->GetDirectory(NULL);`	1889	`Utils::String dir = f->getDirectory(NULL);`
-		1890	`if(!removeDirs.contains(dir))`
1888	`removeDirs.PushBack(dir, true);`	1891	`removeDirs.pushBack(dir);`
1889	`dir = dir.FindReplace("\\", "/");`	1892	`dir = dir.findReplace("\\", "/");`
1890	`if ( dir.IsIn("/") )`	1893	`if ( dir.contains("/") )`
1891	`{`	1894	`{`
1892	`for ( int i = dir.NumToken("/"); i; i-- )`	1895	`for ( int i = dir.countToken("/"); i; i-- )`
1893	`{`	1896	`{`
1894	`CyString remDir = dir.GetToken("/", 1, i);`	1897	`Utils::String remDir = dir.tokens("/", 1, i);`
-		1898	`if(!removeDirs.contains(remDir))`
1895	`removeDirs.PushBack(remDir, true);`	1899	`removeDirs.pushBack(remDir);`
1896	`}`	1900	`}`
1897	`}`	1901	`}`
1898	`}`	1902	`}`
1899		1903
1900	`if ( f->GetFileType() == FILETYPE_EXTRA && f->GetDir().Left(6).lower() == "extras" )`	1904	`if (f->GetFileType() == FILETYPE_EXTRA && f->dir().left(6).lower() == "extras")`
-		1905	`{`
-		1906	`if (!removeDirs.contains("Extras"))`
1901	`removeDirs.PushBack("Extras", true);`	1907	`removeDirs.pushBack("Extras");`
-		1908	`}`
1902		1909
1903	`if ( RemoveFile(f, errors) )`	1910	`if ( RemoveFile(f, errors) )`
1904	`{`	-
1905	`original = _pOriginalFiles->restoreFile(f, errors);`	1911	`original = _pOriginalFiles->restoreFile(f, errors);`
1906	`}`	-
1907	`else // problem removeing (try when the program closes)`	1912	`else // problem removeing (try when the program closes)`
1908	`m_lNonRemovedFiles.pushBack(f->filePointer());`	1913	`m_lNonRemovedFiles.pushBack(f->filePointer());`
1909		1914
1910	`// check for fake patchs`	1915	`// check for fake patchs`
1911	`if ( f->IsFakePatch() )`	1916	`if ( f->IsFakePatch() )`
Line 1937...	Line 1942...
1937	`m_lInstallList.clear();`	1942	`m_lInstallList.clear();`
1938		1943
1939	`// check unistall files`	1944	`// check unistall files`
1940	`if ( !uninstallFiles.empty() )`	1945	`if ( !uninstallFiles.empty() )`
1941	`{`	1946	`{`
1942	`removeDirs.PushBack(CyString("PluginManager/Uninstall"));`	1947	`removeDirs.pushBack("PluginManager/Uninstall");`
1943		1948
1944	`// make sure the scripts directory is created, even thou it should always be there anyways`	1949	`// make sure the scripts directory is created, even thou it should always be there anyways`
1945	`CDirIO scriptDir(m_sCurrentDir);`	1950	`CDirIO scriptDir(m_sCurrentDir);`
1946	`if ( !scriptDir.exists("scripts") )`	1951	`if ( !scriptDir.exists("scripts") )`
1947	`{`	1952	`{`
Line 2016...	Line 2021...
2016	`uninstallFiles.clear();`	2021	`uninstallFiles.clear();`
2017		2022
2018	`// remove all directies that we're not using`	2023	`// remove all directies that we're not using`
2019	`if ( readme )`	2024	`if ( readme )`
2020	`{`	2025	`{`
2021	`removeDirs.PushBack(CyString("PluginManager/Readme"));`	2026	`removeDirs.pushBack("PluginManager/Readme");`
2022	`removeDirs.PushBack(CyString("Readme"));`	2027	`removeDirs.pushBack("Readme");`
2023	`}`	2028	`}`
2024	`if ( original ) {`	2029	`if ( original ) {`
2025	`removeDirs.PushBack(CyString("PluginManager/Original/Replacements"));`	2030	`removeDirs.pushBack("PluginManager/Original/Replacements");`
2026	`removeDirs.PushBack(CyString("PluginManager/Original"));`	2031	`removeDirs.pushBack("PluginManager/Original");`
2027	`}`	2032	`}`
2028	`removeDirs.PushBack(CyString("PluginManager/Disabled"));`	2033	`removeDirs.pushBack("PluginManager/Disabled");`
2029	`RemoveUnusedDirectories(removeDirs, errors);`	2034	`removeUnusedDirectories(removeDirs, &lErrors);`
2030		2035
2031	`// finally lets shuffle any fake patchs to fill in gaps`	2036	`// finally lets shuffle any fake patchs to fill in gaps`
2032	`if ( shuffle )`	2037	`if ( shuffle )`
2033	`{`	2038	`{`
2034	`ShuffleFakePatches(errors);`	2039	`ShuffleFakePatches(errors);`
Line 2493...	Line 2498...
2493	`{`	2498	`{`
2494	`// base mode for Reunion`	2499	`// base mode for Reunion`
2495	`if ( m_iGame == GAME_X3 && m_pEnabledMod )`	2500	`if ( m_iGame == GAME_X3 && m_pEnabledMod )`
2496	`{`	2501	`{`
2497	`C_File *fDat = m_pEnabledMod->GetFirstFile(FILETYPE_MOD);`	2502	`C_File *fDat = m_pEnabledMod->GetFirstFile(FILETYPE_MOD);`
2498	`while ( fDat && !fDat->IsFakePatch() && !fDat->CheckFileExt("dat") )`	2503	`while (fDat && !fDat->IsFakePatch() && !fDat->checkFileExt("dat"))`
2499	`fDat = m_pEnabledMod->GetNextFile(fDat);`	2504	`fDat = m_pEnabledMod->GetNextFile(fDat);`
2500		2505
2501	`if ( fDat )`	2506	`if ( fDat )`
2502	`{`	2507	`{`
2503	`C_File *fCat = m_pEnabledMod->GetFirstFile(FILETYPE_MOD);`	2508	`C_File *fCat = m_pEnabledMod->GetFirstFile(FILETYPE_MOD);`
2504	`while ( fCat && !fCat->IsFakePatch() && !fCat->CheckFileExt("cat") && !fCat->GetBaseName().Compare(fDat->GetBaseName()) )`	2509	`while ( fCat && !fCat->IsFakePatch() && !fCat->checkFileExt("cat") && !fCat->baseName().Compare(fDat->baseName()) )`
2505	`fCat = m_pEnabledMod->GetNextFile(fCat);`	2510	`fCat = m_pEnabledMod->GetNextFile(fCat);`
2506		2511
2507	`if ( fCat )`	2512	`if ( fCat )`
2508	`{`	2513	`{`
2509	`CFileIO(fDat->filePointer()).copy(m_sCurrentDir + "/mods/PluginManager.dat");`	2514	`CFileIO(fDat->filePointer()).copy(m_sCurrentDir + "/mods/PluginManager.dat");`
2510	`CFileIO(fCat->filePointer()).copy(m_sCurrentDir + "/mods/PluginManager.cat");`	2515	`CFileIO(fCat->filePointer()).copy(m_sCurrentDir + "/mods/PluginManager.cat");`
2511	`}`	2516	`}`
2512	`}`	2517	`}`
2513	`}`	2518	`}`
2514	`else if ( m_iGame == GAME_X3 && !m_sSetMod.empty() && CFileIO(m_sCurrentDir + "/mods/" + m_sSetMod + ".cat").ExistsOld() && CFileIO(m_sCurrentDir + "/mods/" + m_sSetMod + ".dat").ExistsOld())`	2519	`else if ( m_iGame == GAME_X3 && !m_sSetMod.empty() && CFileIO::Exists(m_sCurrentDir + "/mods/" + m_sSetMod + ".cat") && CFileIO::Exists(m_sCurrentDir + "/mods/" + m_sSetMod + ".dat"))`
2515	`{`	2520	`{`
2516	`CLog::log(CLog::Log_Directory, 2, "Copying mod file: " + m_sSetMod + ", to PluginManager.cat");`	2521	`CLog::log(CLog::Log_Directory, 2, "Copying mod file: " + m_sSetMod + ", to PluginManager.cat");`
2517	`CFileIO(m_sCurrentDir + "/mods/" + m_sSetMod + ".dat").copy(m_sCurrentDir + "/mods/PluginManager.dat");`	2522	`CFileIO(m_sCurrentDir + "/mods/" + m_sSetMod + ".dat").copy(m_sCurrentDir + "/mods/PluginManager.dat");`
2518	`CFileIO(m_sCurrentDir + "/mods/" + m_sSetMod + ".cat").copy(m_sCurrentDir + "/mods/PluginManager.cat");`	2523	`CFileIO(m_sCurrentDir + "/mods/" + m_sSetMod + ".cat").copy(m_sCurrentDir + "/mods/PluginManager.cat");`
2519	`}`	2524	`}`
Line 3053...	Line 3058...
3053	`{`	3058	`{`
3054	`if ( !Dir.exists(f->getDirectory(package)) )`	3059	`if ( !Dir.exists(f->getDirectory(package)) )`
3055	`{`	3060	`{`
3056	`if ( !Dir.create(f->getDirectory(package)) )`	3061	`if ( !Dir.create(f->getDirectory(package)) )`
3057	`{`	3062	`{`
3058	`this->AddLogEntry(SPKINSTALL_CREATEDIRECTORY_FAIL, f->GetDirectory(package), errors);`	3063	`this->AddLogEntry(SPKINSTALL_CREATEDIRECTORY_FAIL, f->getDirectory(package), errors);`
3059	`continue;`	3064	`continue;`
3060	`}`	3065	`}`
3061	`this->AddLogEntry(SPKINSTALL_CREATEDIRECTORY, f->GetDirectory(package), errors);`	3066	`this->AddLogEntry(SPKINSTALL_CREATEDIRECTORY, f->getDirectory(package), errors);`
3062	`}`	3067	`}`
3063	`}`	3068	`}`
3064		3069
3065	`// check if theres an original file to backup`	3070	`// check if theres an original file to backup`
3066	`_pOriginalFiles->doBackup(f, errors);`	3071	`_pOriginalFiles->doBackup(f, errors);`
Line 3204...	Line 3209...
3204	`if ( f->IsDisabled() )`	3209	`if ( f->IsDisabled() )`
3205	`continue;`	3210	`continue;`
3206		3211
3207	`// readmes, uninstall and extra files dont need to be disabled`	3212	`// readmes, uninstall and extra files dont need to be disabled`
3208	`// Extra files not in the "Extras" directory could be anywhere, so these should be disabled incase they are game changing files, ie in "types"`	3213	`// Extra files not in the "Extras" directory could be anywhere, so these should be disabled incase they are game changing files, ie in "types"`
3209	`if ( f->GetFileType() == FILETYPE_README \|\| f->GetFileType() == FILETYPE_UNINSTALL \|\| (f->GetFileType() == FILETYPE_EXTRA && f->GetDir().Left(5).lower() == "Extra") )`	3214	`if ( f->GetFileType() == FILETYPE_README \|\| f->GetFileType() == FILETYPE_UNINSTALL \|\| (f->GetFileType() == FILETYPE_EXTRA && f->dir().left(5).lower() == "Extra") )`
3210	`continue;`	3215	`continue;`
3211		3216
3212	`// check if there is a matching uninstall file, ie there the script file is also an uninstall script file for a previously uninstalled package that has yet to be removed`	3217	`// check if there is a matching uninstall file, ie there the script file is also an uninstall script file for a previously uninstalled package that has yet to be removed`
3213	`if ( f->GetFileType() == FILETYPE_SCRIPT )`	3218	`if ( f->GetFileType() == FILETYPE_SCRIPT )`
3214	`{`	3219	`{`
Line 3225...	Line 3230...
3225		3230
3226	`if ( found )`	3231	`if ( found )`
3227	`continue;`	3232	`continue;`
3228	`}`	3233	`}`
3229		3234
3230	`if ( f->GetFileType() == FILETYPE_MOD && !f->IsFakePatch() && f->CheckFileExt("cat") )`	3235	`if ( f->GetFileType() == FILETYPE_MOD && !f->IsFakePatch() && f->checkFileExt("cat") )`
3231	`{`	3236	`{`
3232	`if ( f->baseName().Compare(m_sSetMod) )`	3237	`if ( f->baseName().Compare(m_sSetMod) )`
3233	`m_sSetMod = Utils::String::Null();`	3238	`m_sSetMod = Utils::String::Null();`
3234	`}`	3239	`}`
3235		3240
Line 3277...	Line 3282...
3277	`shuffle = true;`	3282	`shuffle = true;`
3278	`}`	3283	`}`
3279	`}`	3284	`}`
3280	`// otherwise we can just use the standard filename`	3285	`// otherwise we can just use the standard filename`
3281	`else`	3286	`else`
3282	`newFilename = Utils::String(m_sCurrentDir) + "/PluginManager/Disabled/" + f->GetNameDirectory(checkPackage).ToString();`	3287	`newFilename = Utils::String(m_sCurrentDir) + "/PluginManager/Disabled/" + f->getNameDirectory(checkPackage);`
3283		3288
3284	`// now to move the file by renameing it to its new location`	3289	`// now to move the file by renameing it to its new location`
3285	`// !!error checking!!`	3290	`// !!error checking!!`
3286	`// check the file, if it doesn't exist, and exists as disabled, we should just adjust the setting instead of an error`	3291	`// check the file, if it doesn't exist, and exists as disabled, we should just adjust the setting instead of an error`
3287	`CFileIO currentFile(f->GetFilePointer());`	3292	`CFileIO currentFile(f->filePointer());`
3288	`if ( !currentFile.exists() )`	3293	`if ( !currentFile.exists() )`
3289	`{`	3294	`{`
3290	`if ( !CFileIO(newFilename).exists() )`	3295	`if ( !CFileIO(newFilename).exists() )`
3291	`{`	3296	`{`
3292	`this->AddLogEntry(SPKINSTALL_MISSINGFILE, f->GetNameDirectory(checkPackage), errors);`	3297	`this->AddLogEntry(SPKINSTALL_MISSINGFILE, f->getNameDirectory(checkPackage), errors);`
3293	`continue;`	3298	`continue;`
3294	`}`	3299	`}`
3295	`}`	3300	`}`
3296	`// otherwise the file must exists, so lets move it`	3301	`// otherwise the file must exists, so lets move it`
3297	`else if ( !currentFile.Rename(newFilename) )`	3302	`else if ( !currentFile.Rename(newFilename) )`
3298	`{`	3303	`{`
3299	`this->AddLogEntry(SPKINSTALL_DISABLEFILE_FAIL, f->GetNameDirectory(checkPackage), errors);`	3304	`this->AddLogEntry(SPKINSTALL_DISABLEFILE_FAIL, f->getNameDirectory(checkPackage), errors);`
3300	`continue;`	3305	`continue;`
3301	`}`	3306	`}`
3302		3307
3303	`// must have been fine`	3308	`// must have been fine`
3304	`this->AddLogEntry(SPKINSTALL_DISABLEFILE, f->GetNameDirectory(checkPackage), errors);`	3309	`this->AddLogEntry(SPKINSTALL_DISABLEFILE, f->getNameDirectory(checkPackage), errors);`
3305		3310
3306	`original = _pOriginalFiles->restoreFile(f, errors);`	3311	`original = _pOriginalFiles->restoreFile(f, errors);`
3307		3312
3308	`// extra file thats not in the extras directory`	3313	`// extra file thats not in the extras directory`
3309	`if ( f->GetFileType() == FILETYPE_EXTRA \|\| f->GetFileType() == FILETYPE_MAP \|\| f->GetFileType() == FILETYPE_SOUND )`	3314	`if ( f->GetFileType() == FILETYPE_EXTRA \|\| f->GetFileType() == FILETYPE_MAP \|\| f->GetFileType() == FILETYPE_SOUND )`
3310	`removeDirs.PushBack(f->GetDirectory(checkPackage), NullString, true);`	3315	`removeDirs.PushBack(CyString(f->getDirectory(checkPackage)), NullString, true);`
3311		3316
3312	`// change the filename`	3317	`// change the filename`
3313	`f->SetFilename(newFilename);`	3318	`f->setFilename(newFilename);`
3314		3319
3315	`// finally mark the file as disabled so we know not to try to move it again`	3320	`// finally mark the file as disabled so we know not to try to move it again`
3316	`f->SetDisabled(true);`	3321	`f->SetDisabled(true);`
3317	`}`	3322	`}`
3318		3323
Line 4057...	Line 4062...
4057	`*`	4062	`*`
4058	`* Removes a single uninstall file`	4063	`* Removes a single uninstall file`
4059	`*/`	4064	`*/`
4060	`bool CPackages::RemoveUninstallFile(C_File file, CyStringList errors)`	4065	`bool CPackages::RemoveUninstallFile(C_File file, CyStringList errors)`
4061	`{`	4066	`{`
4062	`CFileIO fio(file->GetFilePointer());`	4067	`CFileIO fio(file->filePointer());`
4063	`if ( fio.exists() )`	4068	`if ( fio.exists() )`
4064	`{`	4069	`{`
4065	`if ( fio.remove() ) {`	4070	`if ( fio.remove() ) {`
4066	`this->AddLogEntry(SPKINSTALL_UNINSTALL_REMOVE, file->GetNameDirectory(NULL), errors);`	4071	`this->AddLogEntry(SPKINSTALL_UNINSTALL_REMOVE, file->getNameDirectory(NULL), errors);`
4067	`return true;`	4072	`return true;`
4068	`}`	4073	`}`
4069	`else if ( errors )`	4074	`else if ( errors )`
4070	`this->AddLogEntry(SPKINSTALL_UNINSTALL_REMOVE_FAIL, file->GetNameDirectory(NULL), errors);`	4075	`this->AddLogEntry(SPKINSTALL_UNINSTALL_REMOVE_FAIL, file->getNameDirectory(NULL), errors);`
4071	`}`	4076	`}`
4072		4077
4073	`return false;`	4078	`return false;`
4074	`}`	4079	`}`
4075		4080
Line 4129...	Line 4134...
4129	`*`	4134	`*`
4130	`* Removes a single file`	4135	`* Removes a single file`
4131	`*/`	4136	`*/`
4132	`bool CPackages::RemoveSharedFile(C_File file, CyStringList errors)`	4137	`bool CPackages::RemoveSharedFile(C_File file, CyStringList errors)`
4133	`{`	4138	`{`
4134	`CFileIO fio(file->GetFilePointer());`	4139	`CFileIO fio(file->filePointer());`
4135	`if ( fio.exists() )`	4140	`if ( fio.exists() )`
4136	`{`	4141	`{`
4137	`if ( fio.remove() ) {`	4142	`if ( fio.remove() ) {`
4138	`this->AddLogEntry(SPKINSTALL_SHARED, file->GetNameDirectory(NULL), errors);`	4143	`this->AddLogEntry(SPKINSTALL_SHARED, file->getNameDirectory(NULL), errors);`
4139	`delete file;`	4144	`delete file;`
4140	`return true;`	4145	`return true;`
4141	`}`	4146	`}`
4142	`else if ( errors )`	4147	`else if ( errors )`
4143	`this->AddLogEntry(SPKINSTALL_SHARED_FAIL, file->GetNameDirectory(NULL), errors);`	4148	`this->AddLogEntry(SPKINSTALL_SHARED_FAIL, file->getNameDirectory(NULL), errors);`
4144	`}`	4149	`}`
4145		4150
4146	`return false;`	4151	`return false;`
4147	`}`	4152	`}`
4148		4153
Line 4232...	Line 4237...
4232	`if ( !f->isAutoTextFile() )`	4237	`if ( !f->isAutoTextFile() )`
4233	`continue;`	4238	`continue;`
4234		4239
4235	`// we need to rename it`	4240	`// we need to rename it`
4236	`int current = findNextTextFile();`	4241	`int current = findNextTextFile();`
4237	`if ( current < f->GetTextFileID() )`	4242	`if ( current < f->textFileID() )`
4238	`{`	4243	`{`
4239	`CFileIO moveFile(f->filePointer());`	4244	`CFileIO moveFile(f->filePointer());`
4240		4245
4241	`Utils::String newName = SPK::FormatTextName(current, m_iLanguage, (m_iGameFlags & EXEFLAG_TCTEXT)) + "." + moveFile.extension();`	4246	`Utils::String newName = SPK::FormatTextName(current, m_iLanguage, (m_iGameFlags & EXEFLAG_TCTEXT)) + "." + moveFile.extension();`
4242	`if ( moveFile.Rename(m_sCurrentDir + "/t/" + newName) )`	4247	`if ( moveFile.Rename(m_sCurrentDir + "/t/" + newName) )`
4243	`{`	4248	`{`
4244	`this->AddLogEntry(SPKINSTALL_AUTOTEXT, f->name() + "~" + newName, errors);`	4249	`this->AddLogEntry(SPKINSTALL_AUTOTEXT, f->name() + "~" + newName, errors);`
4245	`f->SetName(newName);`	4250	`f->setName(newName);`
4246	`}`	4251	`}`
4247	`else`	4252	`else`
4248	`this->AddLogEntry(SPKINSTALL_AUTOTEXT_FAIL, f->name() + "~" + newName, errors);`	4253	`this->AddLogEntry(SPKINSTALL_AUTOTEXT_FAIL, f->name() + "~" + newName, errors);`
4249	`}`	4254	`}`
4250	`}`	4255	`}`
Line 4563...	Line 4568...
4563	`while ( true )`	4568	`while ( true )`
4564	`{`	4569	`{`
4565	`C_File *lowestFile = NULL;`	4570	`C_File *lowestFile = NULL;`
4566	`for ( C_File *file = package->GetFirstFile(FILETYPE_MOD); file; file = package->GetNextFile(file) )`	4571	`for ( C_File *file = package->GetFirstFile(FILETYPE_MOD); file; file = package->GetNextFile(file) )`
4567	`{`	4572	`{`
4568	`if ( !file->IsFakePatch() ) continue;`	4573	`if (!file->IsFakePatch()) continue;`
4569	`if ( !file->CheckFileExt("cat") ) continue; // only do the cat file, we can shuffle the dat file to match later`	4574	`if (!file->checkFileExt("cat")) continue; // only do the cat file, we can shuffle the dat file to match later`
4570	`if ( doneList.FindData(file) ) continue; // already done?`	4575	`if (doneList.FindData(file)) continue; // already done?`
4571		4576
4572	`if ( !lowestFile )`	4577	`if ( !lowestFile )`
4573	`lowestFile = file;`	4578	`lowestFile = file;`
4574	`else`	4579	`else`
4575	`{`	4580	`{`
4576	`if ( file->GetBaseName().ToInt() < lowestFile->GetBaseName().ToInt() )`	4581	`if ( file->baseName().toInt() < lowestFile->baseName().toInt() )`
4577	`lowestFile = file;`	4582	`lowestFile = file;`
4578	`}`	4583	`}`
4579	`}`	4584	`}`
4580		4585
4581	`if ( !lowestFile ) // no more files ?`	4586	`if ( !lowestFile ) // no more files ?`
Line 4626...	Line 4631...
4626	`// check if the file is a fake patch`	4631	`// check if the file is a fake patch`
4627	`if ( !f->IsFakePatch() )`	4632	`if ( !f->IsFakePatch() )`
4628	`continue;`	4633	`continue;`
4629		4634
4630	`// we only want cat and dat files, all fake patchs should be, but incase theres an error in the package somewhere we can check`	4635	`// we only want cat and dat files, all fake patchs should be, but incase theres an error in the package somewhere we can check`
4631	`if ( !f->CheckFileExt("cat") )`	4636	`if (!f->checkFileExt("cat"))`
4632	`continue;`	4637	`continue;`
4633		4638
4634	`// now lets check if its greater than our gap`	4639	`// now lets check if its greater than our gap`
4635	`int check = FindNextFakePatch();`	4640	`int check = FindNextFakePatch();`
4636	`int patchNum = f->filename().token(".", 1).toInt();`	4641	`int patchNum = f->filename().token(".", 1).toInt();`
Line 4656...	Line 4661...
4656	`// now find the matching pairing if it exists`	4661	`// now find the matching pairing if it exists`
4657	`for ( CListNode<C_File> *node2 = m_lFiles.Front(); node2; node2 = node2->next() )`	4662	`for ( CListNode<C_File> *node2 = m_lFiles.Front(); node2; node2 = node2->next() )`
4658	`{`	4663	`{`
4659	`C_File *f2 = node2->Data();`	4664	`C_File *f2 = node2->Data();`
4660		4665
4661	`if ( f2->IsDisabled() \|\| !f2->IsFakePatch() \|\| f2->CheckFileExt(file->GetFileExt()) )`	4666	`if ( f2->IsDisabled() \|\| !f2->IsFakePatch() \|\| f2->checkFileExt(file->fileExt()))`
4662	`continue;`	4667	`continue;`
4663		4668
4664	`// needs to be the same file`	4669	`// needs to be the same file`
4665	`if ( f2->GetBaseName() != file->GetBaseName() )`	4670	`if ( f2->baseName() != file->baseName() )`
4666	`continue;`	4671	`continue;`
4667		4672
4668	`Utils::String newName2 = Utils::String::PadNumber(to, 2) + "." + f2->fileExt();`	4673	`Utils::String newName2 = Utils::String::PadNumber(to, 2) + "." + f2->fileExt();`
4669	`CFileIO moveFile(f2->filePointer());`	4674	`CFileIO moveFile(f2->filePointer());`
4670	`if ( moveFile.Rename(m_sCurrentDir + "/" + newName2) )`	4675	`if ( moveFile.Rename(m_sCurrentDir + "/" + newName2) )`
Line 4693...	Line 4698...
4693	`if ( !p->AnyFileType(FILETYPE_MOD) ) continue;`	4698	`if ( !p->AnyFileType(FILETYPE_MOD) ) continue;`
4694		4699
4695	`// now get all fake patches`	4700	`// now get all fake patches`
4696	`for ( C_File *file = p->GetFirstFile(FILETYPE_MOD); file; file = p->GetNextFile(file) )`	4701	`for ( C_File *file = p->GetFirstFile(FILETYPE_MOD); file; file = p->GetNextFile(file) )`
4697	`{`	4702	`{`
4698	`if ( !file->IsFakePatch() ) continue;`	4703	`if (!file->IsFakePatch()) continue;`
4699	`if ( file->CheckFileExt("dat") ) continue;`	4704	`if (file->checkFileExt("dat")) continue;`
4700	`int check = file->GetBaseName().ToInt();`	4705	`int check = file->baseName().toInt();`
4701	`if ( check < lowest )`	4706	`if ( check < lowest )`

Subversion Repositories spk

(root)/libspk/src/Packages.cpp – Rev 177 → 178