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

 	SetDefaults ();
+}
 CBaseFile::~CBaseFile()
+{
 	Delete();
+}
+Utils::String CBaseFile::getFullPackageName(int language, const Utils::String &byString) const
+{
+	return getFullPackageName(language, true, byString);
+}
+Utils::String CBaseFile::getFullPackageName(int language, bool includeVersion, const Utils::String &byString) const
+{
+	Utils::String p;
+	if (language == -1)
+		p = this->name();
+	else
+		p = getLanguageName(language);
+	if (includeVersion)
+	{
+		p += " V";
+		p += this->version();
+	}
+	p += " ";
+	p += byString + " " + this->author();
+	return p;
+}
+Utils::String CBaseFile::getFullPackageName(const Utils::String &format, int lang) const
+{
+	if (format.empty())
+		return getFullPackageName(lang);
+	Utils::String args[3] = { this->getLanguageName(lang), this->version(), this->author()};
+	return format.args(args, 3);
+}
 void CBaseFile::Delete ()
+{
+	m_lTempFiles.clear();
 	m_lFiles.clear(true);
 	if ( m_pIconFile )
 	{
 		delete m_pIconFile;
 		m_pIconFile = NULL;
+	}
 	if ( _pTextDB ) {
 		delete _pTextDB;
 		_pTextDB = NULL;
+	}
-	m_lNames.clear(true);
 }
-CyString CBaseFile::GetLanguageName(int lang) const
-{
-	for (CListNode<SNames>* node = m_lNames.Front(); node; node = node->next())
-	{
-		SNames* n = node->Data();
-		if (n->iLanguage == lang)
-			return n->sName;
-	}
-	return this->name();
-}
 const Utils::String &CBaseFile::getLanguageName(int lang) const
 {
-	for (CListNode<SNames>* node = m_lNames.Front(); node; node = node->next())
-	{
-		SNames* n = node->Data();
-		if (n->iLanguage == lang)
-			return n->sName;
-	}
-	return this->name();
+	return name(lang);
 }
 /*
 ##########################################################################################
 ##################                Base Class Functions                  ##################
 ##########################################################################################
 */
-const CLinkList<C_File> *CBaseFile::fileList() const
+const CLinkList<C_File> &CBaseFile::fileList() const
+{
-	return &m_lFiles;
+	return m_lFiles;
+}
-CLinkList<C_File> *CBaseFile::fileList(int type) const
+CLinkList<C_File> &CBaseFile::fileList(FileType type, CLinkList<C_File>& list) const
 {
-	CLinkList<C_File> *list = new CLinkList<C_File>;
-	for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() )
+	for (CListNode<C_File>* node = m_lFiles.Front(); node; node = node->next())
+	{
-		C_File *f = node->Data();
+		C_File* f = node->Data();
-		if ( f->GetFileType() == type )
+		if (f->GetFileType() == type)
-			list->push_back(f);
+			list.push_back(f);
+	}
 	return list;
+}
+CLinkList<C_File> &CBaseFile::fileList(FileType type)
+{
+	m_lTempFiles.clear();
+	return fileList(type, m_lTempFiles);
+}
 C_File *CBaseFile::GetNextFile(C_File *prev) const
+{
 	int type = -1;
+		}
 		else
+		{
 			if ( f->GetFileType() == type )
 				return f;
 		}
 	}
 	return NULL;
 }
 C_File *CBaseFile::GetFirstFile(int type) const
+{
 	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() )
+		if ( f->dir() != file->dir() )
 			continue;
 		if ( f->game() != file->game() )
 			continue;
 		m_lFiles.remove(node, true);
+	}
 	_addFile(file);
+}
-C_File *CBaseFile::AddFile(CyString file, CyString dir, int type, int game)
-{
-	return addFile(file.ToString(), dir.ToString(), (FileType)type, game);
-}
 C_File *CBaseFile::addFile(const Utils::String &file, const Utils::String &dir, FileType type, int game, bool packed)
+{
 	C_File *newfile = new C_File(file);
 	newfile->SetDir(dir);
 	newfile->setFileType(type);
+		}
 		// 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 )
