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

 		p->pFile = new CSpkFile();
 	else if ( p->iType == TYPE_BASE )
 		p->pFile = new CBaseFile();
+}
-bool CMultiSpkFile::addFileNow(const Utils::String &file, bool on )
+bool CMultiSpkFile::addFileNow(const Utils::WString &file, bool on )
+{
 	if ( this->addFile(file, on) )
+	{
-		Utils::String findFile = CFileIO(file).filenameStr();
+		Utils::WString findFile = CFileIO(file).filename();
 		const SMultiSpkFile *p = this->findFile(findFile);
 		if ( p )
+		{
 			this->CreatePackage(const_cast<SMultiSpkFile*>(p));
 	m_lFiles.push_back ( ms );
 	m_bChanged = true;
 	return true;
+}
-bool CMultiSpkFile::addFile(const Utils::String &file, bool on)
+bool CMultiSpkFile::addFile(const Utils::WString &file, bool on)
+{
 	// multipack
-	if (file.contains( "::" ))
+	if (file.contains(L"::" ))
+	{
-		Utils::String mfile = file.left(file.findPos("::"));
+		Utils::WString mfile = file.left(file.findPos(L"::"));
 		CMultiSpkFile spkfile;
 		if ( spkfile.readFile(mfile, false))
+		{
 			SMultiSpkFile *ms = new SMultiSpkFile;
 			ms->bRemove = false;
-			ms->sName = file.right((int)(file.length() - file.findPos("::")) - 2 );
+			ms->sName = file.right((int)(file.length() - file.findPos(L"::")) - 2 );
 			ms->pFile = NULL;
 			ms->sData = NULL;
 			if ( spkfile.extractData(ms))
+			{
 				ms->bOn = on;
 	// create entry
 	SMultiSpkFile *ms = new SMultiSpkFile;
 	ms->bRemove = false;
 	ms->pFile = NULL;
-	ms->sName = CFileIO(file).filenameStr();
+	ms->sName = CFileIO(file).filename();
 	ms->bOn = on;
 	// read data
 	ms->sData = (char *)File.readAll((size_t *)&ms->lSize);
 	File.close();
 	else if ( check == SPKFILE_SINGLESHIP )
 		baseFile = new CXspFile;
 	if ( baseFile ) {
 		if ( baseFile->readFile(file, SPKREAD_VALUES)) {
-			ms->sScriptAuthor	= baseFile->author().toString();
+			ms->sScriptAuthor	= baseFile->author();
-			ms->sScriptName		= baseFile->name().toString();
+			ms->sScriptName		= baseFile->name();
-			ms->sScriptVersion	= baseFile->version().toString();
+			ms->sScriptVersion	= baseFile->version();
 			ms->iType			= baseFile->GetType();
+		}
 		delete baseFile;
+	}
 	addFile(ms);
 	return true;
+}
-SMultiSpkFile *CMultiSpkFile::addFileEntry(const Utils::String &filename)
+SMultiSpkFile *CMultiSpkFile::addFileEntry(const Utils::WString &filename)
+{
 	SMultiSpkFile *ms = new SMultiSpkFile;
 	ms->bRemove = false;
 	ms->pFile = NULL;
 	ms->sName = filename;
 	return ms;
+}
-bool CMultiSpkFile::writeFile(const Utils::String &filename, CProgressInfo *progress)
+bool CMultiSpkFile::writeFile(const Utils::WString &filename, CProgressInfo *progress)
+{
 	CFileIO File(filename);
 	if ( !File.startWrite() ) return false;
 	// make sure we remove all packages that have been marked
 	this->RemovePackages();
-	Utils::String data = _createData();
+	Utils::WString data = _createData();
-	int comprLen = (int)data.length(), uncomprLen = comprLen;;
+	int comprLen = (int)((data.length() + sizeof(wchar_t)) / sizeof(char)), 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)uncomprLen, 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 );
+		memcpy ( compr, (const unsigned char *)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;
 	// write the compressed data to file
 	File.writeSize(uncomprLen);
 	File.write(compr, comprLen);
 	free ( compr );
 	for ( CListNode<SMultiSpkFile> *node = m_lFiles.Front(); node; node = node->next() ) {
 		SMultiSpkFile *ms = node->Data();
 		if ( progress )
 			progress->UpdatePackage(ms);
 		if ( (!ms->sData) && (ms->pFile) )
 			ms->pFile->writeData(File, NULL);
 		else
 			File.write(ms->sData, ms->lSize);
 	}
 	return true;
+}
 void CMultiSpkFile::RemovePackages()
 		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)
+			{
+				if (m_SHeader.fVersion < 4.4f)
+				{
-			if ( err == Z_OK ) _readValues((char *)uncompr);
+					std::string data((char*)uncompr);
+					_readValues(std::wstring(data.begin(), data.end()));
+				}
+				else
+				{
+					const wchar_t* data = (const wchar_t*)uncompr;
+					_readValues(Utils::WString(data));
+				}
+			}
 			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)
+			{
+				if (m_SHeader.fVersion < 4.4f)
+				{
-			if ( compr ) _readValues((char *)compr);
+					std::string data((char*)compr);
+					_readValues(std::wstring(data.begin(), data.end()));
+				}
+				else
+				{
+					const wchar_t* data = (const wchar_t*)compr;
+					_readValues(Utils::WString(data));
+				}
+			}
 		}
 		// no compression
 		else
+		{
+			if (m_SHeader.fVersion < 4.4f)
+			{
+				std::string data((char*)readData);
+				_readValues(std::wstring(data.begin(), data.end()));
+			}
+			else
+			{
+				const wchar_t* data = (const wchar_t*)readData;
-			_readValues((char *)readData);
+				_readValues(Utils::WString(data));
+			}
+		}
 		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;
 	m_lFiles.clear(true);
+}
 bool CMultiSpkFile::extractData(SMultiSpkFile *ms)
