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

 		p->pFile = new CSpkFile();
 	else if ( p->iType == TYPE_BASE )
 		p->pFile = new CBaseFile();
+}
-bool CMultiSpkFile::AddFileNow ( CyString file, bool on )
+bool CMultiSpkFile::addFileNow(const Utils::String &file, bool on )
+{
-	if ( this->AddFile(file, on) )
+	if ( this->addFile(file, on) )
+	{
 		Utils::String findFile = CFileIO(file).filename();
-		SMultiSpkFile *p = this->FindFile(findFile);
+		const SMultiSpkFile *p = this->findFile(findFile);
 		if ( p )
+		{
-			this->CreatePackage(p);
+			this->CreatePackage(const_cast<SMultiSpkFile*>(p));
-			if ( p->pFile->readFile(file.ToString(), SPKREAD_ALL))
+			if ( p->pFile->readFile(file, SPKREAD_ALL))
 				return true;
+		}
+	}
 	return false;
+}
-bool CMultiSpkFile::AddFile(SMultiSpkFile *ms)
+bool CMultiSpkFile::addFile(SMultiSpkFile *ms)
+{
 	bool found = false;
 	// find if theres any files with the same filename
 	CListNode<SMultiSpkFile> *node;
 	for ( node = m_lFiles.Front(); node; node = node->next() )
 	m_lFiles.push_back ( ms );
 	m_bChanged = true;
 	return true;
+}
-bool CMultiSpkFile::AddFile ( CyString sFile, bool on )
+bool CMultiSpkFile::addFile(const Utils::String &file, bool on)
+{
-	Utils::String file = sFile.ToString();
 	// multipack
 	if (file.contains( "::" ))
+	{
 		Utils::String mfile = file.left(file.findPos("::"));
 		CMultiSpkFile spkfile;
-		if ( spkfile.ReadFile ( mfile, false ) )
+		if ( spkfile.readFile(mfile, false))
+		{
 			SMultiSpkFile *ms = new SMultiSpkFile;
 			ms->bRemove = false;
 			ms->sName = file.right((int)(file.length() - file.findPos("::")) - 2 );
 			ms->pFile = NULL;
 			ms->sData = NULL;
-			if ( spkfile.ExtractData ( ms ) )
+			if ( spkfile.extractData(ms))
+			{
 				ms->bOn = on;
-				AddFile(ms);
+				addFile(ms);
 				return true;
+			}
 			delete ms;
+		}
 		return false;
 	// check its a valid file
 	int check = CBaseFile::CheckFile(file);
 	if ( check == SPKFILE_MULTI )
+	{
 		CMultiSpkFile spkfile;
-		if ( spkfile.ReadFile ( file, false ) )
+		if ( spkfile.readFile(file, false))
+		{
 			CLinkList<SMultiSpkFile> *list = spkfile.GetFileList();
 			for ( SMultiSpkFile *it = list->First(); it; it = list->Next() )
+			{
 				SMultiSpkFile *ms = new SMultiSpkFile;
 				ms->bRemove = false;
 				ms->sName = it->sName;
 				ms->pFile = NULL;
 				ms->sData = NULL;
-				if ( spkfile.ExtractData ( ms ) )
+				if (spkfile.extractData(ms))
+				{
 					ms->bOn = on;
-					AddFile(ms);
+					addFile(ms);
+				}
 				else
 					delete ms;
+			}
 			return true;
+		}
 		delete baseFile;
+	}
-	AddFile(ms);
+	addFile(ms);
 	return true;
+}
-SMultiSpkFile *CMultiSpkFile::AddFileEntry ( CyString filename )
+SMultiSpkFile *CMultiSpkFile::addFileEntry(const Utils::String &filename)
+{
 	SMultiSpkFile *ms = new SMultiSpkFile;
 	ms->bRemove = false;
 	ms->pFile = NULL;
-	ms->sName = filename.ToString();
+	ms->sName = filename;
 	ms->bOn = true;
 	ms->iType = -1;
 	m_lFiles.push_back ( ms );
 	m_bChanged = true;
 	return ms;
+}
-CyString CMultiSpkFile::CreateData ()
-{
-	Utils::String ret;
-	if ( !_sName.empty() )
-		ret = "Name: " + _sName + "\n";
-	for ( CListNode<SMultiSpkFile> *node = m_lFiles.Front(); node; node = node->next() )
-	{
-		SMultiSpkFile *ms = node->Data();
-		if ( ms->iType == TYPE_XSP )
-			ret += "XspFile: ";
-		else
-			ret += "SpkFile: ";
-		if ( ms->bOn )
-			ret += "1:";
-		else
-			ret += "0:";
-		ret += ms->lSize;
-		ret += ":";
-		ret += ms->sName;
-		if ( !ms->sScriptName.empty() )
-			ret += ":" + ms->sScriptName + "|" + ms->sScriptAuthor + "|" + ms->sScriptVersion;
-		ret += "\n";
-	}
-	return ret;
-}
-bool CMultiSpkFile::WriteFile ( CyString filename, CProgressInfo *progress )
+bool CMultiSpkFile::writeFile(const Utils::String &filename, CProgressInfo *progress)
+{
 	CFileIO File(filename);
 	if ( !File.startWrite() ) return false;
 	// make sure we remove all packages that have been marked
 	this->RemovePackages();
-	CyString data = CreateData ();
+	Utils::String data = _createData();
-	int comprLen = (int)data.Length(), uncomprLen = comprLen;;
+	int comprLen = (int)data.length(), uncomprLen = comprLen;;
 	unsigned char *compr = NULL;
 	bool compressed = false;
 	int valueheader = m_SHeader.iCompression;
 	if ( valueheader == SPKCOMPRESS_7ZIP )
 			comprLen = 200;
 		else if ( comprLen < 1000 )
 			comprLen *= 2;
 		compr = (unsigned char *)calloc((unsigned int)comprLen, 1);
-		int err = compress ( (unsigned char *)compr, (unsigned long *)&comprLen, (const unsigned char *)data.c_str(), (unsigned long)data.Length(), 0 );
+		int err = compress ( (unsigned char *)compr, (unsigned long *)&comprLen, (const unsigned char *)data.c_str(), (unsigned long)data.length(), 0 );
 		if ( err == Z_OK )
 			compressed = true;
+	}
 	if ( !compressed )
+	{
 		comprLen = uncomprLen;
 		compr = (unsigned char *)calloc((unsigned int)comprLen, 1);
 		memcpy ( compr, data.c_str(), comprLen );
 		valueheader = SPKCOMPRESS_NONE;
 	}
 	// write the main header to the file
-	if ( !File.write("MSPKCycrow;%.2f;%d;%d;%d;%d\n", FILEVERSION, valueheader, data.Length(), comprLen, (m_SHeader.bSelection) ? 1 : 0) ) return false;
+	if ( !File.write("MSPKCycrow;%.2f;%d;%d;%d;%d\n", FILEVERSION, valueheader, data.length(), comprLen, (m_SHeader.bSelection) ? 1 : 0) ) return false;
 	// write the compressed data to file
 	File.writeSize(uncomprLen);
 	File.write(compr, comprLen);
 	free ( compr );
 			progress->UpdatePackage(ms);
 		if ( (!ms->sData) && (ms->pFile) )
 			ms->pFile->writeData(File, NULL);
 		else
 			File.write(ms->sData, ms->lSize);
-	}
-	return true;
-}
-bool CMultiSpkFile::ParseHeader ( CyString header )
-{
-	if ( header.GetToken ( 1, ';' ) != "MSPKCycrow" )
-		return false;
-	m_SHeader.fVersion = header.GetToken ( 2, ';' ).ToFloat();
-	if ( m_SHeader.fVersion > FILEVERSION )
-		return false;
-	m_SHeader.iCompression = header.GetToken ( 3, ';' ).ToInt();
-	m_SHeader.lUncomprLen = header.GetToken ( 4, ';' ).ToLong();
-	m_SHeader.lComprLen = header.GetToken ( 5, ';' ).ToLong();
-	m_SHeader.bSelection = (header.GetToken ( 4, ';' ).ToInt()) ? true : false;
-	return true;
-}
-bool CMultiSpkFile::ParseValueLine ( CyString sLine )
-{
-	Utils::String line = sLine.ToString();
-	Utils::String first = line.token(" ", 1);
-	Utils::String rest  = line.tokens(" ", 2);
-	if ( first == "Name:" )
-		_sName = rest;
-	else if ( first == "SpkFile:" )
-	{
-		SMultiSpkFile *ms = new SMultiSpkFile;
-		ms->bRemove = false;
-		ms->pFile = NULL;
-		ms->bOn = (rest.token(":", 1).toInt()) ? true : false;
-		ms->lSize = rest.token(":", 2).toLong();
-		ms->sName = rest.token (":", 3);
-		ms->sData = NULL;
-		ms->iType = TYPE_SPK;
-		Utils::String r = rest.tokens(":", 4);
-		if (!r.empty())
-		{
-			ms->sScriptName = r.token("|", 1);
-			ms->sScriptAuthor = r.token("|", 2);
-			ms->sScriptVersion = r.tokens("|", 3);
-		}
-		m_lFiles.push_back ( ms );
-	}
-	else if ( first == "XspFile:" )
-	{
-		SMultiSpkFile *ms = new SMultiSpkFile;
-		ms->bRemove = false;
-		ms->pFile = NULL;
-		ms->bOn = (rest.token(":", 1).toInt()) ? true : false;
-		ms->lSize = rest.token(":", 2).toLong();
-		ms->sName = rest.token(":", 3);
-		ms->sData = NULL;
-		ms->iType = TYPE_XSP;
-		Utils::String r = rest.tokens(":", 4);
-		if ( !r.empty() )
-		{
-			ms->sScriptName = r.token("|", 1);
-			ms->sScriptAuthor = r.token("|", 2);
-			ms->sScriptVersion = r.tokens("|", 3);
-		}
-		m_lFiles.push_back ( ms );
-	}
-	else if ( first == "BaseFile:" )
-	{
-		SMultiSpkFile *ms = new SMultiSpkFile;
-		ms->bRemove = false;
-		ms->pFile = NULL;
-		ms->bOn = (rest.token(":", 1).toInt()) ? true : false;
-		ms->lSize = rest.token(":", 2).toLong();
-		ms->sName = rest.token(":", 3);
-		ms->sData = NULL;
-		ms->iType = TYPE_BASE;
-		Utils::String r = rest.tokens(":", 4);
-		if (!r.empty())
-		{
-			ms->sScriptName = r.token("|", 1);
-			ms->sScriptAuthor = r.token("|", 2);
-			ms->sScriptVersion = r.tokens("|", 3);
-		}
-		m_lFiles.push_back ( ms );
 	}
-	else
-		return false;
 	return true;
 }
 void CMultiSpkFile::RemovePackages()