+bool CBaseFile::addFileNow(const Utils::String &file, const Utils::String &dir, FileType type, CProgressInfo* progress)
 {
-	C_File *f = AddFile ( file, dir, type );
+	C_File* f = addFile(file, dir, type);
-	if ( !f->ReadFromFile () )
+	if (!f->ReadFromFile())
 		return false;
 	// compress the file
-	return f->CompressData ( m_SHeader2.iDataCompression, progress );
+	return f->CompressData(m_SHeader2.iDataCompression, progress);
+}
 C_File *CBaseFile::appendFile(const Utils::String &file, int type, int game, bool packed, const Utils::String &dir, CProgressInfo *progress )
+{
 	C_File *newfile = addFile(file, dir, static_cast<FileType>(type), game, packed);
 	if ( !newfile )
 		return NULL;
 	// read the file into memory
 	if (newfile->GetData() && newfile->GetDataSize())
 	{
 		// now compress the file
 		if (newfile->CompressData(m_SHeader2.iDataCompression, progress))
 			return newfile;
+	}
 	if ( newfile->ReadFromFile () )
 	delete newfile;
 	return NULL;
+}
-C_File *CBaseFile::FindFileAt ( int filetype, int pos )
+C_File *CBaseFile::findFileAt(FileType filetype, size_t pos) const
+{
-	int count = 0;
+	size_t count = 0;
 	for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() )
+	{
 		C_File *file = node->Data();
 		if ( file->GetFileType() != filetype )
 			continue;
 		if ( count == pos )
 			return file;
 		++count;
 	}
 	return NULL;
 }
-C_File *CBaseFile::FindFile ( CyString filename, int type, CyString dir, int game )
+C_File* CBaseFile::findFile(const Utils::String &filename, FileType type, const Utils::String &dir, int game) const
 {
-	CyString lfile = filename.ToLower();
+	Utils::String lfile = CFileIO(filename.lower()).filename();
-	lfile = lfile.FindReplace ( "\\", "/" );
-	lfile = lfile.GetToken ( lfile.NumToken('/'), '/' );
-	CListNode<C_File> *node = m_lFiles.Front();
+	CListNode<C_File>* node = m_lFiles.Front();
-	while ( node )
+	while (node)
 	{
-		C_File *f = node->Data();
+		C_File* f = node->Data();
 		node = node->next();
-		if ( type != f->GetFileType() )
+		if (type != f->GetFileType())
 			continue;
-		if ( dir != f->GetDir() )
+		if (dir != f->dir())
 			continue;
-		if ( game != f->game() )
+		if (game != f->game())
 			continue;
-		if ( f->GetName().ToLower() == lfile )
+		if (f->name().lower() == lfile)
 			return f;
+	}
 	return NULL;
 }
-bool CBaseFile::RemoveFile ( CyString file, int type, CyString dir, int game )
+bool CBaseFile::removeFile(const Utils::String& file, FileType type, const Utils::String& dir, int game)
 {
-	C_File *f = FindFile (file, type, dir, game);
+	C_File* f = findFile(file, type, dir, game);
-	if ( !f )
+	if (!f)
 		return false;
-	return RemoveFile ( f );
+	return RemoveFile(f);
+}
 bool CBaseFile::RemoveFile ( C_File *file )
+{
 	int count = 0;
+{
 	if ( (pos < 0) || (pos >= m_lFiles.size()) )
 		return false;
 	C_File *file = m_lFiles.Get ( pos );
 	m_lFiles.erase ( pos + 1 );
 	if ( file )
 		delete file;
 	_changed();
+			{
 				// just remove the game from file
 				if (fileGame & (1 << game))
 					node->Data()->setGame(node->Data()->game() & ~(1 << game));
 				continue;
 			}
 		}
 		if ( type == FILETYPE_UNKNOWN || node->Data()->GetFileType() == type )
 			node->DeleteData();
 	}
 	m_lFiles.RemoveEmpty();
 	_changed();
 }
 void CBaseFile::RecompressAllFiles ( int type, CProgressInfo *progress )
+{
 	for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() )
