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



	Return: Boolean - returns true if value exists
	Desc:   Reads the line and assigns the parameters for the file
*/
bool CSpkFile::ParseValueLine ( CyString line )
{
	Utils::String first = line.GetToken ( 1, ' ' ).ToString();
	Utils::String rest  = line.GetToken ( 2, -1, ' ' ).ToString();
 
	if ( first == "AnotherMod:" )
	{
		m_sOtherAuthor = rest.token(&quot;|&quot;, 1);
		m_sOtherName = rest.tokens(&quot;|&quot;, 2);
	}
	else if ( line == "CustomStart" )
		m_iPackageType = PACKAGETYPE_CUSTOMSTART;
	else if ( line == "PackageUpdate" )
		m_iPackageType = PACKAGETYPE_UPDATE;

	else if ( line == "Signed" )
		m_bSigned = true;
	else if ( first == "ScriptType:" )
		m_sScriptType = rest;
	else if ( first == "ScriptTypeNew:" )
		m_iScriptType = rest;
	else if ( first == "PackageType:" )
		m_iPackageType = rest;
	else if ( first == "Ware:" )
		AddWare ( rest );
	else if ( (first == "WareText:") && (m_pLastWare) )
		AddWareText ( rest );
	else if ( first == "Setting:" )
	{
		SSettingType *t = AddSetting ( rest.token("|&quot;, 2), rest.token("|", 1) );
		ConvertSetting ( t, rest.tokens("|&quot;, 3));
	}
	else
		return CBaseFile::ParseValueLine ( line );
 
	return true;

*/
CyString CSpkFile::CreateValuesLine ()
{
	CyString values = CBaseFile::CreateValuesLine ();
	// combine all values together
	if ( (!m_sOtherAuthor.empty()) && (!m_sOtherName.empty()) )
		values += (CyString("AnotherMod: ") + m_sOtherAuthor + "|" + m_sOtherName + "\n");
	if ( m_bForceProfile )
		values += "ForceProfile\n";
	if ( !m_sScriptType.empty() )
		values += (CyString("ScriptType: ") + m_sScriptType + "\n");
	values += (CyString("PackageType: ") + (long)m_iPackageType + "\n");
	values += (CyString("ScriptTypeNew: ") + (long)m_iScriptType + "\n");
 
	for ( SSettingType *st = m_lSettings.First(); st; st = m_lSettings.Next() )

	}
 
	return values;
}
 
Utils::String CSpkFile::GetCustomScriptType (int lang)
{
	if ( !m_sScriptType.empty() )
	{
		int max;
		Utils::String *split = m_sScriptType.tokenise("<br>", &max);
		if ( max && split )
		{
			for ( int i = 1; i < max; i++ )
			{
				Utils::String str = split[i];
				int num = str.token(":", 1);
				Utils::String name = str.tokens(":", 2);
 
				if ( num == lang )
				{
					CLEANSPLIT(split, max)
					return name;
				}
			}
 
			Utils::String ret = split[0];
			CLEANSPLIT(split, max)
 
			return ret;
		}
		CLEANSPLIT(split, max)

	if ( ferror(id) )
		return false;
	return true;
}
 
void CSpkFile::AddWareText(const Utils::String &sData)
{
	if ( !m_pLastWare )
		return;
 
	SWaresText *wt = new SWaresText;
	wt->iLang = sData.token(&quot; ", 1);
	wt->sName = sData.tokens(&quot; ", 2).token(&quot;|&quot;, 1);
	wt->sDesc = sData.tokens(&quot; ", 2).tokens(&quot;|&quot;, 2);
	m_pLastWare->lText.push_back ( wt );
 
	m_bChanged = true;
}
 
void CSpkFile::AddWare(const Utils::String &sData)
{
	SWares *ware = new SWares;
	ware->iTextID = -1;
	ware->iTextPage = 0;
	ware->cType = sData.token(&quot;:&quot;, 1)[0];
	ware->iPrice = sData.token(":&quot;, 2);
	ware->iSize = sData.token(":&quot;, 3);
	ware->iVolumn = sData.token(":&quot;, 4);
	ware->sID = sData.token(&quot;:&quot;, 5);
	ware->iNotority = sData.token(":&quot;, 6);
	if ( !sData.token(&quot;:&quot;, 7).empty() )
	{
		Utils::String r = sData.token(&quot;:&quot;, 7);
		ware->iTextID = r.token(",", 1);
		ware->iTextPage = r.token(",", 2);
	}
	m_lWares.push_back ( ware );
	m_pLastWare = ware;
 
	m_bChanged = true;

 
 
 
void CSpkFile::ClearWares()
{
	for ( CListNode<SWares> *node = m_lWares.Front(); node; node = node->next() ) {
 
		node->Data()->lText.clear(true);
		node->DeleteData();
	}
	m_bChanged = true;
	m_lWares.clear(true);
}
 
SWares *CSpkFile::FindWare(const Utils::String &id) const
{
	for ( CListNode<SWares> *node = m_lWares.Front(); node; node = node->next() ) {
		SWares *w = node->Data();
		if ( w->sID.Compare(id) ) {
			return w;
		}
	}
	return NULL;
}
 
void CSpkFile::RemoveWare(const Utils::String &id )
{
	for ( CListNode<SWares> *node = m_lWares.Front(); node; node = node->next() ) {
		SWares *w = node->Data();
		if ( w->sID.Compare(id) ) {
 
			m_lWares.RemoveCurrent ();
			delete w;
			m_bChanged = true;
			return;
		}
	}
}
 
void CSpkFile::AddWare(SWares *ware)
{
	ware->sID.remove(' ');
 
	SWares *newware = this->FindWare(ware->sID);
	if ( newware ) {
		m_lWares.remove(newware);
	}
 
 
 
 
 
 
 
 
 
 
 
	m_lWares.push_back(ware);
	m_bChanged = true;
}
 
void CSpkFile::AddWareText(SWares *pWare, int iLang, const Utils::String &sName, const Utils::String &sDesc)
{
	SWaresText *wt;
	for ( CListNode<SWaresText> *node = pWare->lText.Front(); node; node = node->next() ) {
		wt = node->Data();
		if ( wt->iLang == iLang ) {
 
			wt->sDesc = sDesc;
			wt->sName = sName;
			return;
		}
	}
 
	wt = new SWaresText;
	wt->iLang = iLang;
	wt->sName = sName;
	wt->sDesc = sDesc;
 
	pWare->lText.push_back(wt);
	m_bChanged = true;
}
 
 
void CSpkFile::ClearWareText(const Utils::String &id)
{
	SWares *w = FindWare(id);
	ClearWareText(w);
}
 
void CSpkFile::ClearWareText(SWares *w)
{
	if ( !w ) return;
 
	w->lText.clear(true);
	m_bChanged = true;
}
 
void CSpkFile::RemoveWareText(const Utils::String &wid, int lang)
{
	SWares *w = FindWare(wid);
	if ( w )
	{
		for ( CListNode<SWaresText> *node = w-&gt;lText.Front(); node; node = node->next() ) {
			SWaresText *wt = node->Data();
			if ( wt->iLang == lang ) {
 
				w->lText.RemoveCurrent();
				m_bChanged = true;
				delete wt;
				break;
			}

	}
}
 
int CSpkFile::CheckValidCustomStart ()
{
 
	for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() )
	{
		C_File *file = node->Data();
		if ( file->GetFileType() != FILETYPE_SCRIPT )
			continue;

	}
 
	return CBaseFile::UpdateSigned(updateFiles);
}
 
SSettingType *CSpkFile::AddSetting(const Utils::String &key, int type )
{
	Utils::String sKey = key.removeChar(&apos;|');
 
	SSettingType *t;
	for ( t = m_lSettings.First(); t; t = m_lSettings.Next() )
	{
		if ( t->sKey.Compare(sKey) )
			return NULL;
	}
 
	switch ( type )
	{

	}
 
	if ( !t )
		return NULL;
 
	t->sKey = sKey;
	t->iType = type;
 
	m_lSettings.push_back ( t );
	m_bChanged = true;
 
	return t;
}
 
void CSpkFile::ConvertSetting ( SSettingType *t, const Utils::String &set ) const
{
	if ( !t )
		return;
 
	switch ( t->iType )
	{
		case SETTING_STRING:
			((SSettingString *)t)->sValue = set;
			break;
		case SETTING_INTEGER:
			((SSettingInteger *)t)->iValue = set;
			break;
		case SETTING_CHECK:
			((SSettingCheck *)t)->bValue = set;
			break;
	}
}
Utils::String CSpkFile::GetSetting ( SSettingType *t ) const
{
	if ( !t )
		return "";
 
	switch ( t->iType )
	{
		case SETTING_STRING:
			return ((SSettingString *)t)->sValue;
		case SETTING_INTEGER:
			return Utils::String::number(((SSettingInteger *)t)->iValue);
		case SETTING_CHECK:
			return (((SSettingInteger *)t)->iValue) ? "1" : "0";
	}
 
	return "";

	m_lSettings.clear(true);
	m_bChanged = true;
}
 
 
bool CSpkFile::IsMatchingMod(const Utils::String &mod)
{
	for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() )
	{
		C_File *file = node->Data();
		if ( file->GetFileType() != FILETYPE_MOD )
			continue;
 
		if ( file->IsFakePatch() )
			continue;
 
		Utils::String filename = file->GetBaseName().ToString();
		if ( filename.Compare(mod) )
			return true;
	}
	return false;
}
 
Utils::String CSpkFile::GetScriptTypeString(int lang)
{
	int iType = m_iScriptType;
 
	if ( this->IsLibrary() )
		return "Library";

		return "Custom Start";
	else if ( this->IsPatch() )
		return "Patch";
	else if ( m_iScriptType == SCRIPTTYPE_CUSTOM )
	{
		Utils::String type = this->GetCustomScriptType(lang);
		if ( !type.empty() )
			return type;
		iType = -1;
	}
 
	if (iType == -1)  // no script type
	{
		if ( this->IsFakePatch() )
			return "Fake Patch";
	}
 
	Utils::String sType = CSpkFile::GetScriptTypeStringStatic(m_iScriptType);
 
	if ( sType.empty() )
		return "Other";
 
	return sType;	
}
 
int CSpkFile::ConvertScriptType(const Utils::String &sType)
{
	for ( int i = 0; i < SCRIPTTYPE_MAX; i++ )
	{
		if ( sType.Compare(CSpkFile::GetScriptTypeStringStatic(i)) )
			return i;
	}
 
	return -1;
}
 
Utils::String CSpkFile::GetScriptTypeStringStatic(int type)
{
	switch ( type )
	{
		case SCRIPTTYPE_CUSTOM:
			return "Custom";

	}
 
	return "Other";
}
 
bool CSpkFile::LoadPackageData(CyString first, CyString sRest)
{
	Utils::String rest = sRest.ToString();
 
	if ( first.Compare("ScriptType") )
	{
		if ( rest.Compare("Library") || rest.Compare("Library Script") )
			this->SetLibrary();
		else if ( rest.Compare("Update") || rest.Compare("Package Update") || rest.Compare("Mod Update") )

			this->SetCustomStart();
		else if ( rest.Compare("Patch") || rest.Compare("Patch Mod") )
			this->SetPatch();
		else
		{
			int check = rest;
			if ( check || rest == "0" )
				m_iScriptType = check;
			else
			{
				m_iScriptType = CSpkFile::ConvertScriptType(rest);

			}
		}
	}
	else if ( first.Compare("AnotherMod") )
	{
		m_sOtherName = rest.token("|", 1);
		m_sOtherAuthor = rest.tokens("|", 2);
	}
	else if ( first.Compare("WareName") || first.Compare("WareDesc") )
	{
		// find the ware to use
		SWares *useWare = m_pLastWare;
		Utils::String id = rest.token(" ", 1);
		for ( CListNode<SWares> *wNode = m_lWares.Front(); wNode; wNode = wNode->next() )
		{
			if ( wNode->Data()->sID.Compare(id.c_str()) )
			{
				useWare = wNode->Data();
				break;
			}
		}
 
		// check if we have the id already
		if ( useWare )
		{
			int lang = rest.token(" ", 2);
			SWaresText *wt = NULL;
			for ( CListNode<SWaresText> *tNode = useWare->lText.Front(); tNode; tNode = tNode->next() )
			{
				if ( tNode->Data()->iLang == lang )
				{

			if ( !wt )
			{
				wt = new SWaresText;
				wt->iLang = lang;
				useWare->lText.push_back(wt);
			}
 
			if ( first.Compare("WareName") )
				wt->sName = rest.tokens(" ", 3);
			else
				wt->sDesc = rest.tokens(" ", 3);
		}
	}
	else if ( first.Left(4).Compare("Ware") )
	{
		SWares *ware = new SWares;
		ware->iTextID = -1;
		ware->iTextPage = 0;
		ware->cType = first[4];
		ware->iPrice = rest.token(" ", 2);
		ware->iSize = rest.token(" ", 3);
		ware->iVolumn = rest.token(" ", 4);
		ware->sID = rest.token(" ", 1);
		ware->iNotority = rest.token(" ", 5);
		if ( !rest.token(" ", 6).empty() )
		{
			ware->iTextID = rest.token(" ", 6).token(",", 2);
			ware->iTextPage = rest.token(" ", 6).token(",", 1);
		}
		m_lWares.push_back ( ware );
		m_pLastWare = ware;
	}
 
	else if ( CBaseFile::LoadPackageData(first, rest) )
		return true;
	else
		return false;
 
	return true;
}
 
bool CSpkFile::GeneratePackagerScript(bool wildcard, CyStringList *list, bool datafile)
{
	if ( !CBaseFile::GeneratePackagerScript(wildcard, list, datafile) )
		return false;
 

	if ( this->IsAnotherMod() )
	{
		list->PushBack("# For another mod/package, this is a child package");
		list->PushBack(CyString("AnotherMod: ") + m_sOtherName + "|" + m_sOtherAuthor);
		list->PushBack("");
	}
 
	if ( !m_lWares.empty() )
	{
		list->PushBack("# Custom Wares, Ware<type>: <id> <price> <size> <volumn> <notority>");
		for ( CListNode<SWares> *node = m_lWares.Front(); node; node = node->next() )

			else
				list->PushBack(CyString("Ware") + (char)w->cType + ": " + w->sID + " " + (long)w->iPrice + " " + (long)w->iSize + " " + (long)w->iVolumn + " " + (long)w->iNotority);
			for ( CListNode<SWaresText> *wNode = w->lText.Front(); wNode; wNode = wNode->next() )
			{
				SWaresText *wt = wNode->Data();
				if ( !wt->sName.empty() )
					list->PushBack(CyString("WareName: ") + w->sID + " " + (long)wt->iLang + " " + wt->sName);
				if ( !wt->sDesc.empty() )
					list->PushBack(CyString("WareDesc: ") + w->sID + " " + (long)wt->iLang + " " + wt->sDesc);
			}
			list->PushBack("");
		}
	}
 
	if ( !datafile )
	{
		if ( !CBaseFile::GeneratePackagerScriptFile(wildcard, list) )
			return false;
	}
 
	return true;
 
}
 
Utils::String CSpkFile::GetWareText(SWares *w, int lang)
{
	// return the text page if being used
	if ( w->iTextID > 0 && w->iTextPage > 0 )
		return Utils::String("{") + (long)w->iTextPage + "," + (long)w->iTextID + "}";
 
	Utils::String name;
	for ( CListNode<SWaresText> *wt = w->lText.Front(); wt; wt = wt->next() )
	{
		if ( wt->Data()->sName.empty() )
			continue;
		if ( wt->Data()->iLang == lang )
			name = wt->Data()->sName;
		else if ( name.empty() && wt->Data()->iLang == 44 )
			name = wt->Data()->sName;
		else if ( name.empty() )
			name = wt->Data()->sName;
	}
 
	return name;
}
Utils::String CSpkFile::GetWareDesc(SWares *w, int lang)
{
	// return the text page if being used
	if ( w->iTextID > 0 && w->iTextPage > 0 )
		return Utils::String("{") + (long)w->iTextPage + "," + ((long)w->iTextID + 1) + "}";
 
	Utils::String name;
	for ( CListNode<SWaresText> *wt = w->lText.Front(); wt; wt = wt->next() )
	{
		if ( wt->Data()->sDesc.empty() )
			continue;
 
		if ( wt->Data()->iLang == lang )
			name = wt->Data()->sDesc;
		else if ( name.empty() && wt->Data()->iLang == 44 )
			name = wt->Data()->sDesc;
		else if ( name.empty() )
			name = wt->Data()->sDesc;
	}
 
	return name;
}
 
Utils::String CSpkFile::GetCustomStartName()
{
	if ( !this->IsCustomStart() )
		return "";
 
	// else find the custom start script
	C_File *file = NULL;
	for ( file = this->GetFirstFile(FILETYPE_SCRIPT); file; file = this->GetNextFile(file) )
	{
		if ( file->GetFilename().IsIn("initplayership")	&& file->GetFilename().GetToken(".", 1, 1).Compare("galaxy") )
			break;
	}
 
	if ( !file )
		return "";
 
	return file->GetFilename().GetToken(".", 2, 2).ToString();
}
 
void CSpkFile::MergePackage(CBaseFile *base)
{
	// update version information

		{
			for ( CListNode<SSettingType> *node = spk->GetSettingsList()->Front(); node; node = node->next() )
				this->AddSetting(node->Data()->sKey, node->Data()->iType);
		}
 
		if ( !spk->GetOtherName().empty() )
		{
			m_sOtherName = spk->GetOtherName();
			m_sOtherAuthor = spk->GetOtherAuthor();
		}
	}

unsigned char *CSpkFile::_convert_uncompressFile(const Utils::String &sOldFilename, int *pLen)
{
	// firstcheck if the file exists
	FILE *id = fopen(sOldFilename.c_str(), "rb" );
	if ( !id ) {
		CLog::logf(CLog::Log_IO, "Unable to open file: %s", sOldFilename.c_str());
		return false;
	}
 
	// read the first 3 charaters to check if its using the original "HiP" compression
	CyString check = (char)fgetc ( id );

	long len = 0, newlen = 0;
 
	if ( check == "HiP" ) {
		fclose ( id );
		bool opened = false;
		if ( DecompressFile ( (char *)sOldFilename.c_str(), "uncompr.tmp" ) ) {
			removeFile = "uncompr.tmp";
			id = fopen ( "uncompr.tmp", "r" );
			if ( id )
				opened = true;
		}
 
		if ( !opened ) {
			CLog::log(CLog::Log_IO, "Unable to uncompress file, exiting...");
			return false;
		}
 
		CLog::log(CLog::Log_IO, "* Reading file into memory...");
		// get file length
		fseek ( id, 0, SEEK_END );
		len = ftell ( id );
		
		// move back to beginning
		fseek ( id, 0, SEEK_SET );
 
		// read the data from file into memory
		uncomprData = new unsigned char[len + 1];
		fread ( uncomprData, sizeof(unsigned char), len, id );
 
		newlen = len;
	}
	else
	{
		CLog::log(CLog::Log_IO, "* Reading file into memory...");
		// get file length
		fseek ( id, 0, SEEK_END );
		len = ftell ( id );
		
		// move back to beginning

		// read the data from file into memory
		data = new unsigned char[len + 1];
		fread ( data, sizeof(unsigned char), len, id );
 
		// uncompress the file (currently only 7zip compression)
		CLog::log(CLog::Log_IO, "* Uncompressing file...");
		newlen = len;
	#ifdef _INCLUDE7ZIP
		uncomprData = LZMADecodeData ( data, len, newlen, progress );
	#else
		uncomprData = LZMADecode_C ( (unsigned char *)data, len, (size_t*)&newlen, NULL );
	#endif
	}
 
	*pLen = newlen;
 
	if ( !removeFile.Empty() ) {
		CFileIO(removeFile).Remove();
	}
 
	return uncomprData;
}

		return FILETYPE_SOUND;
 
	return FILETYPE_SCRIPT;
}
 
void CSpkFile::_convert_parse(const Utils::String &sCmd, const Utils::String &sRest)
{
	if ( sCmd == "Name:" )
	{
		this->SetName ( sRest );
		CLog::logf(CLog::Log_EditPackage, "\tScript Name: %s", sRest.c_str() );
	}
	else if ( sCmd == "Author:" )
	{
		this->SetAuthor ( sRest );
		CLog::logf(CLog::Log_EditPackage, "\tScript Author: %s", sRest.c_str() );
	}
	else if ( sCmd == "CustomStart" )
	{
		this->SetCustomStart();
		CLog::logf(CLog::Log_EditPackage, "\tPackage is a custom start!!" );
	}
	else if ( sCmd == "AnotherMod:" )
	{
		this->SetAnotherMod(sRest.token("|", 1), sRest.tokens("|", 2));
		CLog::logf(CLog::Log_EditPackage, "\tFor another Mod, Name: %s, Author: %s", this->GetOtherName().c_str(), this->GetOtherAuthor().c_str() );
	}
	else if ( sCmd == "PATCH" )
	{
		this->SetPatch();
		CLog::logf(CLog::Log_EditPackage, "\tPackage is a Patch Mod!!" );
	}
	else if ( sCmd == "Version:" )
	{
		this->SetVersion ( sRest );
		CLog::logf(CLog::Log_EditPackage, "\tScript Version: %s", sRest.c_str() );
	}
	else if ( sCmd == "Date:" )
	{
		this->SetCreationDate ( sRest );
		CLog::logf(CLog::Log_EditPackage, "\tScript Creation Date: %s", sRest.c_str() );
	}
	else if ( sCmd == "Desc:" )
	{
		this->SetDescription(sRest.findReplace("<br>", "\n") );
		CLog::logf(CLog::Log_EditPackage, "\tScript Description: %s", this->GetDescription().c_str() );
	}
	else if ( sCmd == "WebAddress:" )
	{
		this->SetWebAddress ( sRest );
		CLog::logf(CLog::Log_EditPackage, "\tWeb Address: %s", sRest.c_str() );
	}
	else if ( sCmd == "WebMirror1:" )
	{
		this->AddWebMirror(sRest);
		CLog::logf(CLog::Log_EditPackage, "\tWeb Mirror Address: %s", sRest.c_str() );
	}
	else if ( sCmd == "WebMirror2:" )
	{
		this->AddWebMirror(sRest);
		CLog::logf(CLog::Log_EditPackage, "\tWeb Mirror Address: %s", sRest.c_str() );
	}
	
	else if ( sCmd == "ScriptType:" )
		this->SetScriptType (sRest);
	else if ( sCmd == "WebSite:" )
	{
		this->SetWebSite ( sRest );
		CLog::logf(CLog::Log_EditPackage, "\tWeb Site: %s", sRest.c_str() );
	}
	else if ( sCmd == "Email:" )
	{
		this->SetEmail ( sRest );
		CLog::logf(CLog::Log_EditPackage, "\tAuthor Email Address: %s", sRest.c_str() );
	}
	else if ( sCmd == "GameVersion:" )
	{
		//TODO: fix this for new game version
		/*

			this->SetGameVersion ( 1 );
		else if (version == 1 )
			this->SetGameVersion ( 0 );
		else
			this->SetGameVersion ( version );
		CLog::logf(CLog::Log_EditPackage, "\tGame Version: %d", this->GetGameVersion () );
		*/
	}
	
	else if ( sCmd == "Ware:" )
	{
		this->AddWare ( sRest );
		CLog::logf(CLog::Log_EditPackage, "\tAdding Custom Ware" );
	}
	else if ( sCmd == "WareText:" )
		this->AddWareText ( sRest );
	else if ( sCmd == "UninstallAfter:" )
		this->AddUninstallAfterText(sRest.token(" ", 1).toLong(), sRest.tokens(" ", 2));

	else if ( sCmd == "ScriptName:" )
	{
		Utils::String lang = sRest.token(":", 1);
		Utils::String name = sRest.tokens(":", 2);
		this->AddLanguageName(lang.toLong(), name);
		CLog::logf(CLog::Log_EditPackage, "\tScript Name Language (%s) %s", lang.c_str(), name.c_str() );
	}
}
 
Utils::String CSpkFile::_convert_parseFilename(const Utils::String &sRest, float fVersion, Utils::String *pDir)
{

	}
 
	return sFilename;
}
 
unsigned char *CSpkFile::_convert_parseFile(const Utils::String &sCmd, const Utils::String &sRest, float fVersion, unsigned char *d)
{
	bool bShared = (sCmd.left(9) == "$$$Shared") ? true : false;
	Utils::String sFile = sCmd.right(-3).left(-1);
	Utils::String sEnd = this->_convert_fileEndString(sFile);
	int iType = this->_convert_fileType(sFile);

	bool binaryRead = (CFileIO(filename).CheckFileExtension("PCK")) ? true : false;
	if ( sEnd.empty() ) binaryRead = true;
	
	C_File *file = new C_File ();
 
 
 
 
	if ( bShared )	CLog::logf(CLog::Log_File, "\tFound %s File (Shared): %s, Reading...", sFile.c_str(), filename.c_str() );
 
	else			CLog::logf(CLog::Log_File, "\tFound %s File: %s, Reading...", sFile.c_str(), filename.c_str() );
 
 
	// read the data
	if ( binaryRead )
	{
		file->ReadFromData ( (char *)d, size );

	if ( !dir.empty() )
		file->SetDir ( dir );
	
	this->AddFile ( file );
 
	CLog::logf(CLog::Log_File, "Size: %s", file->GetDataSizeString().c_str() );
 
	return d;
}
 
CSpkFile *CSpkFile::convertFromOld(const Utils::String &sOldFilename)

	int len;
	unsigned char *uncomprData = this->_convert_uncompressFile(sOldFilename, &len);
 
	// uncomressed failed
	if ( !uncomprData ) {
		CLog::log(CLog::Log_IO, "Error: Unable to uncompress the file");
		return false;
	}
 
	// now we can read the data
	unsigned char *d = uncomprData;

 
//	CMultiSpkFile *mspk = NULL;
	//SMultiSpkFile *cur_mspk = NULL;
 
	int numscripts = 0, curscript = 0;
 
	float fVersion = 1;
 
	CLog::log(CLog::Log_IO, "* Reading spk data...");
	while ( d )
	{
		// read the next line
		d = str.readToEndOfLine(d);
		if ( !d || d[0] == 0 ) {

		}
		*/
		Utils::String sRest = str.tokens(" ", 2);
		if ( sCmd == "Packager:" ) {
			fVersion = sRest;
			CLog::logf(CLog::Log_Read, "\tPackager Version: %.2f", fVersion );
		}
		else if ( sCmd == "Icon:" )
		{
			long size = sRest.token(" ", 1);
			Utils::String ext = sRest.token(" ", 2);

 
			d += size;
 
			this->SetIcon(file, ext);
 
			CLog::logf(CLog::Log_File, "\tIcon (%s) Size: %s", ext.c_str(), file->GetDataSizeString ().c_str() );
		}
		else if ( sCmd.left(3) == "$$$" )
			d = _convert_parseFile(sCmd, sRest, fVersion, d);
		else {
			this->_convert_parse(sCmd, sRest);
		}
	}
 
	CLog::logf(CLog::Log_IO, "* Reading spk data..." );
 
	return true;
}

Rev 9	Rev 10
Line 72...	Line 72...
72	`Return: Boolean - returns true if value exists`	72	`Return: Boolean - returns true if value exists`
73	`Desc: Reads the line and assigns the parameters for the file`	73	`Desc: Reads the line and assigns the parameters for the file`
74	`*/`	74	`*/`
75	`bool CSpkFile::ParseValueLine ( CyString line )`	75	`bool CSpkFile::ParseValueLine ( CyString line )`
76	`{`	76	`{`
77	`CyString first = line.GetToken ( 1, ' ' );`	77	`Utils::String first = line.GetToken ( 1, ' ' ).ToString();`
78	`CyString rest = line.GetToken ( 2, -1, ' ' );`	78	`Utils::String rest = line.GetToken ( 2, -1, ' ' ).ToString();`
79		79
80	`if ( first == "AnotherMod:" )`	80	`if ( first == "AnotherMod:" )`
81	`{`	81	`{`
82	`m_sOtherAuthor = rest.GetToken ( 1, '\|' );`	82	`m_sOtherAuthor = rest.token("\|", 1);`
83	`m_sOtherName = rest.GetToken ( 2, -1, '\|' );`	83	`m_sOtherName = rest.tokens("\|", 2);`
84	`}`	84	`}`
85	`else if ( line == "CustomStart" )`	85	`else if ( line == "CustomStart" )`
86	`m_iPackageType = PACKAGETYPE_CUSTOMSTART;`	86	`m_iPackageType = PACKAGETYPE_CUSTOMSTART;`
87	`else if ( line == "PackageUpdate" )`	87	`else if ( line == "PackageUpdate" )`
88	`m_iPackageType = PACKAGETYPE_UPDATE;`	88	`m_iPackageType = PACKAGETYPE_UPDATE;`
Line 93...	Line 93...
93	`else if ( line == "Signed" )`	93	`else if ( line == "Signed" )`
94	`m_bSigned = true;`	94	`m_bSigned = true;`
95	`else if ( first == "ScriptType:" )`	95	`else if ( first == "ScriptType:" )`
96	`m_sScriptType = rest;`	96	`m_sScriptType = rest;`
97	`else if ( first == "ScriptTypeNew:" )`	97	`else if ( first == "ScriptTypeNew:" )`
98	`m_iScriptType = rest.ToInt();`	98	`m_iScriptType = rest;`
99	`else if ( first == "PackageType:" )`	99	`else if ( first == "PackageType:" )`
100	`m_iPackageType = rest.ToInt();`	100	`m_iPackageType = rest;`
101	`else if ( first == "Ware:" )`	101	`else if ( first == "Ware:" )`
102	`AddWare ( rest );`	102	`AddWare ( rest );`
103	`else if ( (first == "WareText:") && (m_pLastWare) )`	103	`else if ( (first == "WareText:") && (m_pLastWare) )`
104	`AddWareText ( rest );`	104	`AddWareText ( rest );`
105	`else if ( first == "Setting:" )`	105	`else if ( first == "Setting:" )`
106	`{`	106	`{`
107	`SSettingType *t = AddSetting ( rest.GetToken ( 2, '\|' ), rest.GetToken ( 1, '\|' ).ToInt() );`	107	`SSettingType *t = AddSetting ( rest.token("\|", 2), rest.token("\|", 1) );`
108	`ConvertSetting ( t, rest.GetToken ( 3, -1, '\|' ) );`	108	`ConvertSetting ( t, rest.tokens("\|", 3));`
109	`}`	109	`}`
110	`else`	110	`else`
111	`return CBaseFile::ParseValueLine ( line );`	111	`return CBaseFile::ParseValueLine ( line );`
112		112
113	`return true;`	113	`return true;`
Line 120...	Line 120...
120	`*/`	120	`*/`
121	`CyString CSpkFile::CreateValuesLine ()`	121	`CyString CSpkFile::CreateValuesLine ()`
122	`{`	122	`{`
123	`CyString values = CBaseFile::CreateValuesLine ();`	123	`CyString values = CBaseFile::CreateValuesLine ();`
124	`// combine all values together`	124	`// combine all values together`
125	`if ( (!m_sOtherAuthor.Empty()) && (!m_sOtherName.Empty()) )`	125	`if ( (!m_sOtherAuthor.empty()) && (!m_sOtherName.empty()) )`
126	`values += (CyString("AnotherMod: ") + m_sOtherAuthor + "\|" + m_sOtherName + "\n");`	126	`values += (CyString("AnotherMod: ") + m_sOtherAuthor + "\|" + m_sOtherName + "\n");`
127	`if ( m_bForceProfile )`	127	`if ( m_bForceProfile )`
128	`values += "ForceProfile\n";`	128	`values += "ForceProfile\n";`
129	`if ( !m_sScriptType.Empty() )`	129	`if ( !m_sScriptType.empty() )`
130	`values += (CyString("ScriptType: ") + m_sScriptType + "\n");`	130	`values += (CyString("ScriptType: ") + m_sScriptType + "\n");`
131	`values += (CyString("PackageType: ") + (long)m_iPackageType + "\n");`	131	`values += (CyString("PackageType: ") + (long)m_iPackageType + "\n");`
132	`values += (CyString("ScriptTypeNew: ") + (long)m_iScriptType + "\n");`	132	`values += (CyString("ScriptTypeNew: ") + (long)m_iScriptType + "\n");`
133		133
134	`for ( SSettingType *st = m_lSettings.First(); st; st = m_lSettings.Next() )`	134	`for ( SSettingType *st = m_lSettings.First(); st; st = m_lSettings.Next() )`
Line 145...	Line 145...
145	`}`	145	`}`
146		146
147	`return values;`	147	`return values;`
148	`}`	148	`}`
149		149
150	`CyString CSpkFile::GetCustomScriptType (int lang)`	150	`Utils::String CSpkFile::GetCustomScriptType (int lang)`
151	`{`	151	`{`
152	`if ( !m_sScriptType.Empty() )`	152	`if ( !m_sScriptType.empty() )`
153	`{`	153	`{`
154	`int max;`	154	`int max;`
155	`CyString *split = m_sScriptType.SplitToken("<br>", &max);`	155	`Utils::String *split = m_sScriptType.tokenise("<br>", &max);`
156	`if ( max && split )`	156	`if ( max && split )`
157	`{`	157	`{`
158	`for ( int i = 1; i < max; i++ )`	158	`for ( int i = 1; i < max; i++ )`
159	`{`	159	`{`
160	`CyString str = split[i];`	160	`Utils::String str = split[i];`
161	`int num = str.GetToken(":", 1, 1).ToInt();`	161	`int num = str.token(":", 1);`
162	`CyString name = str.GetToken(":", 2);`	162	`Utils::String name = str.tokens(":", 2);`
163		163
164	`if ( num == lang )`	164	`if ( num == lang )`
165	`{`	165	`{`
166	`CLEANSPLIT(split, max)`	166	`CLEANSPLIT(split, max)`
167	`return name;`	167	`return name;`
168	`}`	168	`}`
169	`}`	169	`}`
170		170
171	`CyString ret = split[0];`	171	`Utils::String ret = split[0];`
172	`CLEANSPLIT(split, max)`	172	`CLEANSPLIT(split, max)`
173		173
174	`return ret;`	174	`return ret;`
175	`}`	175	`}`
176	`CLEANSPLIT(split, max)`	176	`CLEANSPLIT(split, max)`
Line 184...	Line 184...
184	`if ( ferror(id) )`	184	`if ( ferror(id) )`
185	`return false;`	185	`return false;`
186	`return true;`	186	`return true;`
187	`}`	187	`}`
188		188
189	`void CSpkFile::AddWareText ( CyString rest )`	189	`void CSpkFile::AddWareText(const Utils::String &sData)`
190	`{`	190	`{`
191	`if ( !m_pLastWare )`	191	`if ( !m_pLastWare )`
192	`return;`	192	`return;`
193		193
194	`SWaresText *wt = new SWaresText;`	194	`SWaresText *wt = new SWaresText;`
195	`wt->iLang = rest.GetToken ( 1, ' ' ).ToInt();`	195	`wt->iLang = sData.token(" ", 1);`
196	`wt->sName = rest.GetToken ( 2, -1, ' ' ).GetToken ( 1, '\|' );`	196	`wt->sName = sData.tokens(" ", 2).token("\|", 1);`
197	`wt->sDesc = rest.GetToken ( 2, -1, ' ' ).GetToken ( 2, -1, '\|' );`	197	`wt->sDesc = sData.tokens(" ", 2).tokens("\|", 2);`
198	`m_pLastWare->lText.push_back ( wt );`	198	`m_pLastWare->lText.push_back ( wt );`
199		199
200	`m_bChanged = true;`	200	`m_bChanged = true;`
201	`}`	201	`}`
202		202
203	`void CSpkFile::AddWare ( CyString rest )`	203	`void CSpkFile::AddWare(const Utils::String &sData)`
204	`{`	204	`{`
205	`SWares *ware = new SWares;`	205	`SWares *ware = new SWares;`
206	`ware->iTextID = -1;`	206	`ware->iTextID = -1;`
207	`ware->iTextPage = 0;`	207	`ware->iTextPage = 0;`
208	`ware->cType = rest.GetToken ( 1, ':' )[0];`	208	`ware->cType = sData.token(":", 1)[0];`
209	`ware->iPrice = rest.GetToken ( 2, ':' ).ToLong();`	209	`ware->iPrice = sData.token(":", 2);`
210	`ware->iSize = rest.GetToken ( 3, ':' ).ToInt();`	210	`ware->iSize = sData.token(":", 3);`
211	`ware->iVolumn = rest.GetToken ( 4, ':' ).ToInt();`	211	`ware->iVolumn = sData.token(":", 4);`
212	`ware->sID = rest.GetToken ( 5, ':' );`	212	`ware->sID = sData.token(":", 5);`
213	`ware->iNotority = rest.GetToken ( 6, ':' ).ToInt();`	213	`ware->iNotority = sData.token(":", 6);`
214	`if ( !rest.GetToken( 7, ':' ).Empty() )`	214	`if ( !sData.token(":", 7).empty() )`
215	`{`	215	`{`
216	`CyString r = rest.GetToken ( 7, ':' );`	216	`Utils::String r = sData.token(":", 7);`
217	`ware->iTextID = r.GetToken(",", 1, 1).ToInt();`	217	`ware->iTextID = r.token(",", 1);`
218	`ware->iTextPage = r.GetToken(",", 2, 2).ToInt();`	218	`ware->iTextPage = r.token(",", 2);`
219	`}`	219	`}`
220	`m_lWares.push_back ( ware );`	220	`m_lWares.push_back ( ware );`
221	`m_pLastWare = ware;`	221	`m_pLastWare = ware;`
222		222
223	`m_bChanged = true;`	223	`m_bChanged = true;`
Line 302...	Line 302...
302		302
303		303
304		304
305	`void CSpkFile::ClearWares()`	305	`void CSpkFile::ClearWares()`
306	`{`	306	`{`
307	`for ( CListNode<SWares> *node = m_lWares.Front(); node; node = node->next() )`	307	`for ( CListNode<SWares> *node = m_lWares.Front(); node; node = node->next() ) {`
308	`{`	-
309	`node->Data()->lText.clear(true);`	308	`node->Data()->lText.clear(true);`
310	`node->DeleteData();`	309	`node->DeleteData();`
311	`}`	310	`}`
312	`m_bChanged = true;`	311	`m_bChanged = true;`
313	`m_lWares.clear(true);`	312	`m_lWares.clear(true);`
314	`}`	313	`}`
315		314
316	`SWares *CSpkFile::FindWare ( CyString id )`	315	`SWares *CSpkFile::FindWare(const Utils::String &id) const`
317	`{`	316	`{`
318	`for ( SWares *w = m_lWares.First(); w; w = m_lWares.Next() )`	317	`for ( CListNode<SWares> *node = m_lWares.Front(); node; node = node->next() ) {`
319	`{`	318	`SWares *w = node->Data();`
320	`if ( w->sID.ToUpper() == id.ToUpper() )`	319	`if ( w->sID.Compare(id) ) {`
321	`return w;`	320	`return w;`
-		321	`}`
322	`}`	322	`}`
323	`return NULL;`	323	`return NULL;`
324	`}`	324	`}`
325		325
326	`void CSpkFile::RemoveWare ( CyString id )`	326	`void CSpkFile::RemoveWare(const Utils::String &id )`
327	`{`	327	`{`
328	`for ( SWares *w = m_lWares.First(); w; w = m_lWares.Next() )`	328	`for ( CListNode<SWares> *node = m_lWares.Front(); node; node = node->next() ) {`
329	`{`	329	`SWares *w = node->Data();`
330	`if ( w->sID.ToUpper() == id.ToUpper() )`	330	`if ( w->sID.Compare(id) ) {`
331	`{`	-
332	`m_lWares.RemoveCurrent ();`	331	`m_lWares.RemoveCurrent ();`
333	`delete w;`	332	`delete w;`
334	`m_bChanged = true;`	333	`m_bChanged = true;`
335	`return;`	334	`return;`
336	`}`	335	`}`
-		336	`}`
-		337	`}`
-		338
-		339	`void CSpkFile::AddWare(SWares *ware)`
-		340	`{`
-		341	`ware->sID.remove(' ');`
-		342
-		343	`SWares *newware = this->FindWare(ware->sID);`
-		344	`if ( newware ) {`
-		345	`m_lWares.remove(newware);`
337	`}`	346	`}`
338	`}`	-
339		347
340	`void CSpkFile::AddWare ( SWares *ware )`	-
341	`{`	-
342	`ware->sID.RemoveChar ( ' ' );`	-
343	`ware->sID = ware->sID.ToUpper();`	-
344		-
345	`SWares *newware = FindWare ( ware->sID );`	-
346	`if ( newware )`	-
347	`m_lWares.remove ( newware );`	-
348		-
349	`m_lWares.push_back ( ware );`	348	`m_lWares.push_back(ware);`
350	`m_bChanged = true;`	349	`m_bChanged = true;`
351	`}`	350	`}`
352		351
353	`void CSpkFile::AddWareText ( SWares *w, int lang, CyString name, CyString desc )`	352	`void CSpkFile::AddWareText(SWares *pWare, int iLang, const Utils::String &sName, const Utils::String &sDesc)`
354	`{`	353	`{`
355	`SWaresText *wt;`	354	`SWaresText *wt;`
356	`for ( wt = w->lText.First(); wt; wt = w->lText.Next() )`	355	`for ( CListNode<SWaresText> *node = pWare->lText.Front(); node; node = node->next() ) {`
357	`{`	356	`wt = node->Data();`
358	`if ( wt->iLang == lang )`	357	`if ( wt->iLang == iLang ) {`
359	`{`	-
360	`wt->sDesc = desc;`	358	`wt->sDesc = sDesc;`
361	`wt->sName = name;`	359	`wt->sName = sName;`
362	`return;`	360	`return;`
363	`}`	361	`}`
364	`}`	362	`}`
365		363
366	`wt = new SWaresText;`	364	`wt = new SWaresText;`
367	`wt->iLang = lang;`	365	`wt->iLang = iLang;`
368	`wt->sName = name;`	366	`wt->sName = sName;`
369	`wt->sDesc = desc;`	367	`wt->sDesc = sDesc;`
370		368
371	`w->lText.push_back ( wt );`	369	`pWare->lText.push_back(wt);`
372	`m_bChanged = true;`	370	`m_bChanged = true;`
373	`}`	371	`}`
374		372
375		373
376	`void CSpkFile::ClearWareText ( CyString id )`	374	`void CSpkFile::ClearWareText(const Utils::String &id)`
377	`{`	375	`{`
378	`SWares *w = FindWare ( id );`	376	`SWares *w = FindWare(id);`
379	`ClearWareText ( w );`	377	`ClearWareText(w);`
380	`}`	378	`}`
381		379
382	`void CSpkFile::ClearWareText ( SWares *w )`	380	`void CSpkFile::ClearWareText(SWares *w)`
383	`{`	381	`{`
384	`if ( !w ) return;`	382	`if ( !w ) return;`
385		383
386	`w->lText.clear(true);`	384	`w->lText.clear(true);`
387	`m_bChanged = true;`	385	`m_bChanged = true;`
388	`}`	386	`}`
389		387
390	`void CSpkFile::RemoveWareText ( CyString wid, int lang )`	388	`void CSpkFile::RemoveWareText(const Utils::String &wid, int lang)`
391	`{`	389	`{`
392	`SWares *w = FindWare ( wid );`	390	`SWares *w = FindWare(wid);`
393	`if ( w )`	391	`if ( w )`
394	`{`	392	`{`
395	`for ( SWaresText *wt = w->lText.First(); wt; wt = w->lText.Next() )`	393	`for ( CListNode<SWaresText> *node = w->lText.Front(); node; node = node->next() ) {`
396	`{`	394	`SWaresText *wt = node->Data();`
397	`if ( wt->iLang == lang )`	395	`if ( wt->iLang == lang ) {`
398	`{`	-
399	`w->lText.RemoveCurrent();`	396	`w->lText.RemoveCurrent();`
400	`m_bChanged = true;`	397	`m_bChanged = true;`
401	`delete wt;`	398	`delete wt;`
402	`break;`	399	`break;`
403	`}`	400	`}`
Line 405...	Line 402...
405	`}`	402	`}`
406	`}`	403	`}`
407		404
408	`int CSpkFile::CheckValidCustomStart ()`	405	`int CSpkFile::CheckValidCustomStart ()`
409	`{`	406	`{`
410		-
411	`for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() )`	407	`for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() )`
412	`{`	408	`{`
413	`C_File *file = node->Data();`	409	`C_File *file = node->Data();`
414	`if ( file->GetFileType() != FILETYPE_SCRIPT )`	410	`if ( file->GetFileType() != FILETYPE_SCRIPT )`
415	`continue;`	411	`continue;`
Line 435...	Line 431...
435	`}`	431	`}`
436		432
437	`return CBaseFile::UpdateSigned(updateFiles);`	433	`return CBaseFile::UpdateSigned(updateFiles);`
438	`}`	434	`}`
439		435
440	`SSettingType *CSpkFile::AddSetting ( CyString key, int type )`	436	`SSettingType *CSpkFile::AddSetting(const Utils::String &key, int type )`
441	`{`	437	`{`
442	`key.RemoveChar ( '\|' );`	438	`Utils::String sKey = key.removeChar('\|');`
-		439
443	`SSettingType *t;`	440	`SSettingType *t;`
444	`for ( t = m_lSettings.First(); t; t = m_lSettings.Next() )`	441	`for ( t = m_lSettings.First(); t; t = m_lSettings.Next() )`
445	`{`	442	`{`
446	`if ( t->sKey.upper() == key.lower() )`	443	`if ( t->sKey.Compare(sKey) )`
447	`return NULL;`	444	`return NULL;`
448	`}`	445	`}`
449		446
450	`switch ( type )`	447	`switch ( type )`
451	`{`	448	`{`
Line 461...	Line 458...
461	`}`	458	`}`
462		459
463	`if ( !t )`	460	`if ( !t )`
464	`return NULL;`	461	`return NULL;`
465		462
466	`t->sKey = key;`	463	`t->sKey = sKey;`
467	`t->iType = type;`	464	`t->iType = type;`
468		465
469	`m_lSettings.push_back ( t );`	466	`m_lSettings.push_back ( t );`
470	`m_bChanged = true;`	467	`m_bChanged = true;`
471		468
472	`return t;`	469	`return t;`
473	`}`	470	`}`
474		471
475	`void CSpkFile::ConvertSetting ( SSettingType *t, CyString set )`	472	`void CSpkFile::ConvertSetting ( SSettingType *t, const Utils::String &set ) const`
476	`{`	473	`{`
477	`if ( !t )`	474	`if ( !t )`
478	`return;`	475	`return;`
479		476
480	`switch ( t->iType )`	477	`switch ( t->iType )`
481	`{`	478	`{`
482	`case SETTING_STRING:`	479	`case SETTING_STRING:`
483	`((SSettingString *)t)->sValue = set;`	480	`((SSettingString *)t)->sValue = set;`
484	`break;`	481	`break;`
485	`case SETTING_INTEGER:`	482	`case SETTING_INTEGER:`
486	`((SSettingInteger *)t)->iValue = set.ToInt();`	483	`((SSettingInteger *)t)->iValue = set;`
487	`break;`	484	`break;`
488	`case SETTING_CHECK:`	485	`case SETTING_CHECK:`
489	`((SSettingCheck *)t)->bValue = set.ToBool();`	486	`((SSettingCheck *)t)->bValue = set;`
490	`break;`	487	`break;`
491	`}`	488	`}`
492	`}`	489	`}`
493	`CyString CSpkFile::GetSetting ( SSettingType *t )`	490	`Utils::String CSpkFile::GetSetting ( SSettingType *t ) const`
494	`{`	491	`{`
495	`if ( !t )`	492	`if ( !t )`
496	`return "";`	493	`return "";`
497		494
498	`switch ( t->iType )`	495	`switch ( t->iType )`
499	`{`	496	`{`
500	`case SETTING_STRING:`	497	`case SETTING_STRING:`
501	`return ((SSettingString *)t)->sValue;`	498	`return ((SSettingString *)t)->sValue;`
502	`case SETTING_INTEGER:`	499	`case SETTING_INTEGER:`
503	`return CyString::Number(((SSettingInteger *)t)->iValue);`	500	`return Utils::String::number(((SSettingInteger *)t)->iValue);`
504	`case SETTING_CHECK:`	501	`case SETTING_CHECK:`
505	`return (((SSettingInteger *)t)->iValue) ? "1" : "0";`	502	`return (((SSettingInteger *)t)->iValue) ? "1" : "0";`
506	`}`	503	`}`
507		504
508	`return "";`	505	`return "";`
Line 513...	Line 510...
513	`m_lSettings.clear(true);`	510	`m_lSettings.clear(true);`
514	`m_bChanged = true;`	511	`m_bChanged = true;`
515	`}`	512	`}`
516		513
517		514
518	`bool CSpkFile::IsMatchingMod ( CyString mod )`	515	`bool CSpkFile::IsMatchingMod(const Utils::String &mod)`
519	`{`	516	`{`
520	`for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() )`	517	`for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() )`
521	`{`	518	`{`
522	`C_File *file = node->Data();`	519	`C_File *file = node->Data();`
523	`if ( file->GetFileType() != FILETYPE_MOD )`	520	`if ( file->GetFileType() != FILETYPE_MOD )`
524	`continue;`	521	`continue;`
525		522
526	`if ( file->IsFakePatch() )`	523	`if ( file->IsFakePatch() )`
527	`continue;`	524	`continue;`
528		525
529	`CyString filename = file->GetBaseName();`	526	`Utils::String filename = file->GetBaseName().ToString();`
530	`if ( filename.lower() == mod.lower() )`	527	`if ( filename.Compare(mod) )`
531	`return true;`	528	`return true;`
532	`}`	529	`}`
533	`return false;`	530	`return false;`
534	`}`	531	`}`
535		532
536	`CyString CSpkFile::GetScriptTypeString(int lang)`	533	`Utils::String CSpkFile::GetScriptTypeString(int lang)`
537	`{`	534	`{`
538	`int iType = m_iScriptType;`	535	`int iType = m_iScriptType;`
539		536
540	`if ( this->IsLibrary() )`	537	`if ( this->IsLibrary() )`
541	`return "Library";`	538	`return "Library";`
Line 545...	Line 542...
545	`return "Custom Start";`	542	`return "Custom Start";`
546	`else if ( this->IsPatch() )`	543	`else if ( this->IsPatch() )`
547	`return "Patch";`	544	`return "Patch";`
548	`else if ( m_iScriptType == SCRIPTTYPE_CUSTOM )`	545	`else if ( m_iScriptType == SCRIPTTYPE_CUSTOM )`
549	`{`	546	`{`
550	`CyString type = this->GetCustomScriptType(lang);`	547	`Utils::String type = this->GetCustomScriptType(lang);`
551	`if ( !type.Empty() )`	548	`if ( !type.empty() )`
552	`return type;`	549	`return type;`
553	`iType = -1;`	550	`iType = -1;`
554	`}`	551	`}`
555		552
556	`if (iType == -1) // no script type`	553	`if (iType == -1) // no script type`
557	`{`	554	`{`
558	`if ( this->IsFakePatch() )`	555	`if ( this->IsFakePatch() )`
559	`return "Fake Patch";`	556	`return "Fake Patch";`
560	`}`	557	`}`
561		558
562	`CyString sType = CSpkFile::GetScriptTypeStringStatic(m_iScriptType);`	559	`Utils::String sType = CSpkFile::GetScriptTypeStringStatic(m_iScriptType);`
563		560
564	`if ( sType.Empty() )`	561	`if ( sType.empty() )`
565	`return "Other";`	562	`return "Other";`
566		563
567	`return sType;`	564	`return sType;`
568	`}`	565	`}`
569		566
570	`int CSpkFile::ConvertScriptType(CyString sType)`	567	`int CSpkFile::ConvertScriptType(const Utils::String &sType)`
571	`{`	568	`{`
572	`for ( int i = 0; i < SCRIPTTYPE_MAX; i++ )`	569	`for ( int i = 0; i < SCRIPTTYPE_MAX; i++ )`
573	`{`	570	`{`
574	`if ( sType.Compare(CSpkFile::GetScriptTypeStringStatic(i)) )`	571	`if ( sType.Compare(CSpkFile::GetScriptTypeStringStatic(i)) )`
575	`return i;`	572	`return i;`
576	`}`	573	`}`
577		574
578	`return -1;`	575	`return -1;`
579	`}`	576	`}`
580		577
581	`CyString CSpkFile::GetScriptTypeStringStatic(int type)`	578	`Utils::String CSpkFile::GetScriptTypeStringStatic(int type)`
582	`{`	579	`{`
583	`switch ( type )`	580	`switch ( type )`
584	`{`	581	`{`
585	`case SCRIPTTYPE_CUSTOM:`	582	`case SCRIPTTYPE_CUSTOM:`
586	`return "Custom";`	583	`return "Custom";`
Line 623...	Line 620...
623	`}`	620	`}`
624		621
625	`return "Other";`	622	`return "Other";`
626	`}`	623	`}`
627		624
628	`bool CSpkFile::LoadPackageData(CyString first, CyString rest)`	625	`bool CSpkFile::LoadPackageData(CyString first, CyString sRest)`
629	`{`	626	`{`
-		627	`Utils::String rest = sRest.ToString();`
-		628
630	`if ( first.Compare("ScriptType") )`	629	`if ( first.Compare("ScriptType") )`
631	`{`	630	`{`
632	`if ( rest.Compare("Library") \|\| rest.Compare("Library Script") )`	631	`if ( rest.Compare("Library") \|\| rest.Compare("Library Script") )`
633	`this->SetLibrary();`	632	`this->SetLibrary();`
634	`else if ( rest.Compare("Update") \|\| rest.Compare("Package Update") \|\| rest.Compare("Mod Update") )`	633	`else if ( rest.Compare("Update") \|\| rest.Compare("Package Update") \|\| rest.Compare("Mod Update") )`
Line 637...	Line 636...
637	`this->SetCustomStart();`	636	`this->SetCustomStart();`
638	`else if ( rest.Compare("Patch") \|\| rest.Compare("Patch Mod") )`	637	`else if ( rest.Compare("Patch") \|\| rest.Compare("Patch Mod") )`
639	`this->SetPatch();`	638	`this->SetPatch();`
640	`else`	639	`else`
641	`{`	640	`{`
642	`int check = rest.ToInt();`	641	`int check = rest;`
643	`if ( check \|\| rest == "0" )`	642	`if ( check \|\| rest == "0" )`
644	`m_iScriptType = check;`	643	`m_iScriptType = check;`
645	`else`	644	`else`
646	`{`	645	`{`
647	`m_iScriptType = CSpkFile::ConvertScriptType(rest);`	646	`m_iScriptType = CSpkFile::ConvertScriptType(rest);`
Line 650...	Line 649...
650	`}`	649	`}`
651	`}`	650	`}`
652	`}`	651	`}`
653	`else if ( first.Compare("AnotherMod") )`	652	`else if ( first.Compare("AnotherMod") )`
654	`{`	653	`{`
655	`m_sOtherName = rest.GetToken("\|", 1, 1);`	654	`m_sOtherName = rest.token("\|", 1);`
656	`m_sOtherAuthor = rest.GetToken("\|", 2);`	655	`m_sOtherAuthor = rest.tokens("\|", 2);`
657	`}`	656	`}`
658	`else if ( first.Compare("WareName") \|\| first.Compare("WareDesc") )`	657	`else if ( first.Compare("WareName") \|\| first.Compare("WareDesc") )`
659	`{`	658	`{`
660	`// find the ware to use`	659	`// find the ware to use`
661	`SWares *useWare = m_pLastWare;`	660	`SWares *useWare = m_pLastWare;`
662	`CyString id = rest.GetToken(" ", 1, 1);`	661	`Utils::String id = rest.token(" ", 1);`
663	`for ( CListNode<SWares> *wNode = m_lWares.Front(); wNode; wNode = wNode->next() )`	662	`for ( CListNode<SWares> *wNode = m_lWares.Front(); wNode; wNode = wNode->next() )`
664	`{`	663	`{`
665	`if ( wNode->Data()->sID.Compare(id) )`	664	`if ( wNode->Data()->sID.Compare(id.c_str()) )`
666	`{`	665	`{`
667	`useWare = wNode->Data();`	666	`useWare = wNode->Data();`
668	`break;`	667	`break;`
669	`}`	668	`}`
670	`}`	669	`}`
671		670
672	`// check if we have the id already`	671	`// check if we have the id already`
673	`if ( useWare )`	672	`if ( useWare )`
674	`{`	673	`{`
675	`int lang = rest.GetToken(" ", 2, 2).ToInt();`	674	`int lang = rest.token(" ", 2);`
676	`SWaresText *wt = NULL;`	675	`SWaresText *wt = NULL;`
677	`for ( CListNode<SWaresText> *tNode = useWare->lText.Front(); tNode; tNode = tNode->next() )`	676	`for ( CListNode<SWaresText> *tNode = useWare->lText.Front(); tNode; tNode = tNode->next() )`
678	`{`	677	`{`
679	`if ( tNode->Data()->iLang == lang )`	678	`if ( tNode->Data()->iLang == lang )`
680	`{`	679	`{`
Line 686...	Line 685...
686	`if ( !wt )`	685	`if ( !wt )`
687	`{`	686	`{`
688	`wt = new SWaresText;`	687	`wt = new SWaresText;`
689	`wt->iLang = lang;`	688	`wt->iLang = lang;`
690	`useWare->lText.push_back(wt);`	689	`useWare->lText.push_back(wt);`
691	`}`	690	`}`
692		691
693	`if ( first.Compare("WareName") )`	692	`if ( first.Compare("WareName") )`
694	`wt->sName = rest.GetToken(" ", 3);`	693	`wt->sName = rest.tokens(" ", 3);`
695	`else`	694	`else`
696	`wt->sDesc = rest.GetToken(" ", 3);`	695	`wt->sDesc = rest.tokens(" ", 3);`
697	`}`	696	`}`
698	`}`	697	`}`
699	`else if ( first.Left(4).Compare("Ware") )`	698	`else if ( first.Left(4).Compare("Ware") )`
700	`{`	699	`{`
701	`SWares *ware = new SWares;`	700	`SWares *ware = new SWares;`
702	`ware->iTextID = -1;`	701	`ware->iTextID = -1;`
703	`ware->iTextPage = 0;`	702	`ware->iTextPage = 0;`
704	`ware->cType = first[4];`	703	`ware->cType = first[4];`
705	`ware->iPrice = rest.GetToken ( " ", 2, 2 ).ToLong();`	704	`ware->iPrice = rest.token(" ", 2);`
706	`ware->iSize = rest.GetToken ( " ", 3, 3 ).ToInt();`	705	`ware->iSize = rest.token(" ", 3);`
707	`ware->iVolumn = rest.GetToken ( " ", 4, 4 ).ToInt();`	706	`ware->iVolumn = rest.token(" ", 4);`
708	`ware->sID = rest.GetToken ( " ", 1, 1 );`	707	`ware->sID = rest.token(" ", 1);`
709	`ware->iNotority = rest.GetToken ( " ", 5, 5 ).ToInt();`	708	`ware->iNotority = rest.token(" ", 5);`
710	`if ( !rest.GetToken(" ", 6, 6).Empty() )`	709	`if ( !rest.token(" ", 6).empty() )`
711	`{`	710	`{`
712	`ware->iTextID = rest.GetToken ( " ", 6, 6 ).GetToken(",", 2, 2).ToInt();`	711	`ware->iTextID = rest.token(" ", 6).token(",", 2);`
713	`ware->iTextPage = rest.GetToken ( " ", 6, 6 ).GetToken(",", 1, 1).ToInt();`	712	`ware->iTextPage = rest.token(" ", 6).token(",", 1);`
714	`}`	713	`}`
715	`m_lWares.push_back ( ware );`	714	`m_lWares.push_back ( ware );`
716	`m_pLastWare = ware;`	715	`m_pLastWare = ware;`
717	`}`	716	`}`
718		717
719	`else if ( CBaseFile::LoadPackageData(first, rest) )`	718	`else if ( CBaseFile::LoadPackageData(first, rest) )`
720	`return true;`	719	`return true;`
721	`else`	720	`else`
722	`return false;`	721	`return false;`
723		722
724	`return true;`	723	`return true;`
725	`}`	724	`}`
726		725
727	`bool CSpkFile::GeneratePackagerScript(bool wildcard, CyStringList *list, bool datafile)`	726	`bool CSpkFile::GeneratePackagerScript(bool wildcard, CyStringList *list, bool datafile)`
728	`{`	727	`{`

Subversion Repositories spk

(root)//libspk/src/SpkFile.cpp – Rev 9 → 10