+{
 	for ( CListNode<SMultiSpkFile> *node = m_lFiles.Front(); node; node = node->next() )
+	{
 		if ( !node->Data()->bRemove ) continue;
 		node->DeleteData();
 	}
-	m_lFiles.RemoveEmpty();
-}
-void CMultiSpkFile::ReadValues ( CyString values )
-{
-	int num = 0;
-	CyString *lines = values.SplitToken ( '\n', &num );
-	for ( int i = 0; i < num; i++ )
-		ParseValueLine ( lines[i] );
-	CLEANSPLIT(lines, num);
+	m_lFiles.RemoveEmpty();
+}
-bool CMultiSpkFile::ReadFile ( CyString filename, bool bReadData)
+bool CMultiSpkFile::readFile(const Utils::String &filename, bool bReadData)
+{
 	CFileIO File(filename);
 	if ( !File.startRead() ) return false;
 	// first read the header
-	if ( !ParseHeader(File.readEndOfLine()) ) return false;
+	if ( !_parseHeader(File.readEndOfLine()) ) return false;
 	ClearFiles ();
 	int doneLen = 0;
 	// next read the data values for the spk files
 		if ( m_SHeader.iCompression == SPKCOMPRESS_ZLIB ) {
 			// uncomress the data
 			unsigned char *uncompr = new unsigned char[uncomprLen];
 			int err = uncompress ( uncompr, &uncomprLen, readData, m_SHeader.lComprLen );
-			if ( err == Z_OK ) ReadValues ( CyString ((char *)uncompr) );
+			if ( err == Z_OK ) _readValues((char *)uncompr);
 			doneLen = uncomprLen;
 			delete uncompr;
+		}
 		else if ( m_SHeader.iCompression == SPKCOMPRESS_7ZIP ) {
 			long len = uncomprLen;
 			unsigned char *compr = LZMADecode_C ( readData, m_SHeader.lComprLen, (size_t *)&len, NULL );
-			if ( compr ) ReadValues ( CyString ((char *)compr) );
+			if ( compr ) _readValues((char *)compr);
+		}
 		// no compression
 		else
-			ReadValues ( CyString ((char *)readData) );
+			_readValues((char *)readData);
 		delete readData;
+	}
 	if ( bReadData ) {
 			SMultiSpkFile *ms = node->Data();
 			ms->sData = (char *)File.read(ms->lSize);
+		}
+	}
-	_sFilename = filename.ToString();
+	_sFilename = filename;
 	File.close();
 	m_bChanged = false;
 	return true;
 void CMultiSpkFile::ClearFiles ()
