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



	name.removeChar('?');
	name.removeChar('"');
	name.removeChar('<');
	name.removeChar('>');
	name.removeChar('|');
 
 
 
 
 
 
 
 
 
 
 
 
 
 
	return name;
}
 
void CBaseFile::SwitchFilePointer(C_File *oldFile, C_File *newFile)
{
	for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() )
	{
		C_File *f = node->Data();
		if ( f == oldFile )
		{
			node->ChangeData(newFile);
			break;
		}
	}
}
 
bool CBaseFile::AnyFileType ( int type )
{
	for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() )
	{
		C_File *f = node->Data();
		if ( f->GetFileType() == type )
			return true;
	}
 
	return false;
}
 
void CBaseFile::AddFile ( C_File *file )
{
	for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() )
	{
		C_File *f = node->Data();
		if ( f->fileType() != file->fileType() )
			continue;
		if ( f->name() != file->name () )
			continue;
		if ( f->GetDir() != file->GetDir() )
			continue;
		if ( f->game() != file->game() )
			continue;
 
		m_lFiles.remove(node, true);
		break;
	}
 
	_addFile(file);
}
 
C_File *CBaseFile::AddFile(CyString file, CyString dir, int type, int game)
{

		C_File *f = node->Data();
		if ( f->fileType() != newfile->fileType() )
			continue;
		if ( f->name() != newfile->name () )
			continue;
		if ( f->dir() != newfile->dir() )
			continue;
		if (f->game() != newfile->game())
		{
			//same file, for different game, check if they are the same and combine them
			if (_bCombineFiles)

		}
 
		// must already exist, delete this one
		m_lFiles.remove(node, true);
		break;
	}
 
	_addFile(newfile);
 
	return newfile;
}
 
bool CBaseFile::AddFileNow ( CyString file, CyString dir, int type, CProgressInfo *progress )
{
	C_File *f = AddFile ( file, dir, type );
	if ( !f->ReadFromFile () )
		return false;
 
	// compress the file

	// read the file into memory
	if ( newfile->ReadFromFile () )
	{
		// now compress the file
		if ( newfile->CompressData ( m_SHeader2.iDataCompression, progress ) )
			return newfile;
	}
	else if ( newfile->GetLastError() == SPKERR_MALLOC )
	{
		if ( newfile->CompressFile ( progress ) )
			return newfile;

 
	return NULL;
}
 
C_File *CBaseFile::FindFileAt ( int filetype, int pos )
{
	int count = 0;
	for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() )
	{
		C_File *file = node->Data();
		if ( file->GetFileType() != filetype )
			continue;

		return;
 
	for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() )
	{
		if (game == 0 && node->Data()->game() && node->Data()->game() != GAME_ALLNEW)
			continue;
		if ( game > -1 )
		{
			unsigned int fileGame = node->Data()->game() & ~GAME_ALLNEW;
			if (fileGame != (1 << game))
			{

				continue;
			}
		}
		if ( type == FILETYPE_UNKNOWN || node->Data()->GetFileType() == type )
			node->DeleteData();
	}
 
	m_lFiles.RemoveEmpty();
 
	_changed();
}
 
void CBaseFile::RecompressAllFiles ( int type, CProgressInfo *progress )

			file->ReadFromFile();
 
		file->ChangeCompression ( type, progress );
	}
}
 
void CBaseFile::CompressAllFiles ( int type, CProgressInfo *progress, CProgressInfo *overallProgress, int level )
{
	if ( overallProgress ) overallProgress->SetMax(m_lFiles.size());
 
	int iCount = 0;
	for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() )
	{
		C_File *file = node->Data();
		if ( progress )
			progress->UpdateFile(file);
 

{
	int countFile = 0;
	for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() )
	{
		C_File *fit = node->Data();
		if ( progress )
		{
			progress->UpdateFile ( fit );
			progress->UpdateProgress(countFile++, m_lFiles.size());
		}
 
		bool uncomprToFile = false;

						return false;
					else
					{
						uncomprToFile = true;
						fit->SetFullDir("temp");
					}
				}
 
				if (!uncomprToFile)
					return false;
			}

		if ( n->iLanguage == lang )
		{
			m_lNames.RemoveCurrent();
			delete n;
			_changed();
		}
	}
}
 
void CBaseFile::AddLanguageName ( int lang, const Utils::String &name )
{

 
	if ( (!m_pIconFile->GetData()) && (!m_pIconFile->Skip()) )
		m_pIconFile->readFromFile(*File, m_pIconFile->GetDataSize());
	else
		File->seek(4 + m_pIconFile->GetDataSize());
 
	delete File;
}
 
void CBaseFile::_install_adjustFakePatches(CPackages *pPackages)
{
	CyStringList lPatches;
	int startfake = pPackages->FindNextFakePatch();
 

}
 
bool CBaseFile::_install_uncompress(C_File *fit, CProgressInfo *progress, CyStringList *errorStr, bool *uncomprToFile)
{
	*uncomprToFile = false;
	_sLastError = fit->getNameDirectory(this);
	_iLastError = SPKERR_UNCOMPRESS;
 
	if ( !fit->UncompressData ( progress ) )
	{
		CLog::log(CLog::Log_Install, 2, "Failed to uncompress data, attempting file decompression");
		if ( fit->GetCompressionType() == SPKCOMPRESS_7ZIP )

		}
 
		if ( !uncomprToFile )
		{
			if ( errorStr )
				errorStr->PushBack(CyString(_sLastError), ERRORLOG_OLD(SPKINSTALL_UNCOMPRESS_FAIL));
			CLog::log(CLog::Log_Install, 1, "Unable to decompress file, skipping");
			return false;
		}
	}
	ClearError ();

		C_File *cFile;
		for ( cFile = pFileList->First(); cFile; cFile = pFileList->Next() )
		{
			if ( !cFile->MatchFile(pFile) ) continue;
			if ( !m_bOverrideFiles && !cFile->CompareNew(pFile) ) {
				if ( errorStr ) errorStr->PushBack(pFile->GetNameDirectory(this), ERRORLOG_OLD(SPKINSTALL_SKIPFILE));
				CLog::log(CLog::Log_Install, 1, "Newer version of the file already installed, skipping");
				*bDoFile = false;
			}
			break;
		}

		else {
			CyString to = pCheckFile->GetDirectory(this);
			CDirIO Dir(sDestination);
			if ( !Dir.exists(to.ToString()) ) {
				if ( !Dir.Create ( to ) ) {
					if ( errorStr )	errorStr->PushBack(to, ERRORLOG_OLD(SPKINSTALL_CREATEDIRECTORY_FAIL));
					return false;
				}
				if ( errorStr )	errorStr->PushBack(to, ERRORLOG_OLD(SPKINSTALL_CREATEDIRECTORY));
			}
 
			CyString destfile = CyString(sDestination) + "/" + pCheckFile->GetNameDirectory(this);
			if ( CFileIO(destfile).ExistsOld() ) CFileIO::Remove(destfile.ToString());
			CLog::logf(CLog::Log_Install, 1, "Adjusting existing filename, %s => %s", pCheckFile->GetFilePointer().c_str(), destfile.c_str());
			rename ( pCheckFile->GetFilePointer().c_str(), destfile.c_str() );
			pCheckFile->SetFilename ( CyString(sDestination) + "/" + pCheckFile->GetNameDirectory(this) );
		}
		pCheckFile->SetDisabled(false);
 
		if ( errorStr ) errorStr->PushBack(pCheckFile->GetNameDirectory(this), ERRORLOG_OLD(SPKINSTALL_ENABLEFILE));
	}
 
	return true;
}
 