+	{
 		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);
 		if ( !file->GetData() )
 			file->ReadFromFile();
 		file->CompressData ( type, progress, level );
 		if ( overallProgress ) overallProgress->SetDone(++iCount);
+	}
+}
 bool CBaseFile::UncompressAllFiles ( CProgressInfo *progress )
 		C_File *fit = node->Data();
 		if ( progress )
+		{
 			progress->UpdateFile ( fit );
 			progress->UpdateProgress(countFile++, m_lFiles.size());
 		}
 		bool uncomprToFile = false;
 		if ( progress )
 			progress->SwitchSecond();
 		if(!fit->isExternalFile())
+		{
+					{
 						uncomprToFile = true;
 						fit->SetFullDir("temp");
+					}
+				}
 				if (!uncomprToFile)
 					return false;
+			}
+		}
 		if ( progress )
 			progress->SwitchSecond();
 	}
 	return true;
 }
-long CBaseFile::GetFullFileSize()
+size_t CBaseFile::fileSize() const
 {
-	long fullsize = 1000;
+	size_t fullsize = 1000;
-	for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() )
+	for (CListNode<C_File>* node = m_lFiles.Front(); node; node = node->next())
 		fullsize += node->Data()->GetUncompressedDataSize();
-	if ( m_pIconFile )
+	if (m_pIconFile)
 		fullsize += m_pIconFile->GetUncompressedDataSize();
 	return fullsize;
+}
 /*
 	Func:   GetEndOfLine
 	Input:  id - The file id for the current file to read from
 	        line - Pointed to hold the line number thats read
 			upper - true if it converts to uppercase
 	char c = fgetc ( id );
 	if ( c == -1 )
 		return "";
 	while ( (c != 13) && (!feof(id)) && (c != '\n') )
 	{
 		word += c;
 		c = fgetc ( id );
 	}
 	if ( line )
 		++(*line);
 	if ( upper )
 		return word.ToUpper();
 	return word;
 }
-int CBaseFile::CountFiles ( int filetype )
+size_t CBaseFile::countFiles(FileType filetype) const
+{
-	int i = 0;
+	size_t i = 0;
 	for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() )
+	{
 		C_File *file = node->Data();
 		if ( file->GetFileType() != filetype )
 			continue;
 		++i;
+	}
 	return i;
-}
-void CBaseFile::ClearNames ()
-{
-	m_lNames.clear(true);
-}
-void CBaseFile::RemoveLanguageName ( int lang )
-{
-	SNames *n;
-	for ( n = m_lNames.First(); n; n = m_lNames.Next() )
-	{
-		if ( n->iLanguage == lang )
-		{
-			m_lNames.RemoveCurrent();
-			delete n;
-			_changed();
-		}
-	}
-}
-void CBaseFile::AddLanguageName ( int lang, const Utils::String &name )
-{
-	// first check for an existing language
-	SNames *n;
-	for ( n = m_lNames.First(); n; n = m_lNames.Next() )
-	{
-		if ( n->iLanguage == lang )
-		{
-			n->sName = name;
-			return;
-		}
-	}
-	// not found, add a new entry
-	n = new SNames;
-	n->iLanguage = lang;
-	n->sName = name;
-	m_lNames.push_back ( n );
-	_changed();
-}
-CyString CBaseFile::GetFullPackageName(CyString format, int lang)
-{
-	if ( format.Empty() )
-		return GetFullPackageName(lang);
-	CyString args[3] = { this->GetLanguageName(lang), this->version(), this->author() };
-	return format.Args(args, 3);
+}
 /*
 	Func:   CreateFilesLine
 	Return: String - returns the full string for files list
 	Desc:   Creates a signle line list of all the files
 */