+{
 	m_lFiles.clear(true);
+}
-bool CMultiSpkFile::ExtractData ( SMultiSpkFile *ms )
+bool CMultiSpkFile::extractData(SMultiSpkFile *ms)
+{
 	FILE *id = fopen (_sFilename.c_str(), "rb");
 	if ( !id )
 		return false;
 			fseek ( id, it->lSize, SEEK_CUR );
+	}
 	fclose ( id );
 	return found;
 }
-bool CMultiSpkFile::ExtractFile ( const CyString &file, CyString dir )
+bool CMultiSpkFile::extractFile(const Utils::String &file, const Utils::String &dir)
 {
-	SMultiSpkFile *ms = FindFile(file);
+	const SMultiSpkFile *ms = findFile(file);
 	if ( !ms ) return false;
-	return ExtractFile(ms, dir);
+	return extractFile(ms, dir);
+}
-bool CMultiSpkFile::ExtractFile ( SMultiSpkFile *ms, CyString dir )
+bool CMultiSpkFile::extractFile(const SMultiSpkFile *ms, const Utils::String &dir)
+{
 	if ( !ms->sData )
+	{
-		if ( !ReadFileToMemory ( ms ) )
+		if (!ReadFileToMemory(const_cast<SMultiSpkFile *>(ms)))
 			return false;
+	}
-	CyString filename = dir;
+	Utils::String filename = dir;
-	if ( !dir.Empty() )
+	if (!dir.empty())
 		filename += "/";
 	filename += ms->sName;
 	FILE *id = fopen ( filename.c_str(), "wb" );
 	if ( !id )
 		return false;
+	if(ms->sData)
-	fwrite ( ms->sData, sizeof(char), ms->lSize, id );
+		fwrite(ms->sData, sizeof(char), ms->lSize, id );
 	fclose ( id );
 	return true;
 }