bool CBaseFile::_install_createDirectory(CDirIO &Dir, const Utils::String &sTo, C_File *pFile, CyStringList *errorStr)
{
	_sLastError = sTo;
	if ( !sTo.contains( "::" ) )
	{
		if ( !Dir.exists(sTo) )
		{
			CLog::logf(CLog::Log_Install, 2, "Creating directory to install file into, %s", sTo.c_str());
			if ( !Dir.Create(sTo) )
			{
				if ( errorStr )
					errorStr->PushBack(CyString(sTo), ERRORLOG_OLD(SPKINSTALL_CREATEDIRECTORY_FAIL));
				return false;
			}
			if ( errorStr )
				errorStr->PushBack(CyString(sTo), ERRORLOG_OLD(SPKINSTALL_CREATEDIRECTORY));
		}
	}
	else {
		CLog::logf(CLog::Log_Install, 2, "Adjusting file extension for file in mod, %s => %s", pFile->filePointer().c_str(), CCatFile::PckChangeExtension(pFile->filePointer()).c_str());
		pFile->setFilename(CCatFile::PckChangeExtension(pFile->filePointer()));
	}
 
	return true;
}
 
void CBaseFile::_install_writeFile(C_File *pFile, const Utils::String &sDestination, CyStringList *errorStr)
{
	_iLastError = SPKERR_WRITEFILE;
	_sLastError = pFile->filePointer();
	Utils::String sInstalledFile = pFile->getNameDirectory(this);
	if ( pFile->IsDisabled() )
	{
		sInstalledFile = pFile->filePointer().findRemove(sDestination);
		if ( sInstalledFile[0] == '/' || sInstalledFile[0] == '\\' )
			sInstalledFile.erase(0, 1);
	}
 
	if ( !pFile->writeFilePointer() )
	{
		CLog::log(CLog::Log_Install, 1, "Failed to write the file");
		if ( errorStr )
			errorStr->PushBack(CyString(sInstalledFile), ERRORLOG_OLD(SPKINSTALL_WRITEFILE_FAIL));
	}
	else
	{
		CLog::log(CLog::Log_Install, 1, "File written successfully");
		CLog::log(CLog::Log_Install, 2, "Checking signed status of the file");
		pFile->UpdateSigned();
		if ( errorStr )
			errorStr->PushBack(CyString(sInstalledFile), ERRORLOG_OLD(SPKINSTALL_WRITEFILE));
 
		switch(pFile->GetFileType())
		{
			case FILETYPE_SCRIPT:
			case FILETYPE_UNINSTALL:

						if ( rFile.exists() )
						{
							if ( errorStr )
							{
								if ( rFile.remove() )
									errorStr->PushBack(cFile->GetFilePointer().Remove(destdir), ERRORLOG_OLD(SPKINSTALL_DELETEFILE));
								else
									errorStr->PushBack(cFile->GetFilePointer().Remove(destdir), ERRORLOG_OLD(SPKINSTALL_DELETEFILE_FAIL));
							}
						}
						cFile->SetFilename(fit->GetFilePointer());
						cFile->SetDisabled(true);
					}

		if ( dofile )
		{
			// uncompressed to file, rename and move
			if ( uncomprToFile )
			{
				_iLastError = SPKERR_WRITEFILE;
				Utils::String to = fit->getDirectory(this);
				if ( !fileEnabled )	to = "PluginManager/Disabled/" + to;
 
				if ( !_install_createDirectory(Dir, to, fit, errorStr) ) {
					bFailed = true;
					continue;
				}
 
				int err = 1;
				_sLastError = to;
				if ( !fit->GetTempFile ().Empty() )	err = rename ( fit->GetTempFile().c_str(), to.c_str() );
				if ( err ) {
					bFailed = true;
					continue;
				}

				if ( (filelist) && (adjustPointer) ) {
					adjustPointer->CopyData(fit, false);
					CLog::log(CLog::Log_Install, 2, "Copying data into existing file");
				}
 
				Utils::String fpointer = fit->filePointer();
				_iLastError = SPKERR_CREATEDIRECTORY;
				Utils::String dir = CFileIO(fit->;filePointer()).dir();
 
				dir = dir.findRemove(destdir.ToString());
				if ( dir[0] == '/' || dir[0] == '\\' ) dir.erase(0, 1);
 
				if ( !_install_createDirectory(Dir, dir, fit, errorStr) ) {
					bFailed = true;
					continue;
				}
 
				_install_writeFile(fit, destdir.ToString(), errorStr);

		}
	}
 
	if (dir.Compare("NULL")) {
		dir = Utils::String::Null();
	}
 
	file->setFileType(type);
	file->SetCreationTime ( time );
	file->SetName ( name );
	file->SetDir ( dir );

 
	// file mismatch
	long numfiles = m_lFiles.size();
	if ( m_pIconFile ) ++numfiles;
	if ( m_SHeader2.iNumFiles != numfiles ) {
		_iLastError = SPKERR_FILEMISMATCH;
		return false;
	}
 
	// update the progress for each section
	if ( readtype != SPKREAD_ALL && progress )	progress->UpdateProgress(6, maxProgress);

 
	// now were in the file section
	// skip past each one
	if (m_pIconFile) File->seek(4 + m_pIconFile->GetDataSize());
 
	for (CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next()) 
	{
		C_File *fit = node->Data();
 
		if ((!fit->GetDataSize()) || (!fit->GetData())) 
		{
			if (!fit->readFromFile(*File, fit->GetDataSize())) 
				return false;
		}
		else
			File->seek(fit->GetDataSize());
 
		if (game && !fit->isForGame(game))
			continue;
 
		if (progress)	
			progress->UpdateFile(fit);
 
		CDirIO Dir(dir);
		Utils::String addonDir;
		if (fit->isFileInAddon())
		{

					if (first)
						first = false;
					else
						s += "|";
					s += CBaseFile::ConvertGameToString(i);
				}
			}
		}
 
		s += " " + name;
		if(!files.contains(s))
			files.pushBack(s, f->Data()->GetFileTypeString().ToString());
	}

	filename = filename.findReplace("$CDATE", cdate);
	filename = filename.findReplace("$VERSION", this->version());
 
	return filename;
}
bool CBaseFile::LoadPackageData(const Utils::String &sFirst, const Utils::String &sRest, const Utils::String &sMainGame, Utils::CStringList &otherGames, Utils::CStringList &gameAddons, CProgressInfo *progress)
{
	if (sFirst.Compare("Name"))					this->setName(sRest);
	else if (sFirst.Compare("Author"))			this->setAuthor(sRest);
	else if (sFirst.Compare("ScriptName"))
		AddLanguageName(ParseLanguage(sRest.token(" ", 1)), sRest.tokens(" ", 2));
	else if (sFirst.Compare("UninstallBefore"))	this->addUninstallText(ParseLanguage(sRest.token(" ", 1)), true, sRest.tokens(" ", 2));
	else if (sFirst.Compare("UninstallAfter"))	this->addUninstallText(ParseLanguage(sRest.token(" ", 1)), false, sRest.tokens(" ", 2));
	else if (sFirst.Compare("InstallBefore"))		this->addInstallText(ParseLanguage(sRest.token(" ", 1)), true, sRest.tokens(" ", 2));
	else if (sFirst.Compare("InstallAfter"))		this->addInstallText(ParseLanguage(sRest.token(" ", 1)), false, sRest.tokens(" ", 2));
	else if (sFirst.Compare("Date"))				this->setCreationDate(sRest);
	else if (sFirst.Compare("Version"))			this->setVersion(sRest);
	else if (sFirst.Compare("GameVersion"))
		this->AddGameCompatability(-1, sRest);
	else if (sFirst.Compare("PluginType")) {
		if (sRest.isNumber())						this->setPluginType(sRest);
		else if (sRest.Compare("Normal"))			this->setPluginType(PLUGIN_NORMAL);
		else if (sRest.Compare("Stable"))			this->setPluginType(PLUGIN_STABLE);
		else if (sRest.Compare("Experimental"))	this->setPluginType(PLUGIN_EXPERIMENTAL);
		else if (sRest.Compare("Cheat"))			this->setPluginType(PLUGIN_CHEAT);
		else if (sRest.Compare("Mod"))			this->setPluginType(PLUGIN_MOD);
	}
	// new version
	else if (sFirst.Compare("GenerateUpdateFile"))
		m_bAutoGenerateUpdateFile = true;
	else if (sFirst.Compare("Game"))
	{
		Utils::String sGame = sRest.token(" ", 1);
		this->AddGameCompatability(CBaseFile::GetGameFromString(sGame), sRest.token(" ", 2));
	}
	else if (sFirst.Compare("Description"))		this->setDescription(sRest);
	else if (sFirst.Compare("AutoSave") || sFirst.Compare("AutoExport") || sFirst.Compare(";AutoRarExport") || sFirst.Compare("AutoZipExport"))
	{
		Utils::String filename = _replaceFilename(sRest);
 
		if (sFirst.Compare("AutoZipExport") || sFirst.Compare(";AutoExport"))
			this->setExportFilename(CFileIO(filename).changeFileExtension("zip"));
		else if (sFirst.Compare("AutoRarExport"))
			this->setExportFilename(CFileIO(filename).changeFileExtension("rar"));
		else
			this->setFilename(filename);
	}
	else if (sFirst.Compare("WebSite"))		this->setWebSite(sRest);
	else if (sFirst.Compare("ForumLink") || sFirst.Compare(";Forum")) this->setForumLink(sRest);
	else if (sFirst.Compare("Email"))			this->setEmail(sRest);
	else if (sFirst.Compare("WebAddress"))	this->setWebAddress(sRest);
	else if (sFirst.Compare("WebMirror"))
		this->AddWebMirror(sRest);
	else if (sFirst.Compare("WebMirror1"))
		this->AddWebMirror(sRest);
	else if (sFirst.Compare("WebMirror2"))
		this->AddWebMirror(sRest);
	else if (sFirst.Compare("Ftp"))
		m_sFtpAddr = sRest;
	else if (sFirst.Compare("Ratings"))		_setRatings(sRest.token(" ", 1), sRest.token(" ", 2), sRest.token(" ", 3));
	else if (sFirst.Compare("EaseOfUse"))		setEaseOfUse(sRest);
	else if (sFirst.Compare("GameChanging"))	setGameChanging(sRest);
	else if (sFirst.Compare("Recommended"))	setRecommended(sRest);
	else if (sFirst.Compare("Depend"))
	{
		Utils::String version = sRest.token("|", 2);
		Utils::String name = sRest.token("|", 1);
		Utils::String author = sRest.tokens("|", 3);
 
		this->AddNeededLibrary(name, author, version);
	}
	else if (sFirst.Compare("DependPackage"))
	{
		CPackages p;
		CBaseFile *spk = p.OpenPackage(sRest, 0, 0, SPKREAD_VALUES);
		if (spk)
		{
			this->AddNeededLibrary(spk->name(), spk->author(), spk->version());
			delete spk;
		}
	}
	else if (sFirst.Compare("Icon"))
	{
		C_File *icon = new C_File(sRest.c_str());
		if (icon->ReadFromFile())
			this->SetIcon(icon, CFileIO(sRest).GetFileExtension());
	}
	else if (sFirst.Compare("CombineGameFiles"))
		_bCombineFiles = sRest.Compare("true") || sRest.Compare("yes") || sRest.toInt();
	else if (sFirst.Compare("UpdateFile"))
		this->createUpdateFile(sRest);
	else if (sFirst.Compare("ExportZip"))
	{
		Utils::String ext = "zip";
		Utils::String game = sRest.word(1);
		Utils::String file = _replaceFilename(CFileIO(sRest.words(2)).fullFilename());
		if (game.contains("|"))
		{
			int max;
			Utils::String *games = game.tokenise("|", &max);
			if (games)
			{
				for (int i = 0; i < max; ++i)
				{
					unsigned int g = CBaseFile::GetGameFromString(games[i]);

		}
 
		// now check type name
		FileType filetype = GetFileTypeFromString(checkType);
		if (filetype != FILETYPE_UNKNOWN)
			this->AddFileScript(filetype, shared, sRest, sMainGame, otherGames, gameAddons, progress);
		else if ( !checkType.Compare("changelog") )
			return false;
	}
 
	return true;
}
 
void CBaseFile::AddFileScript(FileType filetype, bool shared, CyString sRest, const Utils::String &sMainGame, Utils::CStringList &otherGames, Utils::CStringList &gameAddons, CProgressInfo *progress)
{
	Utils::String dir;
	Utils::String rest = sRest.ToString();
 
	unsigned int mainGame = CBaseFile::GetGameFromString(sMainGame);

						for(Utils::String g = otherGames.firstString(); !g.empty(); g = otherGames.nextString()) {
							Utils::String checkDir = F.dir() + "/" + g;
							if ( CDirIO(checkDir).exists(F.filename()) ) {
								addGame = mainGame;
								C_File *newfile = this->AppendFile(CDirIO(checkDir).File(F.filename()), filetype, CBaseFile::GetGameFromString(g), dir);
								if (newfile && progress)
									progress->UpdateFile(newfile);
								if ( newfile ) newfile->SetShared(shared);
							}
						}
					}
 
					C_File *newfile = this->AppendFile(file, filetype, addGame, dir);
					if (newfile && progress)
						progress->UpdateFile(newfile);
					if ( newfile )
						newfile->SetShared(shared);
				}
			}
			delete dirList;

			for(Utils::String g = otherGames.firstString(); !g.empty(); g = otherGames.nextString()) {
				Utils::String checkDir = F.dir() + "/" + g;
				if ( CDirIO(checkDir).exists(F.filename()) ) {
					addGame = mainGame;
					C_File *newfile = this->AppendFile(CDirIO(checkDir).file(F.filename()), filetype, CBaseFile::GetGameFromString(g), dir);
					if (newfile && progress)
						progress->UpdateFile(newfile);
					if ( newfile ) newfile->SetShared(shared);
				}
			}
		}
 

		}
 
		if(!file)
			file = this->AppendFile(rest, filetype, addGame, dir);
 
		if (file && progress)
			progress->UpdateFile(file);
		if (file)
			file->SetShared(shared);
	}
}
 

		if ( match )
			match->ChangeBaseName(baseName);
	}
 
	// need to edit the file
	if (f->GetFileType() == FILETYPE_SCRIPT || f->GetFileType() == FILETYPE_UNINSTALL)
		f->RenameScript(baseName);
 
	f->ChangeBaseName(baseName);
}
 