+{
-	FILE *id = fopen (_sFilename.c_str(), "rb");
+	FILE *id = _wfopen (_sFilename.c_str(), L"rb");
 	if ( !id )
 		return false;
 	// skip past the header
 	CSpkFile::GetEndOfLine ( id, NULL, false );
 bool CMultiSpkFile::ReadFileToMemory ( SMultiSpkFile *ms )
+{
 	if ( ms->sData )
 		return true;
-	FILE *id = fopen(_sFilename.c_str(), "rb");
+	FILE *id = _wfopen(_sFilename.c_str(), L"rb");
 	if ( !id )
 		return false;
 	// skip past the header
 	CSpkFile::GetEndOfLine ( id, NULL, false );
 	fclose ( id );
 	return found;
+}
-bool CMultiSpkFile::extractFile(const Utils::String &file, const Utils::String &dir)
+bool CMultiSpkFile::extractFile(const Utils::WString &file, const Utils::WString &dir)
+{
 	const SMultiSpkFile *ms = findFile(file);
 	if ( !ms ) return false;
 	return extractFile(ms, dir);
+}
-bool CMultiSpkFile::extractFile(const SMultiSpkFile *ms, const Utils::String &dir)
+bool CMultiSpkFile::extractFile(const SMultiSpkFile *ms, const Utils::WString &dir)
+{
 	if ( !ms->sData )
+	{
 		if (!ReadFileToMemory(const_cast<SMultiSpkFile *>(ms)))
 			return false;
+	}
-	Utils::String filename = dir;
+	Utils::WString filename = dir;
 	if (!dir.empty())
-		filename += "/";
+		filename += L"/";
 	filename += ms->sName;
-	FILE *id = fopen ( filename.c_str(), ";wb" );
+	FILE *id = _wfopen(filename.c_str(), L";wb");
 	if ( !id )
 		return false;
 	if(ms->sData)
 		fwrite(ms->sData, sizeof(char), ms->lSize, id );
 	fclose ( id );
 	return true;
 }
-bool CMultiSpkFile::extractAll(const Utils::String &dir)
+bool CMultiSpkFile::extractAll(const Utils::WString &dir)
 {
 	if (_sFilename.empty())
-		return false;
-	if ( !ReadAllFilesToMemory () )
 		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 ((dir + "/" + ms->sName).c_str(), "wb" );
+		FILE *id = _wfopen((dir + L"/" + ms->sName).c_str(), L"wb" );
 		if ( !id )
 			continue;
 		fwrite ( ms->sData, sizeof(char), ms->lSize, id );
 		fclose ( id );
+	}
 	return true;
 }