-bool CMultiSpkFile::ExtractAll ( CyString dir )
+bool CMultiSpkFile::extractAll(const Utils::String &dir)
 {
 	if (_sFilename.empty())
 		return false;
 	if ( !ReadAllFilesToMemory () )
 		return false;
 	for ( CListNode<SMultiSpkFile> *node = m_lFiles.Front(); node; node = node->next() )
 	{
 		SMultiSpkFile *ms = node->Data();
 		if ( ms->bRemove ) continue;
 		if ( !ms->sData )
 			continue;
-		FILE *id = fopen ( CyString(dir + "/" + ms->sName).c_str(), "wb" );
+		FILE *id = fopen ((dir + "/" + ms->sName).c_str(), "wb" );
 		if ( !id )
 			continue;
 		fwrite ( ms->sData, sizeof(char), ms->lSize, id );
 		fclose ( id );
+	}
 	return true;
+}
-bool CMultiSpkFile::SplitMulti ( CyString filename, CyString destdir )
+bool CMultiSpkFile::splitMulti(const Utils::String &filename, const Utils::String &destdir)
+{
-	if ( !ReadFile ( filename ) )
+	if ( !readFile(filename))
 		return false;
 	bool doneone = false;
 	for ( CListNode<SMultiSpkFile> *node = m_lFiles.Front(); node; node = node->next() )
+	{
 		SMultiSpkFile *ms = node->Data();
 		if ( ms->bRemove ) continue;
 		if ( !ms->sData )
 			continue;
-		CyString destfile = destdir;
+		Utils::String destfile = destdir;
-		if ( !destfile.Empty() )
+		if ( !destfile.empty() )
 			destfile += "/";
 		destfile += ms->sName;
 		FILE *id = fopen ( destfile.c_str(), "wb" );
 		if ( !id )
 			continue;
 		return false;
 	// now open the file
 	FILE *id = fopen(_sFilename.c_str(), "rb");
 	if ( !id )
 		return false;
 	// read the header
 	CSpkFile::GetEndOfLine ( id, NULL, false );
 	// skip past values
 	fseek ( id, 4, SEEK_CUR );
 			ms->sData = new char[ms->lSize];
 			fread ( ms->sData, sizeof(char), ms->lSize, id );
+		}
 		else
 			fseek ( id, ms->lSize, SEEK_CUR );
 	}
 	return true;
 }