Utils::String CBaseFile::createUpdateFile(const Utils::String &dir) const
{
	Utils::String file = this->getNameValidFile() + "_" + this->author() + ".dat";
	file.removeChar(' ');
 
	Utils::CStringList write;
	write.pushBack("Package: " + this->name());
	write.pushBack("Author: " + this->author());
	write.pushBack("Version: " + this->version());
	write.pushBack("File: " + CFileIO(this->filename()).filename());
 
	CFileIO File(dir + "/" + file);
	if (File.writeFile(&write))
		return File.fullFilename();
	return Utils::String::Null();
}
 
Utils::String CBaseFile::ErrorString(int error, const Utils::String &errorStr)
{
	if (error == SPKERR_NONE) return Utils::String::Null();
 
	Utils::String err;
 
	switch (error)
	{
	case SPKERR_MALLOC:
		err = "Memory Failed";

	case SPKERR_FILEMISMATCH:
		err = "File count mismatch";
		break;
	}
 
	if (!err.empty())
	{
		if (!errorStr.empty())
		{
			err += " (";
			err += errorStr + ")";
		}
		return err;
	}
 
	return Utils::String::Number((long)error);
}
 
bool CBaseFile::SaveToArchive(CyString filename, int game, const CGameExe *exes, CProgressInfo *progress)
{
	return saveToArchive(filename.ToString(), game, exes, progress);

Rev 131	Rev 134
Line 215...	Line 215...
215	`name.removeChar('?');`	215	`name.removeChar('?');`
216	`name.removeChar('"');`	216	`name.removeChar('"');`
217	`name.removeChar('<');`	217	`name.removeChar('<');`
218	`name.removeChar('>');`	218	`name.removeChar('>');`
219	`name.removeChar('\|');`	219	`name.removeChar('\|');`
220	`return name;`	-
221	`}`	-
222	`CyString CBaseFile::GetNameValidFile()`	-
223	`{`	-
224	`CyString name = this->name();`	-
225	`name.RemoveChar ( ':' );`	-
226	`name.RemoveChar ( '/' );`	-
227	`name.RemoveChar ( '\\' );`	-
228	`name.RemoveChar ( '*' );`	-
229	`name.RemoveChar ( '?' );`	-
230	`name.RemoveChar ( '"' );`	-
231	`name.RemoveChar ( '<' );`	-
232	`name.RemoveChar ( '>' );`	-
233	`name.RemoveChar ( '\|' );`	-
234	`return name;`	220	`return name;`
235	`}`	221	`}`
236		222
237	`void CBaseFile::SwitchFilePointer(C_File oldFile, C_File newFile)`	223	`void CBaseFile::SwitchFilePointer(C_File oldFile, C_File newFile)`
238	`{`	224	`{`
239	`for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() )`	225	`for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() )`
240	`{`	226	`{`
241	`C_File *f = node->Data();`	227	`C_File *f = node->Data();`
242	`if ( f == oldFile )`	228	`if ( f == oldFile )`
243	`{`	229	`{`
244	`node->ChangeData(newFile);`	230	`node->ChangeData(newFile);`
245	`break;`	231	`break;`
246	`}`	232	`}`
247	`}`	233	`}`
248	`}`	234	`}`
249		235
250	`bool CBaseFile::AnyFileType ( int type )`	236	`bool CBaseFile::AnyFileType ( int type )`
251	`{`	237	`{`
252	`for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() )`	238	`for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() )`
253	`{`	239	`{`
254	`C_File *f = node->Data();`	240	`C_File *f = node->Data();`
255	`if ( f->GetFileType() == type )`	241	`if ( f->GetFileType() == type )`
256	`return true;`	242	`return true;`
257	`}`	243	`}`
258		244
259	`return false;`	245	`return false;`
260	`}`	246	`}`
261		247
262	`void CBaseFile::AddFile ( C_File *file )`	248	`void CBaseFile::AddFile ( C_File *file )`
263	`{`	249	`{`
264	`for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() )`	250	`for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() )`
265	`{`	251	`{`
266	`C_File *f = node->Data();`	252	`C_File *f = node->Data();`
267	`if ( f->fileType() != file->fileType() )`	253	`if ( f->fileType() != file->fileType() )`
268	`continue;`	254	`continue;`
269	`if ( f->name() != file->name () )`	255	`if ( f->name() != file->name () )`
270	`continue;`	256	`continue;`
271	`if ( f->GetDir() != file->GetDir() )`	257	`if ( f->GetDir() != file->GetDir() )`
272	`continue;`	258	`continue;`
273	`if ( f->game() != file->game() )`	259	`if ( f->game() != file->game() )`
274	`continue;`	260	`continue;`
275		261
276	`m_lFiles.remove(node, true);`	262	`m_lFiles.remove(node, true);`
277	`break;`	263	`break;`
278	`}`	264	`}`
279		265
280	`_addFile(file);`	266	`_addFile(file);`
281	`}`	267	`}`
282		268
283	`C_File *CBaseFile::AddFile(CyString file, CyString dir, int type, int game)`	269	`C_File *CBaseFile::AddFile(CyString file, CyString dir, int type, int game)`
284	`{`	270	`{`
Line 297...	Line 283...
297	`C_File *f = node->Data();`	283	`C_File *f = node->Data();`
298	`if ( f->fileType() != newfile->fileType() )`	284	`if ( f->fileType() != newfile->fileType() )`
299	`continue;`	285	`continue;`
300	`if ( f->name() != newfile->name () )`	286	`if ( f->name() != newfile->name () )`
301	`continue;`	287	`continue;`
302	`if ( f->GetDir() != newfile->GetDir() )`	288	`if ( f->dir() != newfile->dir() )`
303	`continue;`	289	`continue;`
304	`if (f->game() != newfile->game())`	290	`if (f->game() != newfile->game())`
305	`{`	291	`{`
306	`//same file, for different game, check if they are the same and combine them`	292	`//same file, for different game, check if they are the same and combine them`
307	`if (_bCombineFiles)`	293	`if (_bCombineFiles)`
Line 360...	Line 346...
360	`}`	346	`}`
361		347
362	`// must already exist, delete this one`	348	`// must already exist, delete this one`
363	`m_lFiles.remove(node, true);`	349	`m_lFiles.remove(node, true);`
364	`break;`	350	`break;`
365	`}`	351	`}`
366		352
367	`_addFile(newfile);`	353	`_addFile(newfile);`
368		354
369	`return newfile;`	355	`return newfile;`
370	`}`	356	`}`
371		357
372	`bool CBaseFile::AddFileNow ( CyString file, CyString dir, int type, CProgressInfo *progress )`	358	`bool CBaseFile::AddFileNow ( CyString file, CyString dir, int type, CProgressInfo *progress )`
373	`{`	359	`{`
374	`C_File *f = AddFile ( file, dir, type );`	360	`C_File *f = AddFile ( file, dir, type );`
375	`if ( !f->ReadFromFile () )`	361	`if ( !f->ReadFromFile () )`
376	`return false;`	362	`return false;`
377		363
378	`// compress the file`	364	`// compress the file`
Line 389...	Line 375...
389	`// read the file into memory`	375	`// read the file into memory`
390	`if ( newfile->ReadFromFile () )`	376	`if ( newfile->ReadFromFile () )`
391	`{`	377	`{`
392	`// now compress the file`	378	`// now compress the file`
393	`if ( newfile->CompressData ( m_SHeader2.iDataCompression, progress ) )`	379	`if ( newfile->CompressData ( m_SHeader2.iDataCompression, progress ) )`
394	`return newfile;`	380	`return newfile;`
395	`}`	381	`}`
396	`else if ( newfile->GetLastError() == SPKERR_MALLOC )`	382	`else if ( newfile->GetLastError() == SPKERR_MALLOC )`
397	`{`	383	`{`
398	`if ( newfile->CompressFile ( progress ) )`	384	`if ( newfile->CompressFile ( progress ) )`
399	`return newfile;`	385	`return newfile;`
Line 404...	Line 390...
404		390
405	`return NULL;`	391	`return NULL;`
406	`}`	392	`}`
407		393
408	`C_File *CBaseFile::FindFileAt ( int filetype, int pos )`	394	`C_File *CBaseFile::FindFileAt ( int filetype, int pos )`
409	`{`	395	`{`
410	`int count = 0;`	396	`int count = 0;`
411	`for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() )`	397	`for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() )`
412	`{`	398	`{`
413	`C_File *file = node->Data();`	399	`C_File *file = node->Data();`
414	`if ( file->GetFileType() != filetype )`	400	`if ( file->GetFileType() != filetype )`
415	`continue;`	401	`continue;`
Line 492...	Line 478...
492	`return;`	478	`return;`
493		479
494	`for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() )`	480	`for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() )`
495	`{`	481	`{`
496	`if (game == 0 && node->Data()->game() && node->Data()->game() != GAME_ALLNEW)`	482	`if (game == 0 && node->Data()->game() && node->Data()->game() != GAME_ALLNEW)`
497	`continue;`	483	`continue;`
498	`if ( game > -1 )`	484	`if ( game > -1 )`
499	`{`	485	`{`
500	`unsigned int fileGame = node->Data()->game() & ~GAME_ALLNEW;`	486	`unsigned int fileGame = node->Data()->game() & ~GAME_ALLNEW;`
501	`if (fileGame != (1 << game))`	487	`if (fileGame != (1 << game))`
502	`{`	488	`{`
Line 506...	Line 492...
506	`continue;`	492	`continue;`
507	`}`	493	`}`
508	`}`	494	`}`
509	`if ( type == FILETYPE_UNKNOWN \|\| node->Data()->GetFileType() == type )`	495	`if ( type == FILETYPE_UNKNOWN \|\| node->Data()->GetFileType() == type )`
510	`node->DeleteData();`	496	`node->DeleteData();`
511	`}`	497	`}`
512		498
513	`m_lFiles.RemoveEmpty();`	499	`m_lFiles.RemoveEmpty();`
514		500
515	`_changed();`	501	`_changed();`
516	`}`	502	`}`
517		503
518	`void CBaseFile::RecompressAllFiles ( int type, CProgressInfo *progress )`	504	`void CBaseFile::RecompressAllFiles ( int type, CProgressInfo *progress )`
Line 530...	Line 516...
530	`file->ReadFromFile();`	516	`file->ReadFromFile();`
531		517
532	`file->ChangeCompression ( type, progress );`	518	`file->ChangeCompression ( type, progress );`
533	`}`	519	`}`
534	`}`	520	`}`
535		521
536	`void CBaseFile::CompressAllFiles ( int type, CProgressInfo progress, CProgressInfo overallProgress, int level )`	522	`void CBaseFile::CompressAllFiles ( int type, CProgressInfo progress, CProgressInfo overallProgress, int level )`
537	`{`	523	`{`
538	`if ( overallProgress ) overallProgress->SetMax(m_lFiles.size());`	524	`if ( overallProgress ) overallProgress->SetMax(m_lFiles.size());`
539		525
540	`int iCount = 0;`	526	`int iCount = 0;`
541	`for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() )`	527	`for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() )`
542	`{`	528	`{`
543	`C_File *file = node->Data();`	529	`C_File *file = node->Data();`
544	`if ( progress )`	530	`if ( progress )`
545	`progress->UpdateFile(file);`	531	`progress->UpdateFile(file);`
546		532
Line 557...	Line 543...
557	`{`	543	`{`
558	`int countFile = 0;`	544	`int countFile = 0;`
559	`for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() )`	545	`for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() )`
560	`{`	546	`{`
561	`C_File *fit = node->Data();`	547	`C_File *fit = node->Data();`
562	`if ( progress )`	548	`if ( progress )`
563	`{`	549	`{`
564	`progress->UpdateFile ( fit );`	550	`progress->UpdateFile ( fit );`
565	`progress->UpdateProgress(countFile++, m_lFiles.size());`	551	`progress->UpdateProgress(countFile++, m_lFiles.size());`
566	`}`	552	`}`
567		553
568	`bool uncomprToFile = false;`	554	`bool uncomprToFile = false;`
Line 580...	Line 566...
580	`return false;`	566	`return false;`
581	`else`	567	`else`
582	`{`	568	`{`
583	`uncomprToFile = true;`	569	`uncomprToFile = true;`
584	`fit->SetFullDir("temp");`	570	`fit->SetFullDir("temp");`
585	`}`	571	`}`
586	`}`	572	`}`
587		573
588	`if (!uncomprToFile)`	574	`if (!uncomprToFile)`
589	`return false;`	575	`return false;`
590	`}`	576	`}`
Line 666...	Line 652...
666	`if ( n->iLanguage == lang )`	652	`if ( n->iLanguage == lang )`
667	`{`	653	`{`
668	`m_lNames.RemoveCurrent();`	654	`m_lNames.RemoveCurrent();`
669	`delete n;`	655	`delete n;`
670	`_changed();`	656	`_changed();`
671	`}`	657	`}`
672	`}`	658	`}`
673	`}`	659	`}`
674		660
675	`void CBaseFile::AddLanguageName ( int lang, const Utils::String &name )`	661	`void CBaseFile::AddLanguageName ( int lang, const Utils::String &name )`
676	`{`	662	`{`
Line 927...	Line 913...
927		913
928	`if ( (!m_pIconFile->GetData()) && (!m_pIconFile->Skip()) )`	914	`if ( (!m_pIconFile->GetData()) && (!m_pIconFile->Skip()) )`
929	`m_pIconFile->readFromFile(*File, m_pIconFile->GetDataSize());`	915	`m_pIconFile->readFromFile(*File, m_pIconFile->GetDataSize());`
930	`else`	916	`else`
931	`File->seek(4 + m_pIconFile->GetDataSize());`	917	`File->seek(4 + m_pIconFile->GetDataSize());`
932		918
933	`delete File;`	919	`delete File;`
934	`}`	920	`}`
935		921
936	`void CBaseFile::_install_adjustFakePatches(CPackages *pPackages)`	922	`void CBaseFile::_install_adjustFakePatches(CPackages *pPackages)`
937	`{`	923	`{`
938	`CyStringList lPatches;`	924	`CyStringList lPatches;`
939	`int startfake = pPackages->FindNextFakePatch();`	925	`int startfake = pPackages->FindNextFakePatch();`
940		926
Line 1008...	Line 994...
1008	`}`	994	`}`
1009		995
1010	`bool CBaseFile::_install_uncompress(C_File fit, CProgressInfo progress, CyStringList errorStr, bool uncomprToFile)`	996	`bool CBaseFile::_install_uncompress(C_File fit, CProgressInfo progress, CyStringList errorStr, bool uncomprToFile)`
1011	`{`	997	`{`
1012	`*uncomprToFile = false;`	998	`*uncomprToFile = false;`
1013	`m_sLastError = fit->GetNameDirectory(this);`	999	`_sLastError = fit->getNameDirectory(this);`
1014	`m_iLastError = SPKERR_UNCOMPRESS;`	1000	`_iLastError = SPKERR_UNCOMPRESS;`
1015		1001
1016	`if ( !fit->UncompressData ( progress ) )`	1002	`if ( !fit->UncompressData ( progress ) )`
1017	`{`	1003	`{`
1018	`CLog::log(CLog::Log_Install, 2, "Failed to uncompress data, attempting file decompression");`	1004	`CLog::log(CLog::Log_Install, 2, "Failed to uncompress data, attempting file decompression");`
1019	`if ( fit->GetCompressionType() == SPKCOMPRESS_7ZIP )`	1005	`if ( fit->GetCompressionType() == SPKCOMPRESS_7ZIP )`
Line 1023...	Line 1009...
1023	`}`	1009	`}`
1024		1010
1025	`if ( !uncomprToFile )`	1011	`if ( !uncomprToFile )`
1026	`{`	1012	`{`
1027	`if ( errorStr )`	1013	`if ( errorStr )`
1028	`errorStr->PushBack(m_sLastError, ERRORLOG(SPKINSTALL_UNCOMPRESS_FAIL));`	1014	`errorStr->PushBack(CyString(_sLastError), ERRORLOG_OLD(SPKINSTALL_UNCOMPRESS_FAIL));`
1029	`CLog::log(CLog::Log_Install, 1, "Unable to decompress file, skipping");`	1015	`CLog::log(CLog::Log_Install, 1, "Unable to decompress file, skipping");`
1030	`return false;`	1016	`return false;`
1031	`}`	1017	`}`
1032	`}`	1018	`}`
1033	`ClearError ();`	1019	`ClearError ();`
Line 1103...	Line 1089...
1103	`C_File *cFile;`	1089	`C_File *cFile;`
1104	`for ( cFile = pFileList->First(); cFile; cFile = pFileList->Next() )`	1090	`for ( cFile = pFileList->First(); cFile; cFile = pFileList->Next() )`
1105	`{`	1091	`{`
1106	`if ( !cFile->MatchFile(pFile) ) continue;`	1092	`if ( !cFile->MatchFile(pFile) ) continue;`
1107	`if ( !m_bOverrideFiles && !cFile->CompareNew(pFile) ) {`	1093	`if ( !m_bOverrideFiles && !cFile->CompareNew(pFile) ) {`
1108	`if ( errorStr ) errorStr->PushBack(pFile->GetNameDirectory(this), ERRORLOG(SPKINSTALL_SKIPFILE));`	1094	`if ( errorStr ) errorStr->PushBack(pFile->GetNameDirectory(this), ERRORLOG_OLD(SPKINSTALL_SKIPFILE));`
1109	`CLog::log(CLog::Log_Install, 1, "Newer version of the file already installed, skipping");`	1095	`CLog::log(CLog::Log_Install, 1, "Newer version of the file already installed, skipping");`
1110	`*bDoFile = false;`	1096	`*bDoFile = false;`
1111	`}`	1097	`}`
1112	`break;`	1098	`break;`
1113	`}`	1099	`}`
Line 1154...	Line 1140...
1154	`else {`	1140	`else {`
1155	`CyString to = pCheckFile->GetDirectory(this);`	1141	`CyString to = pCheckFile->GetDirectory(this);`
1156	`CDirIO Dir(sDestination);`	1142	`CDirIO Dir(sDestination);`
1157	`if ( !Dir.exists(to.ToString()) ) {`	1143	`if ( !Dir.exists(to.ToString()) ) {`
1158	`if ( !Dir.Create ( to ) ) {`	1144	`if ( !Dir.Create ( to ) ) {`
1159	`if ( errorStr ) errorStr->PushBack(to, ERRORLOG(SPKINSTALL_CREATEDIRECTORY_FAIL));`	1145	`if ( errorStr ) errorStr->PushBack(to, ERRORLOG_OLD(SPKINSTALL_CREATEDIRECTORY_FAIL));`
1160	`return false;`	1146	`return false;`
1161	`}`	1147	`}`
1162	`if ( errorStr ) errorStr->PushBack(to, ERRORLOG(SPKINSTALL_CREATEDIRECTORY));`	1148	`if ( errorStr ) errorStr->PushBack(to, ERRORLOG_OLD(SPKINSTALL_CREATEDIRECTORY));`
1163	`}`	1149	`}`
1164		1150
1165	`CyString destfile = CyString(sDestination) + "/" + pCheckFile->GetNameDirectory(this);`	1151	`CyString destfile = CyString(sDestination) + "/" + pCheckFile->GetNameDirectory(this);`
1166	`if ( CFileIO(destfile).ExistsOld() ) CFileIO::Remove(destfile.ToString());`	1152	`if ( CFileIO(destfile).ExistsOld() ) CFileIO::Remove(destfile.ToString());`
1167	`CLog::logf(CLog::Log_Install, 1, "Adjusting existing filename, %s => %s", pCheckFile->GetFilePointer().c_str(), destfile.c_str());`	1153	`CLog::logf(CLog::Log_Install, 1, "Adjusting existing filename, %s => %s", pCheckFile->GetFilePointer().c_str(), destfile.c_str());`
1168	`rename ( pCheckFile->GetFilePointer().c_str(), destfile.c_str() );`	1154	`rename ( pCheckFile->GetFilePointer().c_str(), destfile.c_str() );`
1169	`pCheckFile->SetFilename ( CyString(sDestination) + "/" + pCheckFile->GetNameDirectory(this) );`	1155	`pCheckFile->SetFilename ( CyString(sDestination) + "/" + pCheckFile->GetNameDirectory(this) );`
1170	`}`	1156	`}`
1171	`pCheckFile->SetDisabled(false);`	1157	`pCheckFile->SetDisabled(false);`
1172		1158
1173	`if ( errorStr ) errorStr->PushBack(pCheckFile->GetNameDirectory(this), ERRORLOG(SPKINSTALL_ENABLEFILE));`	1159	`if ( errorStr ) errorStr->PushBack(pCheckFile->GetNameDirectory(this), ERRORLOG_OLD(SPKINSTALL_ENABLEFILE));`
1174	`}`	1160	`}`
1175		1161
1176	`return true;`	1162	`return true;`
1177	`}`	1163	`}`
1178		1164
1179	`bool CBaseFile::_install_createDirectory(CDirIO &Dir, const Utils::String &sTo, C_File pFile, CyStringList errorStr)`	1165	`bool CBaseFile::_install_createDirectory(CDirIO &Dir, const Utils::String &sTo, C_File pFile, CyStringList errorStr)`
1180	`{`	1166	`{`
1181	`m_sLastError = sTo;`	1167	`_sLastError = sTo;`
1182	`if ( !sTo.isin ( "::" ) )`	1168	`if ( !sTo.contains( "::" ) )`
1183	`{`	1169	`{`
1184	`if ( !Dir.exists(sTo) )`	1170	`if ( !Dir.exists(sTo) )`
1185	`{`	1171	`{`
1186	`CLog::logf(CLog::Log_Install, 2, "Creating directory to install file into, %s", sTo.c_str());`	1172	`CLog::logf(CLog::Log_Install, 2, "Creating directory to install file into, %s", sTo.c_str());`
1187	`if ( !Dir.Create(sTo) )`	1173	`if ( !Dir.Create(sTo) )`
1188	`{`	1174	`{`
1189	`if ( errorStr )`	1175	`if ( errorStr )`
1190	`errorStr->PushBack(CyString(sTo), ERRORLOG(SPKINSTALL_CREATEDIRECTORY_FAIL));`	1176	`errorStr->PushBack(CyString(sTo), ERRORLOG_OLD(SPKINSTALL_CREATEDIRECTORY_FAIL));`
1191	`return false;`	1177	`return false;`
1192	`}`	1178	`}`
1193	`if ( errorStr )`	1179	`if ( errorStr )`
1194	`errorStr->PushBack(CyString(sTo), ERRORLOG(SPKINSTALL_CREATEDIRECTORY));`	1180	`errorStr->PushBack(CyString(sTo), ERRORLOG_OLD(SPKINSTALL_CREATEDIRECTORY));`
1195	`}`	1181	`}`
1196	`}`	1182	`}`
1197	`else {`	1183	`else {`
1198	`CLog::logf(CLog::Log_Install, 2, "Adjusting file extension for file in mod, %s => %s", pFile->filePointer().c_str(), CCatFile::PckChangeExtension(pFile->filePointer()).c_str());`	1184	`CLog::logf(CLog::Log_Install, 2, "Adjusting file extension for file in mod, %s => %s", pFile->filePointer().c_str(), CCatFile::PckChangeExtension(pFile->filePointer()).c_str());`
1199	`pFile->SetFilename(CCatFile::PckChangeExtension(pFile->filePointer()));`	1185	`pFile->setFilename(CCatFile::PckChangeExtension(pFile->filePointer()));`
1200	`}`	1186	`}`
1201		1187
1202	`return true;`	1188	`return true;`
1203	`}`	1189	`}`
1204		1190
1205	`void CBaseFile::_install_writeFile(C_File pFile, const Utils::String &sDestination, CyStringList errorStr)`	1191	`void CBaseFile::_install_writeFile(C_File pFile, const Utils::String &sDestination, CyStringList errorStr)`
1206	`{`	1192	`{`
1207	`m_iLastError = SPKERR_WRITEFILE;`	1193	`_iLastError = SPKERR_WRITEFILE;`
1208	`m_sLastError = pFile->GetFilePointer();`	1194	`_sLastError = pFile->filePointer();`
1209	`CyString sInstalledFile = pFile->GetNameDirectory(this);`	1195	`Utils::String sInstalledFile = pFile->getNameDirectory(this);`
1210	`if ( pFile->IsDisabled() )`	1196	`if ( pFile->IsDisabled() )`
1211	`{`	1197	`{`
1212	`sInstalledFile = pFile->GetFilePointer().Remove(sDestination);`	1198	`sInstalledFile = pFile->filePointer().findRemove(sDestination);`
1213	`if ( sInstalledFile[0] == '/' \|\| sInstalledFile[0] == '\\' )`	1199	`if ( sInstalledFile[0] == '/' \|\| sInstalledFile[0] == '\\' )`
1214	`sInstalledFile.Erase(0, 1);`	1200	`sInstalledFile.erase(0, 1);`
1215	`}`	1201	`}`
1216		1202
1217	`if ( !pFile->writeFilePointer() )`	1203	`if ( !pFile->writeFilePointer() )`
1218	`{`	1204	`{`
1219	`CLog::log(CLog::Log_Install, 1, "Failed to write the file");`	1205	`CLog::log(CLog::Log_Install, 1, "Failed to write the file");`
1220	`if ( errorStr )`	1206	`if ( errorStr )`
1221	`errorStr->PushBack(sInstalledFile, ERRORLOG(SPKINSTALL_WRITEFILE_FAIL));`	1207	`errorStr->PushBack(CyString(sInstalledFile), ERRORLOG_OLD(SPKINSTALL_WRITEFILE_FAIL));`
1222	`}`	1208	`}`
1223	`else`	1209	`else`
1224	`{`	1210	`{`
1225	`CLog::log(CLog::Log_Install, 1, "File written successfully");`	1211	`CLog::log(CLog::Log_Install, 1, "File written successfully");`
1226	`CLog::log(CLog::Log_Install, 2, "Checking signed status of the file");`	1212	`CLog::log(CLog::Log_Install, 2, "Checking signed status of the file");`
1227	`pFile->UpdateSigned();`	1213	`pFile->UpdateSigned();`
1228	`if ( errorStr )`	1214	`if ( errorStr )`
1229	`errorStr->PushBack(sInstalledFile, ERRORLOG(SPKINSTALL_WRITEFILE));`	1215	`errorStr->PushBack(CyString(sInstalledFile), ERRORLOG_OLD(SPKINSTALL_WRITEFILE));`
1230		1216
1231	`switch(pFile->GetFileType())`	1217	`switch(pFile->GetFileType())`
1232	`{`	1218	`{`
1233	`case FILETYPE_SCRIPT:`	1219	`case FILETYPE_SCRIPT:`
1234	`case FILETYPE_UNINSTALL:`	1220	`case FILETYPE_UNINSTALL:`
Line 1308...	Line 1294...
1308	`if ( rFile.exists() )`	1294	`if ( rFile.exists() )`
1309	`{`	1295	`{`
1310	`if ( errorStr )`	1296	`if ( errorStr )`
1311	`{`	1297	`{`
1312	`if ( rFile.remove() )`	1298	`if ( rFile.remove() )`
1313	`errorStr->PushBack(cFile->GetFilePointer().Remove(destdir), ERRORLOG(SPKINSTALL_DELETEFILE));`	1299	`errorStr->PushBack(cFile->GetFilePointer().Remove(destdir), ERRORLOG_OLD(SPKINSTALL_DELETEFILE));`
1314	`else`	1300	`else`
1315	`errorStr->PushBack(cFile->GetFilePointer().Remove(destdir), ERRORLOG(SPKINSTALL_DELETEFILE_FAIL));`	1301	`errorStr->PushBack(cFile->GetFilePointer().Remove(destdir), ERRORLOG_OLD(SPKINSTALL_DELETEFILE_FAIL));`
1316	`}`	1302	`}`
1317	`}`	1303	`}`
1318	`cFile->SetFilename(fit->GetFilePointer());`	1304	`cFile->SetFilename(fit->GetFilePointer());`
1319	`cFile->SetDisabled(true);`	1305	`cFile->SetDisabled(true);`
1320	`}`	1306	`}`
Line 1340...	Line 1326...
1340	`if ( dofile )`	1326	`if ( dofile )`
1341	`{`	1327	`{`
1342	`// uncompressed to file, rename and move`	1328	`// uncompressed to file, rename and move`
1343	`if ( uncomprToFile )`	1329	`if ( uncomprToFile )`
1344	`{`	1330	`{`
1345	`m_iLastError = SPKERR_WRITEFILE;`	1331	`_iLastError = SPKERR_WRITEFILE;`
1346	`CyString to = fit->GetDirectory(this);`	1332	`Utils::String to = fit->getDirectory(this);`
1347	`if ( !fileEnabled ) to = CyString("PluginManager/Disabled/") + to;`	1333	`if ( !fileEnabled ) to = "PluginManager/Disabled/" + to;`
1348		1334
1349	`if ( !_install_createDirectory(Dir, to.ToString(), fit, errorStr) ) {`	1335	`if ( !_install_createDirectory(Dir, to, fit, errorStr) ) {`
1350	`bFailed = true;`	1336	`bFailed = true;`
1351	`continue;`	1337	`continue;`
1352	`}`	1338	`}`
1353		1339
1354	`int err = 1;`	1340	`int err = 1;`
1355	`m_sLastError = to;`	1341	`_sLastError = to;`
1356	`if ( !fit->GetTempFile ().Empty() ) err = rename ( fit->GetTempFile().c_str(), to.c_str() );`	1342	`if ( !fit->GetTempFile ().Empty() ) err = rename ( fit->GetTempFile().c_str(), to.c_str() );`
1357	`if ( err ) {`	1343	`if ( err ) {`
1358	`bFailed = true;`	1344	`bFailed = true;`
1359	`continue;`	1345	`continue;`
1360	`}`	1346	`}`
Line 1366...	Line 1352...
1366	`if ( (filelist) && (adjustPointer) ) {`	1352	`if ( (filelist) && (adjustPointer) ) {`
1367	`adjustPointer->CopyData(fit, false);`	1353	`adjustPointer->CopyData(fit, false);`
1368	`CLog::log(CLog::Log_Install, 2, "Copying data into existing file");`	1354	`CLog::log(CLog::Log_Install, 2, "Copying data into existing file");`
1369	`}`	1355	`}`
1370		1356
1371	`CyString fpointer = fit->GetFilePointer();`	1357	`Utils::String fpointer = fit->filePointer();`
1372	`m_iLastError = SPKERR_CREATEDIRECTORY;`	1358	`_iLastError = SPKERR_CREATEDIRECTORY;`
1373	`CyString dir = fit->GetFilePointer().GetToken ( "/", 1, fit->;GetFilePointer().NumToken("/") - 1 );`	1359	`Utils::String dir = CFileIO(fit->;filePointer()).dir();`
1374		1360
1375	`dir = dir.Remove(destdir);`	1361	`dir = dir.findRemove(destdir.ToString());`
1376	`if ( dir[0] == '/' \|\| dir[0] == '\\' ) dir.Erase(0, 1);`	1362	`if ( dir[0] == '/' \|\| dir[0] == '\\' ) dir.erase(0, 1);`
1377		1363
1378	`if ( !_install_createDirectory(Dir, dir.ToString(), fit, errorStr) ) {`	1364	`if ( !_install_createDirectory(Dir, dir, fit, errorStr) ) {`
1379	`bFailed = true;`	1365	`bFailed = true;`
1380	`continue;`	1366	`continue;`
1381	`}`	1367	`}`
1382		1368
1383	`_install_writeFile(fit, destdir.ToString(), errorStr);`	1369	`_install_writeFile(fit, destdir.ToString(), errorStr);`
Line 1662...	Line 1648...
1662	`}`	1648	`}`
1663	`}`	1649	`}`
1664		1650
1665	`if (dir.Compare("NULL")) {`	1651	`if (dir.Compare("NULL")) {`
1666	`dir = Utils::String::Null();`	1652	`dir = Utils::String::Null();`
1667	`}`	1653	`}`
1668		1654
1669	`file->setFileType(type);`	1655	`file->setFileType(type);`
1670	`file->SetCreationTime ( time );`	1656	`file->SetCreationTime ( time );`
1671	`file->SetName ( name );`	1657	`file->SetName ( name );`
1672	`file->SetDir ( dir );`	1658	`file->SetDir ( dir );`
Line 1866...	Line 1852...
1866		1852
1867	`// file mismatch`	1853	`// file mismatch`
1868	`long numfiles = m_lFiles.size();`	1854	`long numfiles = m_lFiles.size();`
1869	`if ( m_pIconFile ) ++numfiles;`	1855	`if ( m_pIconFile ) ++numfiles;`
1870	`if ( m_SHeader2.iNumFiles != numfiles ) {`	1856	`if ( m_SHeader2.iNumFiles != numfiles ) {`
1871	`m_iLastError = SPKERR_FILEMISMATCH;`	1857	`_iLastError = SPKERR_FILEMISMATCH;`
1872	`return false;`	1858	`return false;`
1873	`}`	1859	`}`
1874		1860
1875	`// update the progress for each section`	1861	`// update the progress for each section`
1876	`if ( readtype != SPKREAD_ALL && progress ) progress->UpdateProgress(6, maxProgress);`	1862	`if ( readtype != SPKREAD_ALL && progress ) progress->UpdateProgress(6, maxProgress);`
Line 2279...	Line 2265...
2279		2265
2280	`// now were in the file section`	2266	`// now were in the file section`
2281	`// skip past each one`	2267	`// skip past each one`
2282	`if (m_pIconFile) File->seek(4 + m_pIconFile->GetDataSize());`	2268	`if (m_pIconFile) File->seek(4 + m_pIconFile->GetDataSize());`
2283		2269
2284	`for (CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next()) {`	2270	`for (CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next())`
-		2271	`{`
2285	`C_File *fit = node->Data();`	2272	`C_File *fit = node->Data();`
2286		2273
2287	`if (progress) progress->UpdateFile(fit);`	2274	`if ((!fit->GetDataSize()) \|\| (!fit->GetData()))`
2288		2275	`{`
2289	`if ((!fit->GetDataSize()) \|\| (!fit->GetData())) {`	2276	`if (!fit->readFromFile(*File, fit->GetDataSize()))`
2290	`if (!fit->readFromFile(*File, fit->GetDataSize())) return false;`	2277	`return false;`
2291	`}`	2278	`}`
2292	`else`	2279	`else`
2293	`File->seek(fit->GetDataSize());`	2280	`File->seek(fit->GetDataSize());`
2294		2281
2295	`if (game && !fit->isForGame(game))`	2282	`if (game && !fit->isForGame(game))`
2296	`continue;`	2283	`continue;`
-		2284
-		2285	`if (progress)`
-		2286	`progress->UpdateFile(fit);`
2297		2287
2298	`CDirIO Dir(dir);`	2288	`CDirIO Dir(dir);`
2299	`Utils::String addonDir;`	2289	`Utils::String addonDir;`
2300	`if (fit->isFileInAddon())`	2290	`if (fit->isFileInAddon())`
2301	`{`	2291	`{`
Line 2715...	Line 2705...
2715	`if (first)`	2705	`if (first)`
2716	`first = false;`	2706	`first = false;`
2717	`else`	2707	`else`
2718	`s += "\|";`	2708	`s += "\|";`
2719	`s += CBaseFile::ConvertGameToString(i);`	2709	`s += CBaseFile::ConvertGameToString(i);`
2720	`}`	2710	`}`
2721	`}`	2711	`}`
2722	`}`	2712	`}`
2723		2713
2724	`s += " " + name;`	2714	`s += " " + name;`
2725	`if(!files.contains(s))`	2715	`if(!files.contains(s))`
2726	`files.pushBack(s, f->Data()->GetFileTypeString().ToString());`	2716	`files.pushBack(s, f->Data()->GetFileTypeString().ToString());`
2727	`}`	2717	`}`
Line 2841...	Line 2831...
2841	`filename = filename.findReplace("$CDATE", cdate);`	2831	`filename = filename.findReplace("$CDATE", cdate);`
2842	`filename = filename.findReplace("$VERSION", this->version());`	2832	`filename = filename.findReplace("$VERSION", this->version());`
2843		2833
2844	`return filename;`	2834	`return filename;`
2845	`}`	2835	`}`
2846	`bool CBaseFile::LoadPackageData(const Utils::String &sFirst, const Utils::String &sRest, const Utils::String &sMainGame, Utils::CStringList &otherGames, Utils::CStringList &gameAddons)`	2836	`bool CBaseFile::LoadPackageData(const Utils::String &sFirst, const Utils::String &sRest, const Utils::String &sMainGame, Utils::CStringList &otherGames, Utils::CStringList &gameAddons, CProgressInfo *progress)`
2847	`{`	2837	`{`
2848	`if ( sFirst.Compare("Name") ) this->setName(sRest);`	2838	`if (sFirst.Compare("Name")) this->setName(sRest);`
2849	`else if ( sFirst.Compare("Author") ) this->setAuthor(sRest);`	2839	`else if (sFirst.Compare("Author")) this->setAuthor(sRest);`
2850	`else if ( sFirst.Compare("ScriptName") )`	2840	`else if (sFirst.Compare("ScriptName"))`
2851	`AddLanguageName(ParseLanguage(sRest.token(" ", 1)), sRest.tokens(" ", 2));`	2841	`AddLanguageName(ParseLanguage(sRest.token(" ", 1)), sRest.tokens(" ", 2));`
2852	`else if ( sFirst.Compare("UninstallBefore") ) this->addUninstallText(ParseLanguage(sRest.token(" ", 1)), true, sRest.tokens(" ", 2));`	2842	`else if (sFirst.Compare("UninstallBefore")) this->addUninstallText(ParseLanguage(sRest.token(" ", 1)), true, sRest.tokens(" ", 2));`
2853	`else if ( sFirst.Compare("UninstallAfter") ) this->addUninstallText(ParseLanguage(sRest.token(" ", 1)), false, sRest.tokens(" ", 2));`	2843	`else if (sFirst.Compare("UninstallAfter")) this->addUninstallText(ParseLanguage(sRest.token(" ", 1)), false, sRest.tokens(" ", 2));`
2854	`else if ( sFirst.Compare("InstallBefore") ) this->addInstallText(ParseLanguage(sRest.token(" ", 1)), true, sRest.tokens(" ", 2));`	2844	`else if (sFirst.Compare("InstallBefore")) this->addInstallText(ParseLanguage(sRest.token(" ", 1)), true, sRest.tokens(" ", 2));`
2855	`else if ( sFirst.Compare("InstallAfter") ) this->addInstallText(ParseLanguage(sRest.token(" ", 1)), false, sRest.tokens(" ", 2));`	2845	`else if (sFirst.Compare("InstallAfter")) this->addInstallText(ParseLanguage(sRest.token(" ", 1)), false, sRest.tokens(" ", 2));`
2856	`else if ( sFirst.Compare("Date") ) this->setCreationDate(sRest);`	2846	`else if (sFirst.Compare("Date")) this->setCreationDate(sRest);`
2857	`else if ( sFirst.Compare("Version") ) this->setVersion(sRest);`	2847	`else if (sFirst.Compare("Version")) this->setVersion(sRest);`
2858	`else if ( sFirst.Compare("GameVersion") )`	2848	`else if (sFirst.Compare("GameVersion"))`
2859	`this->AddGameCompatability(-1, sRest);`	2849	`this->AddGameCompatability(-1, sRest);`
2860	`else if ( sFirst.Compare("PluginType") ) {`	2850	`else if (sFirst.Compare("PluginType")) {`
2861	`if ( sRest.isNumber() ) this->setPluginType(sRest);`	2851	`if (sRest.isNumber()) this->setPluginType(sRest);`
2862	`else if ( sRest.Compare("Normal") ) this->setPluginType(PLUGIN_NORMAL);`	2852	`else if (sRest.Compare("Normal")) this->setPluginType(PLUGIN_NORMAL);`
2863	`else if ( sRest.Compare("Stable") ) this->setPluginType(PLUGIN_STABLE);`	2853	`else if (sRest.Compare("Stable")) this->setPluginType(PLUGIN_STABLE);`
2864	`else if ( sRest.Compare("Experimental") ) this->setPluginType(PLUGIN_EXPERIMENTAL);`	2854	`else if (sRest.Compare("Experimental")) this->setPluginType(PLUGIN_EXPERIMENTAL);`
2865	`else if ( sRest.Compare("Cheat") ) this->setPluginType(PLUGIN_CHEAT);`	2855	`else if (sRest.Compare("Cheat")) this->setPluginType(PLUGIN_CHEAT);`
2866	`else if ( sRest.Compare("Mod") ) this->setPluginType(PLUGIN_MOD);`	2856	`else if (sRest.Compare("Mod")) this->setPluginType(PLUGIN_MOD);`
2867	`}`	2857	`}`
2868	`// new version`	2858	`// new version`
2869	`else if ( sFirst.Compare("GenerateUpdateFile") )`	2859	`else if (sFirst.Compare("GenerateUpdateFile"))`
2870	`m_bAutoGenerateUpdateFile = true;`	2860	`m_bAutoGenerateUpdateFile = true;`
2871	`else if ( sFirst.Compare("Game") )`	2861	`else if (sFirst.Compare("Game"))`
2872	`{`	2862	`{`
2873	`Utils::String sGame = sRest.token(" ", 1);`	2863	`Utils::String sGame = sRest.token(" ", 1);`
2874	`this->AddGameCompatability(CBaseFile::GetGameFromString(sGame), sRest.token(" ", 2));`	2864	`this->AddGameCompatability(CBaseFile::GetGameFromString(sGame), sRest.token(" ", 2));`
2875	`}`	2865	`}`

Subversion Repositories spk

(root)/libspk/src/BaseFile.cpp – Rev 131 → 134