-CyString CBaseFile::CreateFilesLine ( bool updateheader, CProgressInfo *progress )
+Utils::String CBaseFile::createFilesLine(bool updateheader, CProgressInfo* progress)
+{
-	CyString line;
+	Utils::String line;
-	if ( progress )
+	if (progress)
+	{
 		progress->SetDone(0);
 		progress->UpdateStatus(STATUS_COMPRESS);
 	}
-	if ( updateheader )
+	if (updateheader)
 	{
 		m_SHeader2.iNumFiles = 0;
 		m_SHeader2.lFullSize = 0;
 	}
-	if ( m_pIconFile )
+	if (m_pIconFile)
 	{
 		// no data, read it from file
-		if ( !m_pIconFile->GetData() )
+		if (!m_pIconFile->GetData())
-			m_pIconFile->ReadFromFile ();
+			m_pIconFile->ReadFromFile();
 		// compress the file
-		if ( !m_pIconFile->CompressData ( m_SHeader2.iDataCompression, progress ) )
+		if (!m_pIconFile->CompressData(m_SHeader2.iDataCompression, progress))
 			m_pIconFile->SetDataCompression(SPKCOMPRESS_NONE);
-		line += CyString("Icon:") + (m_pIconFile->GetDataSize() + (long)4) + ":" + m_pIconFile->GetUncompressedDataSize() + ":" + (long)m_pIconFile->GetCompressionType() + ":" + _sIconExt + "\n";
+		line += "Icon:" + Utils::String::Number(m_pIconFile->GetDataSize() + (long)4) + ":" + m_pIconFile->GetUncompressedDataSize() + ":" + (long)m_pIconFile->GetCompressionType() + ":" + _sIconExt + "\n";
-		if ( updateheader )
+		if (updateheader)
+		{
 			++m_SHeader2.iNumFiles;
 			m_SHeader2.lFullSize += (m_pIconFile->GetDataSize() + 4);
+		}
+	}
-	for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() )
+	for (CListNode<C_File>* node = m_lFiles.Front(); node; node = node->next())
+	{
-		C_File *file = node->Data();
+		C_File* file = node->Data();
-		if ( progress )
+		if (progress)
-			progress->UpdateFile ( file );
+			progress->UpdateFile(file);
 		// no data, read it from file
-		if ( !file->GetData() )
+		if (!file->GetData())
+		{
-			if ( !file->ReadFromFile () )
+			if (!file->ReadFromFile())
+			{
-				if ( file->GetLastError() == SPKERR_MALLOC )
+				if (file->GetLastError() == SPKERR_MALLOC)
+				{
-					if ( !file->CompressFile ( progress ) )
+					if (!file->CompressFile(progress))
 						continue;
+				}
+			}
 		}
-		if ( !file->GetData() )
+		if (!file->GetData())
 			continue;
 		// compress the file
-		if ( !file->CompressData ( m_SHeader2.iDataCompression, progress ) )
+		if (!file->CompressData(m_SHeader2.iDataCompression, progress))
+		{
 			file->SetDataCompression(SPKCOMPRESS_NONE);
 			file->SetUncompressedDataSize(file->GetDataSize());
 		}
-		CyString command = GetFileTypeString ( file->GetFileType() );
+		Utils::String command = GetFileTypeString(file->GetFileType());
-		if ( command.Empty() )
+		if (command.empty())
 			continue;
-		if ( file->IsShared() )
+		if (file->IsShared())
-			command = CyString("$") + command;
+			command = "$" + command;
-		if ( file->GetDir().Empty() )
+		if (file->dir().empty())
-			line += (command + &quot;:"; + (file->GetDataSize() + (long)4) + ";:" + file->GetUncompressedDataSize() + ":" + (long)file->GetCompressionType() + ":" + (long)file->GetCreationTime() + &quot;:"; + ((file->IsCompressedToFile()) ? "1" : "0") + ":" + file->filename() + ":NULL:" + (long)file-&gt;game() + &quot;\n");
+			line += command + &quot;:"; + (file->GetDataSize() + (long)4) + ";:" + file->GetUncompressedDataSize() + ":" + (long)file->GetCompressionType() + ":" + (long)file->GetCreationTime() + &quot;:"; + ((file->IsCompressedToFile()) ? "1" : "0") + ":" + file->filename() + ":NULL:" + (long)file-&gt;game() + &quot;\n";
 		else
-			line += (command + &quot;:"; + (file->GetDataSize() + (long)4) + &quot;:" + file->GetUncompressedDataSize() + ":" + (long)file->GetCompressionType() + ":" + (long)file->GetCreationTime() + &quot;:" + ((file->IsCompressedToFile()) ? "1" : &quot;0&quot;) + ":" + file->filename() + ":" + file->GetDir() + ":" + (long)file->game() + &quot;\n");
+			line += command + &quot;:"; + (file->GetDataSize() + (long)4) + &quot;:" + file->GetUncompressedDataSize() + ":" + (long)file->GetCompressionType() + ":" + (long)file->GetCreationTime() + &quot;:" + ((file->IsCompressedToFile()) ? "1" : &quot;0&quot;) + ":" + file->filename() + ":" + file->dir() + ":&quot; + (long)file->game() + "\n";
-		if ( updateheader )
+		if (updateheader)
+		{
 			++m_SHeader2.iNumFiles;
 			m_SHeader2.lFullSize += (file->GetDataSize() + 4);
+		}
+	}
 	return line;
+}
 /*
 ######################################################################################
 ##########							Reading Functions			    		##########
 ######################################################################################
 	else if ( first.Compare("Desc:") )				this->setDescription(rest);
 	else if ( first.Compare("UninstallAfter:") )	this->addUninstallText(ParseLanguage(rest.token("|", 1)), false, rest.tokens("|", 2));
 	else if ( first.Compare("UninstallBefore:") )	this->addUninstallText(ParseLanguage(rest.token("|", 1)), true, rest.tokens("|", 2));
 	else if ( first.Compare("InstallAfter:") )		this->addInstallText(ParseLanguage(rest.token("|", 1)), false, rest.tokens("|", 2));
 	else if ( first.Compare("InstallBefore:") )		this->addInstallText(ParseLanguage(rest.token("|", 1)), true, rest.tokens("|", 2));
-	else if ( first.Compare("ScriptName:") )
-		AddLanguageName(ParseLanguage(rest.token(":", 1)), rest.token(":", 2));
+	else if ( first.Compare("ScriptName:") )		addName(ParseLanguage(rest.token(":", 1)), rest.token(":", 2));
 	else if ( first.Compare("GameChanging:") )		this->setGameChanging(rest);
 	else if ( first.Compare("EaseOfUse:") )			this->setEaseOfUse(rest);
 	else if ( first.Compare("Recommended:") )		this->setRecommended(rest);
 	else if ( first.Compare("NeededLibrary:") )
 		this->AddNeededLibrary(rest.token("||", 1), rest.token("||", 2), rest.token("||", 3));
 	values += Utils::String("GameChanging: ") + (long)gameChanging() + "\n";
 	values += Utils::String("EaseOfUse: ") + (long)easeOfUse() + "\n";
 	values += Utils::String("Recommended: ") + (long)recommended() + "\n";
-	for ( CListNode<SNames> *nNode = m_lNames.Front(); nNode; nNode = nNode->next() )
+	for(auto itr = namesList()->begin(); itr != namesList()->end(); itr++)
-		values += Utils::String("ScriptName: ") + (long)nNode->Data()->;iLanguage + ":" + nNode->Data()->sName + "\n";
+		values += Utils::String("ScriptName: ") + (long)(*itr)->;iLanguage + ":" + (*itr)->sName + "\n";
 	for ( CListNode<SNeededLibrary> *libNode = m_lNeededLibrarys.Front(); libNode; libNode = libNode->next() ) {
 		SNeededLibrary *l = libNode->Data();
 		values += "NeededLibrary: " + l->sName + "||" + l->sAuthor + "||" + l->sMinVersion + "\n";
+	}
 	file.write(valueCompr, valueComprLen);
 	free ( valueCompr );
 	// now compress the files header
 	// create the files values
-	CyString files = CreateFilesLine ( true, progress );
+	Utils::String files = createFilesLine (true, progress);
 	// compress the files values
-	long fileUncomprLen = (long)files.Length(), fileComprLen = fileUncomprLen;
+	long fileUncomprLen = (long)files.length(), fileComprLen = fileUncomprLen;
 	unsigned char *fileCompr = NULL;
 	compressed = false;
 	if ( fileUncomprLen )
+	{
 			if ( fileComprLen < 100 )
 				fileComprLen = 200;
 			else if ( fileComprLen < 1000 )
 				fileComprLen *= 2;
 			fileCompr = (unsigned char *)calloc((unsigned int)fileComprLen, 1);
-			int err = compress ( (unsigned char *)fileCompr, (unsigned long *)&fileComprLen, (const unsigned char *)files.c_str(), (unsigned long)files.Length(), 0 );
+			int err = compress ( (unsigned char *)fileCompr, (unsigned long *)&fileComprLen, (const unsigned char *)files.c_str(), (unsigned long)files.length(), 0 );
 			if ( err == Z_OK )
 				compressed = true;
+		}
+	}
 		list->pushBack("# Ratings Values, 0 to 5, <ease> <changing> <recommended>");
 		list->pushBack(Utils::String("Ratings: ") + (long)easeOfUse() + " " + (long)gameChanging() + " " + (long)recommended());
 		list->pushBack("");
+	}
-	if ( m_lNames.size() )
+	if (namesList()->size())
+	{
 		list->pushBack("# Package names, uses different names for different languages");
-		for ( CListNode<SNames> *node = m_lNames.Front(); node; node = node->next() )
+		for(auto itr = namesList()->begin(); itr != namesList()->end(); itr++)
-			list->pushBack(Utils::String("ScriptName: ") + (long)node->Data()->;iLanguage + " " + node->Data()->sName);
+			list->pushBack(Utils::String("ScriptName: ") + (long)(*itr)->;iLanguage + " " + (*itr)->sName);
 		list->pushBack("");
+	}
 	for ( int j = 0; j < 2; j++ ) {
 		Utils::String installText = (j == 0) ? "Install" : "Uninstall";
+	}
 	return true;
+}
-Utils::String CBaseFile::GetAutosaveName()
+Utils::String CBaseFile::getAutosaveName() const
+{
 	return this->name() + "-V" + this->version() + "-" + this->creationDate().findReplace("/", ".");
+}
 bool CBaseFile::CheckGameCompatability(int game)
 			return true;
+	}
 	return false;
+}
-bool CBaseFile::CheckGameVersionCompatability(int game, CyString sVersion, int iVersion)
+bool CBaseFile::checkGameVersionCompatability(int game, const Utils::String &sVersion, int iVersion) const
+{
-	if ( m_lGames.empty() )
+	if (m_lGames.empty())
 		return true; // no game compatability added, assume its ok for all
 	bool foundAll = false;
 	for ( CListNode<SGameCompat> *node = m_lGames.Front(); node; node = node->next() ) {
 		if ( node->Data()->iGame == 0 )
 			foundAll = true;
 		else if ( node->Data()->iGame == game ) { // now check the version
 			if ( node->Data()->sVersion.empty() ) {
-				if ( CyString(node-&gt;Data()->sVersion).CompareVersion(sVersion) == COMPARE_OLDER )
+				if (node-&gt;Data()->sVersion.compareVersion(sVersion) == COMPARE_OLDER)
 					return false;
 				return true;
+			}
 			else {
 				if ( node->Data()->iVersion > iVersion )
+}
 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("ScriptName"))		addName(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("WebMirror1"))
 		this->addWebMirror(sRest);
 	else if (sFirst.Compare("WebMirror2"))
 		this->addWebMirror(sRest);
 	else if (sFirst.Compare("Ftp"))
-		m_sFtpAddr = sRest;
+		_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"))
+	}
 	else if (sFirst.Compare("Icon"))
+	{
 		C_File *icon = new C_File(sRest.c_str());
 		if (icon->ReadFromFile())
-			this->SetIcon(icon, CFileIO(sRest).extension());
+			this->setIcon(icon, CFileIO(sRest).extension());
+	}
 	else if (sFirst.Compare("CombineGameFiles"))
 		_bCombineFiles = sRest.Compare("true") || sRest.Compare("yes") || sRest.toInt();
 	else if (sFirst.Compare("UpdateFile"))
 		this->createUpdateFile(sRest);
 			file->SetShared(shared);
+	}
+}
-CyString CBaseFile::GetFullFileSizeString() { return SPK::GetSizeString ( this->GetFullFileSize() ); }
+Utils::String CBaseFile::fileSizeString() const { return SPK::GetSizeString ( this->fileSize() ); }
 // used for a multiple spk file
 unsigned char *CBaseFile::CreateData(size_t *size, CProgressInfo *progress)
+{
 	if ( this->WriteFile("temp.dat", progress) ) {
+	}
 	return NULL;
+}
-void CBaseFile::ConvertNormalMod(C_File *f, CyString to)
+void CBaseFile::convertNormalMod(C_File *f, const Utils::String &to) const
+{
-	C_File *match = this->FindMatchingMod(f);
+	C_File *match = this->findMatchingMod(f);
 	if ( match )
+	{
 		// file link
 		if ( !match->GetData() )
 			match->ReadFromFile();
 		f->ReadFromFile();
 	f->ChangeBaseName(to);
+}
-void CBaseFile::ConvertAutoText(C_File *f)
+void CBaseFile::convertAutoText(C_File *f) const
+{
-	CyString to;
+	Utils::String to;
-	if ( f->GetBaseName().IsIn("-L") )
+	if ( f->baseName().contains("-L") )
-		to = CyString("0000-L";) + f-&gt;GetBaseName().GetToken(";-L", 2, 2);
+		to = "0000-L"; + f-&gt;baseName().token(";-L", 2);
 	else if ( f->GetBaseName().IsIn("-l") )
-		to = CyString("0000-L";) + f-&gt;GetBaseName().GetToken(";-l", 2, 2);
+		to = "0000-L"; + f-&gt;baseName().token(";-l", 2);
 	else
-		to = f->GetBaseName().Left(-4) + "0000";
+		to = f->baseName().left(-4) + "0000";
 	// file link
 	if ( !f->GetData() )
 		f->ReadFromFile();
 	f->ChangeBaseName(to);
+}
-void CBaseFile::ConvertFakePatch(C_File *f)
+void CBaseFile::convertFakePatch(C_File *f) const
+{
 	// find next available fake patch
 	int num = 0;
 	bool found = true;
 	while ( found )
+	{
 		++num;
 		found = false;
-		CyString find = CyString::Number(num).PadNumber(2);
+		Utils::String find = Utils::String::PadNumber(num, 2);
 		for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() )
+		{
 			if ( node->Data()->GetFileType() != FILETYPE_MOD )
 				continue;
 			if ( !node->Data()->IsFakePatch() )
 				continue;
-			if ( node->Data()->GetBaseName().Compare(find) )
+			if ( node->Data()->baseName().Compare(find) )
+			{
 				found = true;
 				break;
+			}
+		}
+	}
-	CyString to = CyString::Number(num).PadNumber(2);
+	Utils::String to = Utils::String::PadNumber(num, 2);
-	C_File *match = this->FindMatchingMod(f);
+	C_File *match = this->findMatchingMod(f);
 	// file link
 	if ( !f->GetData() )
 		f->ReadFromFile();
 			match->ReadFromFile();
 		match->ChangeBaseName(to);
+	}
+}
-C_File *CBaseFile::FindMatchingMod(C_File *f)
+C_File *CBaseFile::findMatchingMod(C_File *f) const
+{
 	for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() )
+	{
 		if ( node->Data()->GetFileType() != FILETYPE_MOD )
 			continue;
+	}
 	return NULL;
+}
-void CBaseFile::RenameFile(C_File *f, CyString baseName)
+void CBaseFile::renameFile(C_File *f, const Utils::String &baseName) const
+{
 	if ( f->GetFileType() == FILETYPE_MOD )
+	{
-		C_File *match = this->FindMatchingMod(f);
+		C_File *match = this->findMatchingMod(f);
 		if ( match )
 			match->ChangeBaseName(baseName);
+	}
 	// need to edit the file

Subversion Repositories spk

(root)/libspk/src/BaseFile.cpp – Rev 162 → 170