-bool CMultiSpkFile::RemoveFile ( CyString sFile )
+bool CMultiSpkFile::removeFile(const Utils::String &file)
 {
-	Utils::String file = sFile.ToString();
 	int num = 0;
 	for ( CListNode<SMultiSpkFile> *node = m_lFiles.Front(); node; node = node->next() )
 	{
 		SMultiSpkFile *it = node->Data();
 		if ( file.Compare(it->sName) )
-			return RemoveFile ( num );
+			return removeFile(num);
 		++num;
 	}
 	return false;
 }
-bool CMultiSpkFile::RemoveFile ( SMultiSpkFile *ms )
+bool CMultiSpkFile::removeFile(const SMultiSpkFile *ms)
 {
 	int num = 0;
 	for ( CListNode<SMultiSpkFile> *node = m_lFiles.Front(); node; node = node->next() )
+	{
 		SMultiSpkFile *it = node->Data();
 		if ( it == ms )
-			return RemoveFile ( num );
+			return removeFile(num);
 		++num;
+	}
 	return false;
+}
-bool CMultiSpkFile::RemoveFile ( int id )
+bool CMultiSpkFile::removeFile(int id)
+{
 	if ( (id < 0) || (id >= m_lFiles.size()) )
 		return false;
 	SMultiSpkFile *file = m_lFiles.Get ( id );
 	m_bChanged = true;
 	return true;
+}
-bool CMultiSpkFile::MarkRemoveFile ( CyString sFile )
+bool CMultiSpkFile::markRemoveFile(const Utils::String &file)
+{
-	Utils::String file = sFile.ToString();
 	int num = 0;
 	for ( CListNode<SMultiSpkFile> *node = m_lFiles.Front(); node; node = node->next() )
+	{
 		SMultiSpkFile *it = node->Data();
 		if ( file.Compare(it->sName) )
-			return MarkRemoveFile ( num );
+			return markRemoveFile(num);
 		num++;
+	}
 	return false;
+}
-bool CMultiSpkFile::MarkRemoveFile ( SMultiSpkFile *ms )
+bool CMultiSpkFile::markRemoveFile(SMultiSpkFile *ms)
+{
 	int num = 0;
 	for ( CListNode<SMultiSpkFile> *node = m_lFiles.Front(); node; node = node->next() )
+	{
 		SMultiSpkFile *it = node->Data();
 		if ( it == ms )
-			return MarkRemoveFile ( num );
+			return markRemoveFile(num);
 		++num;
+	}
 	return false;
+}
-bool CMultiSpkFile::MarkRemoveFile ( int id )
+bool CMultiSpkFile::markRemoveFile ( int id )
+{
 	if ( (id < 0) || (id >= m_lFiles.size()) )
 		return false;
 	SMultiSpkFile *file = m_lFiles.Get ( id );
 	file->bRemove = true;
 	m_bChanged = true;
 	return true;
+}
-void CMultiSpkFile::MarkRemoveAll()
+void CMultiSpkFile::markRemoveAll()
+{
 	for ( CListNode<SMultiSpkFile> *node = m_lFiles.Front(); node; node = node->next() )
 		node->Data()->bRemove = true;
 	m_bChanged = true;
 }
 bool CMultiSpkFile::ReadSpk( SMultiSpkFile *ms, int type )