-bool CMultiSpkFile::splitMulti(const Utils::String &filename, const Utils::String &destdir)
+bool CMultiSpkFile::splitMulti(const Utils::WString &filename, const Utils::WString &destdir)
+{
 	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;
-		Utils::String destfile = destdir;
+		Utils::WString destfile = destdir;
 		if ( !destfile.empty() )
-			destfile += "/";
+			destfile += L"/";
 		destfile += ms->sName;
-		FILE *id = fopen ( destfile.c_str(), ";wb" );
+		FILE *id = _wfopen(destfile.c_str(), L";wb");
 		if ( !id )
 			continue;
 		fwrite ( ms->sData, sizeof(char), ms->lSize, id );
 		fclose ( id );
 	// no file to read from
 	if (_sFilename.empty())
 		return false;
 	// now open the file
-	FILE *id = fopen(_sFilename.c_str(), "rb");
+	FILE *id = _wfopen(_sFilename.c_str(), L"rb");
 	if ( !id )
 		return false;
 	// read the header
 	CSpkFile::GetEndOfLine ( id, NULL, false );
 			fread ( ms->sData, sizeof(char), ms->lSize, id );
+		}
 		else
 			fseek ( id, ms->lSize, SEEK_CUR );
+	}
 	return true;
 }
-bool CMultiSpkFile::removeFile(const Utils::String &file)
+bool CMultiSpkFile::removeFile(const Utils::WString &file)
 {
 	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);
 		++num;
 	}
 	return false;
 }
 bool CMultiSpkFile::removeFile(const SMultiSpkFile *ms)
+{
 	int num = 0;
 	for ( CListNode<SMultiSpkFile> *node = m_lFiles.Front(); node; node = node->next() )
+	{
 		SMultiSpkFile *it = node->Data();
+	}
 	return false;
+}
 bool CMultiSpkFile::removeFile(int id)
 {
 	if ( (id < 0) || (id >= m_lFiles.size()) )
 		return false;
 	SMultiSpkFile *file = m_lFiles.Get ( id );
 	m_lFiles.erase ( id + 1 );
 	if ( file )
 		delete file;
 	m_bChanged = true;
 	return true;
+}
-bool CMultiSpkFile::markRemoveFile(const Utils::String &file)
+bool CMultiSpkFile::markRemoveFile(const Utils::WString &file)
+{
 	int num = 0;
 	for ( CListNode<SMultiSpkFile> *node = m_lFiles.Front(); node; node = node->next() )
+	{
 		SMultiSpkFile *it = node->Data();
 			return markRemoveFile(num);
 		++num;
+	}
 	return false;
+}
 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()
