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

+	}
 	fclose ( id );
+}
-bool CBaseFile::InstallFiles ( CyString destdir, CProgressInfo *progress, CLinkList<C_File> *filelist, CyStringList *errorStr, bool enabled, CPackages *packages )
+void CBaseFile::_install_adjustFakePatches(CPackages *pPackages)
+{
-	// first rename any fake patches
 	CyStringList lPatches;
+	int startfake = pPackages->FindNextFakePatch();
+	for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() )
+	{
+		C_File *fit = node->Data();
+		// only do fake patchs
+		if ( !fit->IsFakePatch() )
+			continue;
+		// we should only have cat and dat files, but lets check just incase they have been added incorrectly
+		if ( !fit->CheckFileExt ("cat") && !fit->CheckFileExt("dat") )
+			continue;
+		// search for the name on the list
+		SStringList *opposite = lPatches.FindString(fit->GetBaseName());
+		CyString newname;
+		if ( opposite )
+			newname = opposite->data;
+		else
+		{
+			newname = CyString::Number((long)startfake).PadNumber(2);
+			lPatches.PushBack(fit->GetBaseName(), newname);
+		}
+		// rename the file
+		fit->FixOriginalName();
+		fit->SetName ( newname + "." + fit->GetFileExt() );
+		// find the next gap
+		if ( !opposite ) {
+			startfake = pPackages->FindNextFakePatch(startfake + 1);
+		}
+	}
+}
+bool CBaseFile::InstallFiles ( CyString destdir, CProgressInfo *progress, CLinkList<C_File> *filelist, CyStringList *errorStr, bool enabled, CPackages *packages )
+{
 	if ( enabled )
+	{
-		int startfake = 1;
+/*		int startfake = packages->FindNextFakePatch();
 		while ( startfake < 99 )
+		{
 			CyString filename = destdir;
 			if ( !filename.Empty() )
 				filename += "/";
+					}
 					startfake++;
+				}
+			}
+		}
+		*/
+		this->_install_adjustFakePatches(packages);
-		// find renable text file
+		// find renameable text file
 		if ( packages )
+		{
-			int starttext = 3;
+			int starttext = packages->FindNextTextFile();
+			/*
 			while ( starttext < 9999 )
+			{
 				CyString filename = destdir;
 				if ( !filename.Empty() )
 					filename += "/t/";
+				{
 					if ( !CFileIO(filename + ".pck").Exists() )
 						break;
+				}
 				starttext++;
-			}
+			}*/
 			for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() )
+			{
 				C_File *fit = node->Data();
 				if ( !fit->IsAutoTextFile() )
 		ClearError ();
 		bool dofile = true;
 		// new check if we should install the file
 		// first get the version
-		if ( fit->ReadScriptVersion () && !m_bOverrideFiles )
+		if ( !m_bOverrideFiles && fit->ReadScriptVersion() )
+		{
 			C_File checkfile;
 			CyString checkfilename = destdir;
 			if ( !checkfilename.Empty() )
 				checkfilename += "/";
 	Return: Boolean - If string is a valid header
 	Desc:   Splits up the main header string to get all required settings
 */
 bool CBaseFile::ParseHeader ( CyString header )
+{
-	if ( !this->CheckHeader(header.GetToken ( 1, ';' )) )
+	if ( !this->CheckHeader(header.GetToken ( 1, ';' ).ToString()) )
 		return false;
 	m_SHeader.fVersion = header.GetToken ( 2, ';' ).ToFloat();
 	if ( m_SHeader.fVersion > FILEVERSION )
 		return false;
 	m_SHeader.lValueCompressSize = header.GetToken ( 4, ';' ).ToLong();
 	return true;
+}
-bool CBaseFile::CheckHeader ( CyString header )
+bool CBaseFile::CheckHeader(const Utils::String header) const
+{
 	if ( header.Compare("BaseCycrow") )
 		return true;
 	return false;
+}
 	Func:   ParseValueLine
 	Input:  String - single line from a file to set
 	Return: Boolean - returns true if value exists
 	Desc:   Reads the line and assigns the parameters for the file
 */
-bool CBaseFile::ParseValueLine ( CyString line )
+bool CBaseFile::ParseValueLine(const Utils::String &sLine)
+{
-	CyString first = line.GetToken ( 1, ' ' );
+	Utils::String first = sLine.token(" ", 1);
-	CyString rest  = line.GetToken ( 2, -1, ' ' );
+	Utils::String rest  = sLine.tokens(" ", 2);
-	if ( first == "Name:" )
+	if ( first.Compare("Name:") )
 		m_sName = rest;
-	else if ( first == "Author:" )
+	else if ( first.Compare("Author:") )
 		m_sAuthor = rest;
-	else if ( first == "Version:" )
+	else if ( first.Compare("Version:") )
 		m_sVersion = rest;
-	else if ( first == "fGameVersion:" ) {
+	else if ( first.Compare("fGameVersion:") ) {
 		if ( m_lGames.Back() ) {
 			m_lGames.Back()->Data()->sVersion = rest;
+		}
+	}
-	else if ( first == "GameVersion:" ) {
+	else if ( first.Compare("GameVersion:") ) {
 		if ( m_lGames.Back() ) {
-			m_lGames.Back()->Data()->iVersion = rest.ToInt();
+			m_lGames.Back()->Data()->iVersion = rest;
+		}
+	}
-	else if ( first == "Game:" )
+	else if ( first.Compare("Game:") )
-		this->AddGameCompatability(rest.ToInt(), NullString);
+		this->AddGameCompatability(rest, NullString);
-	else if ( first == "GameCompat:" )
+	else if ( first.Compare("GameCompat:") )
-		this->AddGameCompatability(rest.GetToken(" ", 1, 1).ToInt(), rest.GetToken(" ", 2, 2));
+		this->AddGameCompatability(rest.token(" ", 1), rest.tokens(" ", 2));
-	else if ( first == "GameCompatExact:" )
+	else if ( first.Compare("GameCompatExact:") )
-		this->AddGameCompatability(rest.GetToken(" ", 1, 1).ToInt(), rest.GetToken(" ", 2));
+		this->AddGameCompatability(rest.token(" ", 1), rest.tokens(" ", 2));
-	else if ( first == "Date:" )
+	else if ( first.Compare("Date:") )
 		m_sCreationDate = rest;
-	else if ( first == "WebAddress:" )
+	else if ( first.Compare("WebAddress:") )
 		m_sWebAddress = rest;
-	else if ( first == "WebSite:" )
+	else if ( first.Compare("WebSite:") )
 		m_sWebSite = rest;
-	else if ( first == "Email:" )
+	else if ( first.Compare("Email:") )
 		m_sEmail = rest;
-	else if ( first == "WebMirror1:" || first == "Mirror1:" || first == "WebMirror:" )
+	else if ( first.Compare("WebMirror1:") || first.Compare("Mirror1:") || first.Compare("WebMirror:") )
 		this->AddWebMirror(rest);
-	else if ( first == "WebMirror2:" || first == "Mirror2:" )
+	else if ( first.Compare("WebMirror2:") || first.Compare("Mirror2:") )
 		this->AddWebMirror(rest);
-	else if ( first == "PluginType:" )
+	else if ( first.Compare("PluginType:") )
-		m_iPluginType = rest.ToInt();
+		m_iPluginType = rest;
-	else if ( first == "Desc:" )
+	else if ( first.Compare("Desc:") )
+	{
 		m_sDescription = rest;
 		m_sDescription.RemoveFirstChar('\n');
 		m_sDescription.RemoveFirstChar('\r');
 		m_sDescription.RemoveFirstSpace();
 				m_sDescription = firstStr + lastStr;
+			}
+		}
+	}
-	else if ( first == "UninstallAfter:" )
+	else if ( first.Compare("UninstallAfter:") )
-		AddUninstallAfterText ( ParseInstallText(rest.GetToken ( 1, '|' )), rest.GetToken ( 2, -1, '|' ) );
+		AddUninstallAfterText(ParseInstallText(rest.token("|", 1)), rest.tokens("|", 2));
-	else if ( first == "UninstallBefore:" )
+	else if ( first.Compare("UninstallBefore:") )
-		AddUninstallBeforeText ( ParseInstallText(rest.GetToken ( 1, '|' )), rest.GetToken ( 2, -1, '|' ) );
+		AddUninstallBeforeText(ParseInstallText(rest.token("|", 1)), rest.tokens("|", 2));
-	else if ( first == "InstallAfter:" )
+	else if ( first.Compare("InstallAfter:") )
-		AddInstallAfterText ( ParseInstallText(rest.GetToken ( 1, '|' )), rest.GetToken ( 2, -1, '|' ) );
+		AddInstallAfterText(ParseInstallText(rest.token("|", 1)), rest.tokens("|", 2));
-	else if ( first == "InstallBefore:" )
+	else if ( first.Compare("InstallBefore:") )
-		AddInstallBeforeText ( ParseInstallText(rest.GetToken ( 1, '|' )), rest.GetToken ( 2, -1, '|' ) );
+		AddInstallBeforeText(ParseInstallText(rest.token("|", 1)), rest.tokens("|", 2));
-	else if ( first == "ScriptName:" )
+	else if ( first.Compare("ScriptName:") )
-		AddLanguageName ( ParseLanguage(rest.GetToken ( 1, ':' )),  rest.GetToken ( 2, -1, ':' ) );
+		AddLanguageName(ParseLanguage(rest.token(":", 1)), rest.token(":", 2));
-	else if ( first == "GameChanging:" )
+	else if ( first.Compare("GameChanging:") )
-		m_iGameChanging = rest.ToInt();
+		m_iGameChanging = rest;
-	else if ( first == "EaseOfUse:" )
+	else if ( first.Compare("EaseOfUse:") )
-		m_iEaseOfUse = rest.ToInt();
+		m_iEaseOfUse = rest;
-	else if ( first == "Recommended:" )
+	else if ( first.Compare("Recommended:") )
-		m_iRecommended = rest.ToInt();
+		m_iRecommended = rest;
-	else if ( first == "NeededLibrary:" )
+	else if ( first.Compare("NeededLibrary:") )
-		this->AddNeededLibrary(rest.GetToken("||", 1, 1), rest.GetToken("||", 2, 2), rest.GetToken("||", 3, 3));
+		this->AddNeededLibrary(rest.token("||", 1), rest.token("||", 2), rest.token("||", 3));
-	else if ( first == "FakePatchBefore:" )
+	else if ( first.Compare("FakePatchBefore:") )
-		this->AddFakePatchOrder(false, rest.GetToken("||", 1, 1), rest.GetToken("||", 2, 2));
+		this->AddFakePatchOrder(false, rest.token("||", 1), rest.token("||", 2));
-	else if ( first == "FakePatchAfter:" )
+	else if ( first.Compare("FakePatchAfter:") )
-		this->AddFakePatchOrder(true, rest.GetToken("||", 1, 1), rest.GetToken("||", 2, 2));
+		this->AddFakePatchOrder(true, rest.token("||", 1), rest.token("||", 2));
-	else if ( first == "ForumLink:" )
+	else if ( first.Compare("ForumLink:") )
 		m_sForumLink = rest;
 	else
 		return false;
 	return true;
+{
 	int num = 0;
 	CyString *lines = values.SplitToken ( '\n', &num );
 	for ( int i = 0; i < num; i++ )
-		ParseValueLine ( lines[i] );
+		ParseValueLine ( lines[i].ToString() );
 	CLEANSPLIT(lines, num)
+}
 /*
+	}
 	return false;
+}
-CyString CBaseFile::CreateValuesLine ()
+Utils::String CBaseFile::CreateValuesLine () const
+{
-	CyString values ( "Name: " );
+	Utils::String values("Name: ");
-	values += (m_sName + "\n");
+	values += Utils::String(m_sName.ToString()) + "\n";
-	values += (CyString("Author: ") + m_sAuthor + "\n");
+	values += Utils::String("Author: ") + m_sAuthor.ToString() + "\n";
-	values += (CyString("Version: ") + m_sVersion + "\n");
+	values += Utils::String("Version: ") + m_sVersion.ToString() + "\n";
 	if ( !m_sCreationDate.Empty() )
-		values += (CyString("Date: ") + m_sCreationDate + "\n");
+		values += Utils::String("Date: ") + m_sCreationDate.ToString() + "\n";
 	if ( !m_sWebAddress.Empty() )
-		values += (CyString("WebAddress: ") + m_sWebAddress + "\n");
+		values += Utils::String("WebAddress: ") + m_sWebAddress.ToString() + "\n";
 	if ( !m_sWebSite.Empty() )
-		values += (CyString("WebSite: ") + m_sWebSite + "\n");
+		values += Utils::String("WebSite: ") + m_sWebSite.ToString() + "\n";
 	if ( !m_sEmail.Empty() )
-		values += (CyString("Email: ") + m_sEmail + "\n");
+		values += Utils::String("Email: ") + m_sEmail.ToString() + "\n";
 	for ( SStringList *str = m_lMirrors.Head(); str; str = str->next )
-		values += (CyString("WebMirror: ") + str->str + "\n");
+		values += Utils::String("WebMirror: ") + str->str.ToString() + "\n";
 	if ( !m_sDescription.Empty() )
+	{
-		CyString desc = m_sDescription;
+		Utils::String desc = m_sDescription.ToString();
-		desc = desc.FindReplace("<newline>", "<br>");
+		desc = desc.findReplace("<newline>", "<br>");
-		desc = desc.FindReplace("\n", "<br>");
+		desc = desc.findReplace("\n", "<br>");
-		desc.RemoveChar("\r");
+		desc.remove('\r');
-		values += (CyString("Desc: ") + desc + "\n");
+		values += "Desc: " + desc + "\n";
+	}
 	for ( CListNode<SGameCompat> *gc = m_lGames.Front(); gc; gc = gc->next() ) {
 		if ( !gc->Data()->sVersion.Empty() )
-			values += CyString("GameCompatExact: ") + (long)gc->Data()->iGame + " " + gc->Data()->sVersion + "\n";
+			values += Utils::String("GameCompatExact: ") + (long)gc->Data()->iGame + " " + gc->Data()->sVersion.ToString() + "\n";
 		else
-			values += CyString("GameCompat: ") + (long)gc->Data()->iGame + " " + (long)gc->Data()->iVersion + "\n";
+			values += Utils::String("GameCompat: ") + (long)gc->Data()->iGame + " " + (long)gc->Data()->iVersion + "\n";
+	}
 	if ( !m_sForumLink.Empty() )
-		values += (CyString("ForumLink: ") + m_sForumLink + "\n");
+		values += Utils::String("ForumLink: ") + m_sForumLink.ToString() + "\n";
 	if ( m_bSigned )
 		values += "Signed\n";
-	SInstallText *it;
+	CListNode<SInstallText> *it;
-	for ( it = m_lUninstallText.First(); it; it = m_lUninstallText.Next() )
+	for ( it = m_lUninstallText.Front(); it; it = it->next() ) {
-	{
-		if ( !it->sAfter.Empty() )
+		if ( !it->Data()->sAfter.Empty() )
-			values += (CyString("UninstallAfter: ") + CyString::Number(it->iLanguage) + "|" + it->sAfter + "\n");
+			values += (CyString("UninstallAfter: ") + CyString::Number(it->Data()->iLanguage) + "|" + it->Data()->sAfter + "\n").ToString();
-		if ( !it->sBefore.Empty() )
+		if ( !it->Data()->sBefore.Empty() )
-			values += (CyString("UninstallBefore: ") + CyString::Number(it->iLanguage) + "|" + it->sBefore + "\n");
+			values += (CyString("UninstallBefore: ") + CyString::Number(it->Data()->iLanguage) + "|" + it->Data()->sBefore + "\n").ToString();
 	}
-	for ( it = m_lInstallText.First(); it; it = m_lInstallText.Next() )
+	for ( it = m_lInstallText.Front(); it; it = it->next() ) {
-	{
-		if ( !it->sAfter.Empty() )
+		if ( !it->Data()->sAfter.Empty() )
-			values += (CyString("InstallAfter: ") + CyString::Number(it->iLanguage) + "|" + it->sAfter + "\n");
+			values += (CyString("InstallAfter: ") + CyString::Number(it->Data()->iLanguage) + "|" + it->Data()->sAfter + "\n").ToString();
-		if ( !it->sBefore.Empty() )
+		if ( !it->Data()->sBefore.Empty() )
-			values += (CyString("InstallBefore: ") + CyString::Number(it->iLanguage) + "|" + it->sBefore + "\n");
+			values += (CyString("InstallBefore: ") + CyString::Number(it->Data()->iLanguage) + "|" + it->Data()->sBefore + "\n").ToString();
 	}
-	values += CyString("GameChanging: ") + CyString::Number(m_iGameChanging) + "\n";
+	values += Utils::String("GameChanging: ") + (long)m_iGameChanging + "\n";
-	values += CyString("EaseOfUse: ") + CyString::Number(m_iEaseOfUse) + "\n";
+	values += Utils::String("EaseOfUse: ") + (long)m_iEaseOfUse + "\n";
-	values += CyString("Recommended: ") + CyString::Number(m_iRecommended) + "\n";
+	values += Utils::String("Recommended: ") + (long)m_iRecommended + "\n";
-	for ( SNames *sn = m_lNames.First(); sn; sn = m_lNames.Next() )
+	for ( CListNode<SNames> *nNode = m_lNames.Front(); nNode; nNode = nNode->next() )
-		values += CyString("ScriptName: ") + CyString::Number(sn->iLanguage) + ":" + sn->sName + "\n";
+		values += Utils::String("ScriptName: ") + (long)nNode->Data()->iLanguage + ":" + nNode->Data()->sName.ToString() + "\n";
-	for ( CListNode<SNeededLibrary> *libNode = m_lNeededLibrarys.Front(); libNode; libNode = libNode->next() )
+	for ( CListNode<SNeededLibrary> *libNode = m_lNeededLibrarys.Front(); libNode; libNode = libNode->next() ) {
-	{
 		SNeededLibrary *l = libNode->Data();
-		values += (CyString("NeededLibrary: ") + l->sName + "||" + l->sAuthor + "||" + l->sMinVersion + "\n");
+		values += (CyString("NeededLibrary: ") + l->sName + "||" + l->sAuthor + "||" + l->sMinVersion + "\n").ToString();
+	}
 	for ( SStringList *fpbNode = m_lFakePatchBefore.Head(); fpbNode; fpbNode = fpbNode->next )
-		values += (CyString("FakePatchBefore: ") + fpbNode->str + "||" + fpbNode->data + "\n");
+		values += (CyString("FakePatchBefore: ") + fpbNode->str + "||" + fpbNode->data + "\n").ToString();
 	for ( SStringList *fpaNode = m_lFakePatchAfter.Head(); fpaNode; fpaNode = fpaNode->next )
-		values += (CyString("FakePatchAfter: ") + fpaNode->str + "||" + fpaNode->data + "\n");
+		values += (CyString("FakePatchAfter: ") + fpaNode->str + "||" + fpaNode->data + "\n").ToString();
-	values += (CyString("PluginType: ") + (long)m_iPluginType + "\n");
+	values += Utils::String("PluginType: ") + (long)m_iPluginType + "\n";
 	return values;
+}
 	else
 		Found->iVersion = version.ToInt();
 	m_bChanged = true;
+}
-bool CBaseFile::LoadPackageData(CyString first, CyString rest)
+bool CBaseFile::LoadPackageData(const Utils::String &sFirst, const Utils::String &sRest)
+{
-	if ( first.Compare("Name") )
+	if ( sFirst.Compare("Name") )
-		m_sName = rest;
+		m_sName = sRest;
-	else if ( first.Compare("Author") )
+	else if ( sFirst.Compare("Author") )
-		m_sAuthor = rest;
+		m_sAuthor = sRest;
-	else if ( first.Compare("ScriptName") )
+	else if ( sFirst.Compare("ScriptName") )
-		AddLanguageName(ParseLanguage(rest.GetToken(" ", 1, 1)), rest.GetToken(" ", 2));
+		AddLanguageName(ParseLanguage(sRest.token(" ", 1)), sRest.tokens(" ", 2));
-	else if ( first.Compare("UninstallBefore") )
+	else if ( sFirst.Compare("UninstallBefore") )
-		this->AddUninstallBeforeText(ParseLanguage(rest.GetToken(" ", 1, 1)), rest.GetToken(" ", 2));
+		this->AddUninstallBeforeText(ParseLanguage(sRest.token(" ", 1)), sRest.tokens(" ", 2));
-	else if ( first.Compare("UninstallAfter") )
+	else if ( sFirst.Compare("UninstallAfter") )
-		this->AddUninstallAfterText(ParseLanguage(rest.GetToken(" ", 1, 1)), rest.GetToken(" ", 2));
+		this->AddUninstallAfterText(ParseLanguage(sRest.token(" ", 1)), sRest.tokens(" ", 2));
-	else if ( first.Compare("InstallBefore") )
+	else if ( sFirst.Compare("InstallBefore") )
-		this->AddInstallBeforeText(ParseLanguage(rest.GetToken(" ", 1, 1)), rest.GetToken(" ", 2));
+		this->AddInstallBeforeText(ParseLanguage(sRest.token(" ", 1)), sRest.tokens(" ", 2));
-	else if ( first.Compare("InstallAfter") )
+	else if ( sFirst.Compare("InstallAfter") )
-		this->AddInstallAfterText(ParseLanguage(rest.GetToken(" ", 1, 1)), rest.GetToken(" ", 2));
+		this->AddInstallAfterText(ParseLanguage(sRest.token(" ", 1)), sRest.tokens(" ", 2));
-	else if ( first.Compare("Date") )
+	else if ( sFirst.Compare("Date") )
-		m_sCreationDate = rest;
+		m_sCreationDate = sRest;
-	else if ( first.Compare("Version") )
+	else if ( sFirst.Compare("Version") )
-		m_sVersion = rest;
+		m_sVersion = sRest;
 	// old version
-	else if ( first.Compare("GameVersion") )
+	else if ( sFirst.Compare("GameVersion") )
-		this->AddGameCompatability(-1, rest);
+		this->AddGameCompatability(-1, sRest);
-	else if ( first.Compare("PluginType") )
+	else if ( sFirst.Compare("PluginType") )
 	{
-		if ( rest.IsNumber() )
+		if ( sRest.isNumber() )
-			this->SetPluginType(rest.ToInt());
+			this->SetPluginType(sRest);
-		else if ( rest.Compare("Normal") )
+		else if ( sRest.Compare("Normal") )
 			this->SetPluginType(PLUGIN_NORMAL);
-		else if ( rest.Compare("Stable") )
+		else if ( sRest.Compare("Stable") )
 			this->SetPluginType(PLUGIN_STABLE);
-		else if ( rest.Compare("Experimental") )
+		else if ( sRest.Compare("Experimental") )
 			this->SetPluginType(PLUGIN_EXPERIMENTAL);
-		else if ( rest.Compare("Cheat") )
+		else if ( sRest.Compare("Cheat") )
 			this->SetPluginType(PLUGIN_CHEAT);
-		else if ( rest.Compare("Mod") )
+		else if ( sRest.Compare("Mod") )
 			this->SetPluginType(PLUGIN_MOD);
+	}
 	// new version
-	else if ( first.Compare("GenerateUpdateFile") )
+	else if ( sFirst.Compare("GenerateUpdateFile") )
 		m_bAutoGenerateUpdateFile = true;
-	else if ( first.Compare("Game") )
+	else if ( sFirst.Compare("Game") )
+	{
-		Utils::String sGame = rest.GetToken(" ", 1, 1).ToString();
+		Utils::String sGame = sRest.token(" ", 1);
-		this->AddGameCompatability(CBaseFile::GetGameFromString(sGame), rest.GetToken(" ", 2, 2));
+		this->AddGameCompatability(CBaseFile::GetGameFromString(sGame), sRest.token(" ", 2));
+	}
-	else if ( first.Compare("Description") )
+	else if ( sFirst.Compare("Description") )
-		m_sDescription = rest;
+		m_sDescription = sRest;
-	else if ( first.Compare("AutoSave") || first.Compare("AutoExport") || first.Compare("AutoRarExport") || first.Compare("AutoZipExport") )
+	else if ( sFirst.Compare("AutoSave") || sFirst.Compare("AutoExport") || sFirst.Compare("AutoRarExport") || sFirst.Compare("AutoZipExport") )
+	{
-		CyString filename = rest;
+		CyString filename = sRest;
 		CyString name = m_sName;
 		CyString author = m_sAuthor;
 		CyString cdate = m_sCreationDate;
 		cdate = cdate.FindReplace("/", ".").Remove(" ");
 		if ( filename.IsIn("$AUTOSAVE") )
 		if ( filename.IsIn("$CDATE") )
 			filename.FindReplace("$CDATE", cdate);
 		if ( filename.IsIn("$VERSION") )
 			filename.FindReplace("$VERSION", m_sVersion);
-		if ( first.Compare("AutoZipExport") || first.Compare("AutoExport") )
+		if ( sFirst.Compare("AutoZipExport") || sFirst.Compare("AutoExport") )
 			m_sExportFilename = CFileIO(filename).ChangeFileExtension("zip");
-		else if ( first.Compare("AutoRarExport") )
+		else if ( sFirst.Compare("AutoRarExport") )
 			m_sExportFilename = CFileIO(filename).ChangeFileExtension("rar");
 		else
 			m_sFilename = filename;
+	}
-	else if ( first.Compare("WebSite") )
+	else if ( sFirst.Compare("WebSite") )
-		m_sWebSite = rest;
+		m_sWebSite = sRest;
-	else if ( first.Compare("ForumLink") || first.Compare("Forum") )
+	else if ( sFirst.Compare("ForumLink") || sFirst.Compare("Forum") )
-		m_sForumLink = rest;
+		m_sForumLink = sRest;
-	else if ( first.Compare("Email") )
+	else if ( sFirst.Compare("Email") )
-		m_sEmail = rest;
+		m_sEmail = sRest;
-	else if ( first.Compare("WebAddress") )
+	else if ( sFirst.Compare("WebAddress") )
-		m_sWebAddress = rest;
+		m_sWebAddress = sRest;
-	else if ( first.Compare("WebMirror") )
+	else if ( sFirst.Compare("WebMirror") )
-		this->AddWebMirror(rest);
+		this->AddWebMirror(sRest);
-	else if ( first.Compare("WebMirror1") )
+	else if ( sFirst.Compare("WebMirror1") )
-		this->AddWebMirror(rest);
+		this->AddWebMirror(sRest);
-	else if ( first.Compare("WebMirror2") )
+	else if ( sFirst.Compare("WebMirror2") )
-		this->AddWebMirror(rest);
+		this->AddWebMirror(sRest);
-	else if ( first.Compare("Ftp") )
+	else if ( sFirst.Compare("Ftp") )
-		m_sFtpAddr = rest;
+		m_sFtpAddr = sRest;
-	else if ( first.Compare("Ratings") )
+	else if ( sFirst.Compare("Ratings") )
 	{
-		m_iEaseOfUse = rest.GetToken(" ", 1, 1).ToInt();
+		m_iEaseOfUse = sRest.token(" ", 1);
-		m_iGameChanging = rest.GetToken(" ", 2, 2).ToInt();
+		m_iGameChanging = sRest.token(" ", 2);
-		m_iRecommended = rest.GetToken(" ", 3, 3).ToInt();
+		m_iRecommended = sRest.token(" ", 3);
 	}
-	else if ( first.Compare("EaseOfUse") )
+	else if ( sFirst.Compare("EaseOfUse") )
-		m_iEaseOfUse = rest.ToInt();
+		m_iEaseOfUse = sRest;
-	else if ( first.Compare("GameChanging") )
+	else if ( sFirst.Compare("GameChanging") )
-		m_iGameChanging = rest.ToInt();
+		m_iGameChanging = sRest;
-	else if ( first.Compare("Recommended") )
+	else if ( sFirst.Compare("Recommended") )
-		m_iRecommended = rest.ToInt();
+		m_iRecommended = sRest;
-	else if ( first.Compare("Depend") )
+	else if ( sFirst.Compare("Depend") )
 	{
-		CyString version = rest.GetToken("|", 2, 2);
+		CyString version = sRest.token("|", 2);
-		CyString name = rest.GetToken("|", 1, 1);
+		CyString name = sRest.token("|", 1);
-		CyString author = rest.GetToken("|", 3);
+		CyString author = sRest.tokens("|", 3);
 		this->AddNeededLibrary(name, author, version);
+	}
-	else if ( first.Compare("DependPackage") )
+	else if ( sFirst.Compare("DependPackage") )
+	{
 		CPackages p;
-		CBaseFile *spk =  p.OpenPackage(rest, 0, 0, SPKREAD_VALUES);
+		CBaseFile *spk =  p.OpenPackage(sRest, 0, 0, SPKREAD_VALUES);
 		if ( spk )
+		{
 			this->AddNeededLibrary(spk->GetName(), spk->GetAuthor(), spk->GetVersion());
 			delete spk;
+		}
+	}
-	else if ( first.Compare("Icon") )
+	else if ( sFirst.Compare("Icon") )
+	{
-		C_File *icon = new C_File(rest);
+		C_File *icon = new C_File(sRest.c_str());
 		if ( icon->ReadFromFile() )
-			this->SetIcon(icon, CFileIO(rest).GetFileExtension());
+			this->SetIcon(icon, CFileIO(sRest).GetFileExtension());
+	}
 	else
+	{
-		CyString checkType = first;
+		Utils::String checkType = sFirst;
 		bool shared = false;
-		if ( checkType.Left(6).Compare("Shared") )
+		if ( checkType.left(6).Compare("Shared") )
+		{
-			checkType = first.Right(-6);
+			checkType = sFirst.right(-6);
 			shared = true;
+		}
 		// now check type name
 		int filetype = GetFileTypeFromString(checkType);
 		if ( filetype != -1 )
-			this->AddFileScript(filetype, shared, rest);
+			this->AddFileScript(filetype, shared, sRest);
 		else if ( !checkType.Compare("changelog") )
 			return false;
+	}
 	return true;

Subversion Repositories spk

(root)/libspk/src/BaseFile.cpp – Rev 13 → 14