+{
 	if ( ms->pFile->IsFullyLoaded() )
 		return true;
 	// no file to read from
 	if (_sFilename.empty())
 		return false;
 	// now open the file
 	CFileIO File(_sFilename);
 	if ( !File.startRead() ) return false;
 	// read the header
 	File.readEndOfLine();
 	// skip past values
 	File.seek(4 + m_SHeader.lComprLen);
 	bool ret = false;
 	for ( CListNode<SMultiSpkFile> *node = m_lFiles.Front(); node; node = node->next() ) {
 		SMultiSpkFile *it = node->Data();
 		if ( it == ms )
+		{
 	File.close();
 	return ret;
+}
-bool CMultiSpkFile::ReadAllPackages( int type, CLinkList<CBaseFile> *addToList )
+bool CMultiSpkFile::readAllPackages( int type, CLinkList<CBaseFile> *addToList )
+{
 	// no file to read from
 	if (_sFilename.empty())
 		return false;
 	File.readEndOfLine();
 	// skip past values
 	File.seek(4 + m_SHeader.lComprLen);
 	for ( CListNode<SMultiSpkFile> *node = m_lFiles.Front(); node; node = node->next() ) {
 		SMultiSpkFile *ms = node->Data();
 		CBaseFile *package = NULL;
 		if ( ms->iType == TYPE_XSP )
 			package = new CXspFile;
 		else
 			package = new CSpkFile;
 			// move to correct position in file for next stream of data
 			// should be fine, this is more of a failsafe
 			File.seekStart(tell);
+		}
 		File.seek(ms->lSize);
 	}
 	File.close();
 	return true;
 }
-SMultiSpkFile *CMultiSpkFile::FindFile ( CyString sName )
+const SMultiSpkFile *CMultiSpkFile::findFile(const Utils::String &name) const
 {
-	Utils::String name = sName.ToString();
 	for ( CListNode<SMultiSpkFile> *node = m_lFiles.Front(); node; node = node->next() )
 	{
 		SMultiSpkFile *ms = node->Data();
 		if ( ms->sName.Compare(name) )
 			return ms;
+	}
 	return NULL;
+}
 void CMultiSpkFile::UpdatedPackage(CBaseFile *p)
+{
-	SMultiSpkFile *s = this->FindPackage(p);
+	SMultiSpkFile *s = this->findPackage(p);
 	if ( s )
+	{
 		if ( s->sData )
 			delete s->sData;
 		s->sData = (char *)p->CreateData((size_t*)&s->lSize);
 	}
 }
-SMultiSpkFile *CMultiSpkFile::FindPackage(CBaseFile *p)
+SMultiSpkFile *CMultiSpkFile::findPackage(CBaseFile *p)
 {
 	for ( CListNode<SMultiSpkFile> *node = m_lFiles.Front(); node; node = node->next() )
 	{
 		SMultiSpkFile *ms = node->Data();
 		if ( ms->pFile == p )
 			return ms;
+	}
 	return NULL;
+}
-SMultiSpkFile *CMultiSpkFile::FindPackage(CyString name, CyString author)
+SMultiSpkFile *CMultiSpkFile::findPackage(const Utils::String &name, const Utils::String &author)
+{
 	for ( CListNode<SMultiSpkFile> *node = m_lFiles.Front(); node; node = node->next() )
+	{
 		SMultiSpkFile *ms = node->Data();
 		if ( !ms->pFile )
 			continue;
-		if ( ms->pFile->name().Compare(name.ToString()) && ms->pFile->author().Compare(author.ToString()) )
+		if (ms->pFile->name().Compare(name) && ms->pFile->author().Compare(author))
 			return ms;
+	}
 	return NULL;
+}
+Utils::String CMultiSpkFile::_createData() const
+{
+	Utils::String ret;
+	if (!_sName.empty())
+		ret = "Name: " + _sName + "\n";
+	for (CListNode<SMultiSpkFile>* node = m_lFiles.Front(); node; node = node->next())
+	{
+		SMultiSpkFile* ms = node->Data();
+		if (ms->iType == TYPE_XSP)
+			ret += "XspFile: ";
+		else
+			ret += "SpkFile: ";
+		if (ms->bOn)
+			ret += "1:";
+		else
+			ret += "0:";
+		ret += ms->lSize;
+		ret += ":";
+		ret += ms->sName;
+		if (!ms->sScriptName.empty())
+			ret += ":" + ms->sScriptName + "|" + ms->sScriptAuthor + "|" + ms->sScriptVersion;
+		ret += "\n";
+	}
+	return ret;
+}
+bool CMultiSpkFile::_parseHeader(const Utils::String &header)
+{
+	if (header.token(";", 1) != "MSPKCycrow")
+		return false;
+	m_SHeader.fVersion = header.token(";", 2).toFloat();
+	if (m_SHeader.fVersion > FILEVERSION)
+		return false;
+	m_SHeader.iCompression = header.token(";", 3).toInt();
+	m_SHeader.lUncomprLen = header.token(";", 4).toLong();
+	m_SHeader.lComprLen = header.token(";", 5).toLong();
+	m_SHeader.bSelection = (header.token(";", 4).toInt()) ? true : false;
+	return true;
+}
+bool CMultiSpkFile::_parseValueLine(const Utils::String &line)
+{
+	Utils::String first = line.token(" ", 1);
+	Utils::String rest = line.tokens(" ", 2);
+	if (first == "Name:")
+		_sName = rest;
+	else if (first == "SpkFile:")
+	{
+		SMultiSpkFile* ms = new SMultiSpkFile;
+		ms->bRemove = false;
+		ms->pFile = NULL;
+		ms->bOn = (rest.token(":", 1).toInt()) ? true : false;
+		ms->lSize = rest.token(":", 2).toLong();
+		ms->sName = rest.token(":", 3);
+		ms->sData = NULL;
+		ms->iType = TYPE_SPK;
+		Utils::String r = rest.tokens(":", 4);
+		if (!r.empty())
+		{
+			ms->sScriptName = r.token("|", 1);
+			ms->sScriptAuthor = r.token("|", 2);
+			ms->sScriptVersion = r.tokens("|", 3);
+		}
+		m_lFiles.push_back(ms);
+	}
+	else if (first == "XspFile:")
+	{
+		SMultiSpkFile* ms = new SMultiSpkFile;
+		ms->bRemove = false;
+		ms->pFile = NULL;
+		ms->bOn = (rest.token(":", 1).toInt()) ? true : false;
+		ms->lSize = rest.token(":", 2).toLong();
+		ms->sName = rest.token(":", 3);
+		ms->sData = NULL;
+		ms->iType = TYPE_XSP;
+		Utils::String r = rest.tokens(":", 4);
+		if (!r.empty())
+		{
+			ms->sScriptName = r.token("|", 1);
+			ms->sScriptAuthor = r.token("|", 2);
+			ms->sScriptVersion = r.tokens("|", 3);
+		}
+		m_lFiles.push_back(ms);
+	}
+	else if (first == "BaseFile:")
+	{
+		SMultiSpkFile* ms = new SMultiSpkFile;
+		ms->bRemove = false;
+		ms->pFile = NULL;
+		ms->bOn = (rest.token(":", 1).toInt()) ? true : false;
+		ms->lSize = rest.token(":", 2).toLong();
+		ms->sName = rest.token(":", 3);
+		ms->sData = NULL;
+		ms->iType = TYPE_BASE;
+		Utils::String r = rest.tokens(":", 4);
+		if (!r.empty())
+		{
+			ms->sScriptName = r.token("|", 1);
+			ms->sScriptAuthor = r.token("|", 2);
+			ms->sScriptVersion = r.tokens("|", 3);
+		}
+		m_lFiles.push_back(ms);
+	}
+	else
+		return false;
+	return true;
+}
+void CMultiSpkFile::_readValues(const Utils::String &values)
+{
+	int num = 0;
+	Utils::String* lines = values.tokenise("\n", &num);
+	for (int i = 0; i < num; i++)
+		_parseValueLine(lines[i]);
+	CLEANSPLIT(lines, num);
+}

Subversion Repositories spk

(root)/libspk/src/MultiSpkFile.cpp – Rev 176 → 177