+{
 	for ( CListNode<SMultiSpkFile> *node = m_lFiles.Front(); node; node = node->next() )
 	File.close();
 	return true;
+}
-const SMultiSpkFile *CMultiSpkFile::findFile(const Utils::String &name) const
+const SMultiSpkFile *CMultiSpkFile::findFile(const Utils::WString &name) const
+{
 	for ( CListNode<SMultiSpkFile> *node = m_lFiles.Front(); node; node = node->next() )
+	{
 		SMultiSpkFile *ms = node->Data();
 		if ( ms->sName.Compare(name) )
+	}
 	return NULL;
+}
-SMultiSpkFile *CMultiSpkFile::findPackage(const Utils::String &name, const Utils::String &author)
+SMultiSpkFile *CMultiSpkFile::findPackage(const Utils::WString &name, const Utils::WString &author)
+{
 	for ( CListNode<SMultiSpkFile> *node = m_lFiles.Front(); node; node = node->next() )
+	{
 		SMultiSpkFile *ms = node->Data();
 		if ( !ms->pFile )
 		if (ms->pFile->name().Compare(name) && ms->pFile->author().Compare(author))
 			return ms;
+	}
 	return NULL;
 }
-Utils::String CMultiSpkFile::_createData() const
+Utils::WString CMultiSpkFile::_createData() const
+{
-	Utils::String ret;
+	Utils::WString ret;
 	if (!_sName.empty())
-		ret = "Name: " + _sName + "\n";
+		ret = L"Name: " + _sName + L"\n";
 	for (CListNode<SMultiSpkFile>* node = m_lFiles.Front(); node; node = node->next())
+	{
 		SMultiSpkFile* ms = node->Data();
 		if (ms->iType == TYPE_XSP)
-			ret += "XspFile: ";
+			ret += L"XspFile: ";
 		else
-			ret += "SpkFile: ";
+			ret += L"SpkFile: ";
 		if (ms->bOn)
-			ret += "1:";
+			ret += L"1:";
 		else
-			ret += "0:";
+			ret += L"0:";
 		ret += ms->lSize;
-		ret += ":";
+		ret += L":";
 		ret += ms->sName;
 		if (!ms->sScriptName.empty())
-			ret += ":" + ms->sScriptName + "|" + ms->sScriptAuthor + "|" + ms->sScriptVersion;
+			ret += L":" + ms->sScriptName + L"|" + ms->sScriptAuthor + L"|" + ms->sScriptVersion;
-		ret += "\n";
+		ret += L"\n";
+	}
 	return ret;
+}
-bool CMultiSpkFile::_parseHeader(const Utils::String &header)
+bool CMultiSpkFile::_parseHeader(const Utils::WString &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)
+{
+	if (header.token(L";", 1) != L"MSPKCycrow")
+		return false;
+	m_SHeader.fVersion = header.token(L";", 2).toFloat();
+	if (m_SHeader.fVersion > FILEVERSION)
+		return false;
+	m_SHeader.iCompression = header.token(L";", 3).toInt();
+	m_SHeader.lUncomprLen = header.token(L";", 4).toLong();
+	m_SHeader.lComprLen = header.token(L";", 5).toLong();
+	m_SHeader.bSelection = (header.token(L";", 4).toInt()) ? true : false;
+	return true;
+}
+bool CMultiSpkFile::_parseValueLine(const Utils::WString &line)
+{
-	Utils::String first = line.token(" ", 1);
+	Utils::WString first = line.token(L" ", 1);
-	Utils::String rest = line.tokens(" ", 2);
+	Utils::WString rest = line.tokens(L" ", 2);
-	if (first == "Name:")
+	if (first == L"Name:")
 		_sName = rest;
-	else if (first == "SpkFile:")
+	else if (first == L"SpkFile:")
+	{
 		SMultiSpkFile* ms = new SMultiSpkFile;
 		ms->bRemove = false;
 		ms->pFile = NULL;
-		ms->bOn = (rest.token(":", 1).toInt()) ? true : false;
+		ms->bOn = (rest.token(L":", 1).toInt()) ? true : false;
-		ms->lSize = rest.token(":", 2).toLong();
+		ms->lSize = rest.token(L":", 2).toLong();
-		ms->sName = rest.token(":", 3);
+		ms->sName = rest.token(L":", 3);
 		ms->sData = NULL;
 		ms->iType = TYPE_SPK;
-		Utils::String r = rest.tokens(":", 4);
+		Utils::WString r = rest.tokens(L":", 4);
 		if (!r.empty())
 		{
-			ms->sScriptName = r.token("|", 1);
+			ms->sScriptName = r.token(L"|", 1);
-			ms->sScriptAuthor = r.token("|", 2);
+			ms->sScriptAuthor = r.token(L"|", 2);
-			ms->sScriptVersion = r.tokens("|", 3);
+			ms->sScriptVersion = r.tokens(L"|", 3);
 		}
 		m_lFiles.push_back(ms);
 	}
-	else if (first == "XspFile:")
+	else if (first == L"XspFile:")
 	{
 		SMultiSpkFile* ms = new SMultiSpkFile;
 		ms->bRemove = false;
 		ms->pFile = NULL;
-		ms->bOn = (rest.token(":", 1).toInt()) ? true : false;
+		ms->bOn = (rest.token(L":", 1).toInt()) ? true : false;
-		ms->lSize = rest.token(":", 2).toLong();
+		ms->lSize = rest.token(L":", 2).toLong();
-		ms->sName = rest.token(":", 3);
+		ms->sName = rest.token(L":", 3);
 		ms->sData = NULL;
 		ms->iType = TYPE_XSP;
-		Utils::String r = rest.tokens(":", 4);
+		Utils::WString r = rest.tokens(L":", 4);
 		if (!r.empty())
+		{
-			ms->sScriptName = r.token("|", 1);
+			ms->sScriptName = r.token(L"|", 1);
-			ms->sScriptAuthor = r.token("|", 2);
+			ms->sScriptAuthor = r.token(L"|", 2);
-			ms->sScriptVersion = r.tokens("|", 3);
+			ms->sScriptVersion = r.tokens(L"|", 3);
+		}
 		m_lFiles.push_back(ms);
+	}
-	else if (first == "BaseFile:")
+	else if (first == L"BaseFile:")
+	{
 		SMultiSpkFile* ms = new SMultiSpkFile;
 		ms->bRemove = false;
 		ms->pFile = NULL;
-		ms->bOn = (rest.token(":", 1).toInt()) ? true : false;
+		ms->bOn = (rest.token(L":", 1).toInt()) ? true : false;
-		ms->lSize = rest.token(":", 2).toLong();
+		ms->lSize = rest.token(L":", 2).toLong();
-		ms->sName = rest.token(":", 3);
+		ms->sName = rest.token(L":", 3);
 		ms->sData = NULL;
 		ms->iType = TYPE_BASE;
-		Utils::String r = rest.tokens(":", 4);
+		Utils::WString r = rest.tokens(L":", 4);
 		if (!r.empty())
+		{
-			ms->sScriptName = r.token("|", 1);
+			ms->sScriptName = r.token(L"|", 1);
-			ms->sScriptAuthor = r.token("|", 2);
+			ms->sScriptAuthor = r.token(L"|", 2);
-			ms->sScriptVersion = r.tokens("|", 3);
+			ms->sScriptVersion = r.tokens(L"|", 3);
+		}
 		m_lFiles.push_back(ms);
+	}
 	else
 		return false;
 	return true;
+}
-void CMultiSpkFile::_readValues(const Utils::String &values)
+void CMultiSpkFile::_readValues(const Utils::WString &values)
+{
-	int num = 0;
+	std::vector<Utils::WString> lines;
-	Utils::String* lines = values.tokenise(&quot;\n", &num);
+	size_t num = values.tokenise(L&quot;\n", lines);
-	for (int i = 0; i < num; i++)
+	for (size_t i = 0; i < num; i++)
 		_parseValueLine(lines[i]);
-	CLEANSPLIT(lines, num);
+}

Subversion Repositories spk

(root)//libspk/src/MultiSpkFile.cpp – Rev 204 → 219