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

 int CBaseFile::_read_Header(CFileIO &File, int iReadType, int iMaxProgress, CProgressInfo *pProgress)
+{
 	int doneLen = 0;
 	// read data to memory
-	unsigned char *readData;
+	unsigned char *readData = 0;
 	try {
 		readData = new unsigned char[m_SHeader.lValueCompressSize];
+	}
 	catch (std::exception &e) {
 		CLog::logf(CLog::Log_IO, 2, "CBaseFile::_read_Header() unable to malloc [header], %d (%s)", m_SHeader.lValueCompressSize, e.what());
 		return -1;
+	}
+	if (!readData)
+		return -1;
 	unsigned char size[4];
 	File.read(size, 4);
 	File.read(readData, m_SHeader.lValueCompressSize);
 	unsigned long uncomprLen = (size[0] << 24) + (size[1] << 16) + (size[2] << 8) + size[3];
 		try {
 			unsigned char *uncompr = new unsigned char[uncomprLen];
 			int err = uncompress ( uncompr, &uncomprLen, readData, m_SHeader.lValueCompressSize );
 			// update the progress for each section
 			if ( iReadType != SPKREAD_ALL && pProgress ) pProgress->UpdateProgress(2, iMaxProgress);
+			if (err == Z_OK)
+			{
-			if ( err == Z_OK ) this->_readValues((char *)uncompr);
+				std::string data((char*)uncompr);
+				_readValues(std::wstring(data.begin(), data.end()));
+			}
 			doneLen = uncomprLen;
-			delete uncompr;
+			delete []uncompr;
+		}
 		catch (std::exception &e) {
 			CLog::logf(CLog::Log_IO, 2, "CBaseFile::_read_Header() unable to malloc [uncompr], %d (%s)", uncomprLen, e.what());
 			delete []readData;
 			return -1;
 	else if ( m_SHeader.iValueCompression == SPKCOMPRESS_7ZIP ) {
 		long len = uncomprLen;
 		unsigned char *compr = LZMADecode_C ( readData, m_SHeader.lValueCompressSize, (size_t*)&len, NULL );
 		// update the progress for each section
 		if ( iReadType != SPKREAD_ALL && pProgress ) pProgress->UpdateProgress(2, iMaxProgress);
+		if (compr)
+		{
-		if ( compr ) _readValues((char *)compr);
+			std::string data((char*)compr);
+			_readValues(std::wstring(data.begin(), data.end()));
+		}
 	}
 	// no compression
 	else
+	{
-		_readValues((char *)readData);
+		std::string data((char*)readData);
+		_readValues(std::wstring(data.begin(), data.end()));
+	}
 	delete []readData;
 	return doneLen;
 }
 int CBaseFile::_read_FileHeader(CFileIO &File, int iReadType, int iMaxProgress, int iDoneLen, CProgressInfo *pProgress)
+{
 	unsigned char *readData;
 	try {
 		readData = new unsigned char[m_SHeader2.lSize];
 		if ( iReadType != SPKREAD_ALL && pProgress ) pProgress->UpdateProgress(5, iMaxProgress);
 		if ( compr ) _readFiles((char *)compr);
+	}
 	else
 		_readFiles((char *)readData);
 	delete []readData;
 	return true;
+}
 bool CBaseFile::readFile(CFileIO &File, int readtype, CProgressInfo *progress)
 	long numfiles = m_lFiles.size();
 	if ( m_pIconFile ) ++numfiles;
 	if ( m_SHeader2.iNumFiles != numfiles ) {
 		_iLastError = SPKERR_FILEMISMATCH;
 		return false;
 	}
 	// update the progress for each section
 	if ( readtype != SPKREAD_ALL && progress )	progress->UpdateProgress(6, maxProgress);
 	if ( readtype == SPKREAD_ALL ) {
 		int fileCount = 2;
 		if ( m_pIconFile ) m_pIconFile->readFromFile(File, m_pIconFile->GetDataSize());
 		// ok finally we need to read all the file
 		for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() ) {
 			node->Data()->readFromFile(File, node->Data()->GetDataSize());
 			if ( progress )	progress->UpdateProgress(fileCount++, m_lFiles.size() + 2);
+		}
 	return true;
+}
 bool CBaseFile::IsMod()
 {
 	// check for any mod files that are not fake patchs
 	for ( CListNode<C_File> *fNode = m_lFiles.Front(); fNode; fNode = fNode->next() )
 	{
 		C_File *f = fNode->Data();
 		if ( f->GetFileType() != FILETYPE_MOD )
 			continue;
 		if ( !f->IsFakePatch() )
 			return true;
 	}
 	return false;
+}
 bool CBaseFile::IsFakePatch() const
+{
 	// check for any mod files that are not fake patchs
 	for ( CListNode<C_File> *fNode = m_lFiles.Front(); fNode; fNode = fNode->next() )
+	{
 		C_File *f = fNode->Data();
 		if ( f->GetFileType() != FILETYPE_MOD )
 			continue;
 		if ( f->IsFakePatch() )
 			return true;
+	}
 	return false;
+}
 	if ( !this->webAddress().empty() )	values += L"WebAddress: "	+ this->webAddress()	+ L"\n";
 	if ( !this->webSite().empty() )		values += L"WebSite: "		+ this->webSite()		+ L"\n";
 	if ( !this->email().empty() )		values += L"Email: "		+ this->email()			+ L"\n";
 	if ( !this->forumLink().empty() )	values += L"ForumLink: "	+ this->forumLink()		+ L"\n";
-	for(auto itr = _lMirrors.begin(); itr != _lMirrors.end(); itr++)
+	for(auto itr = webMirrors().begin(); itr != webMirrors().end(); itr++)
-		values += Utils::WString(L"WebMirror: ") + (*itr)->str.toWString() + L"\n";
+		values += Utils::WString(L"WebMirror: ") + (*itr)->str + L"\n";
 	if ( !this->description().empty() ) {
 		Utils::WString desc = this->description();
 		desc = desc.findReplace(L"<newline>", L"<br>");
 		desc = desc.findReplace(L"\n", "L<br>");
 		desc.remove(L'\r');
 	if ( fileheader == SPKCOMPRESS_7ZIP )
 		fileheader = SPKCOMPRESS_ZLIB;
 	// get the script values
 	Utils::WString values = this->createValuesLine();
+	std::string sValues(values.begin(), values.end());
 	// compress the values
-	int valueUncomprLen = (int)values.length();
+	int valueUncomprLen = (int)strlen(sValues.c_str());
 	unsigned long valueComprLen = 0;
 	unsigned char *valueCompr = NULL;
 	bool compressed = false;
 	if ( valueheader == SPKCOMPRESS_ZLIB )
+	{
 		valueComprLen = valueUncomprLen;
 		if ( valueComprLen < 100 )
 			valueComprLen = 200;
 		else if ( valueComprLen < 1000 )
 			valueComprLen *= 2;
 		valueCompr = (unsigned char *)calloc((unsigned int)valueComprLen, 1);
-		int err = compress ( (unsigned char *)valueCompr, &valueComprLen, (const unsigned char *)values.c_str(), (unsigned long)values.length(), 0 );
+		int err = compress ( (unsigned char *)valueCompr, &valueComprLen, (const unsigned char *)sValues.c_str(), (unsigned long)strlen(sValues.c_str()), 0 );
 		if ( err == Z_OK )
 			compressed = true;
+	}
 	if ( !compressed )
+	{
 		valueComprLen = valueUncomprLen;
 		valueCompr = (unsigned char *)calloc((unsigned int)valueComprLen, 1);
-		memcpy ( valueCompr, values.c_str(), valueComprLen );
+		memcpy ( valueCompr, sValues.c_str(), valueComprLen );
 		valueheader = SPKCOMPRESS_NONE;
+	}
 	// write the main header to the file
 	if ( !this->writeHeader(file, valueheader, valueComprLen) )	return false;
 	if ( !m_lGames.empty() ) {
 		list->pushBack("# The game version the script is for <game> <version> (can have multiple games)");
 		for ( SGameCompat *g = m_lGames.First(); g; g = m_lGames.Next() ) {
 			if (game > 0 && g->iGame != game)
 				continue;
 			Utils::WString game = CBaseFile::ConvertGameToString(g->iGame);
 			if ( !g->sVersion.empty() )
+			{
 				game += L" ";
 				game += g->sVersion;
+			}
+	}
 	if ( !this->email().empty() ) {
 		list->pushBack("# The email address of the author, to allow users to contract if needed");
 		list->pushBack("Email: " + this->email().toString());
 		list->pushBack("");
 	}
-	if (_lMirrors.size())
+	if (webMirrors().size())
+	{
 		list->pushBack("# A link to the mirror address for the update file, can have many of these");
-		for(auto itr = _lMirrors.begin(); itr != _lMirrors.end(); itr++)
+		for(auto itr = webMirrors().begin(); itr != webMirrors().end(); itr++)
-			list->pushBack(Utils::String("WebMirror: ") + (*itr)->str);
+			list->pushBack(Utils::String("WebMirror: ") + (*itr)->str.toString());
 		list->pushBack("");
+	}
 	if ( m_bAutoGenerateUpdateFile )
+	{
 			list->pushBack((L"# " + installText + L" Texts, display text before and/or after " + installText + L"ing to inform the use of special conditions").toString());
 			for ( unsigned int i = 0; i < pText->count(); i++ ) {
 				long iLang = pText->language(i);
 				if ( !pText->getBefore(iLang).empty() )	list->pushBack((installText + "Before: " + iLang + L" " + pText->getBefore(iLang)).toString());
 				if ( !pText->getAfter(iLang).empty()  )	list->pushBack((installText + "After: " + iLang + L" " + pText->getAfter(iLang)).toString());
 			}
 			list->pushBack("");
+		}
+	}
 	list->pushBack("# Plugin Type, the type the plugin is, mainly used to show users the type, types include: Normal, Stable, Experimental, Cheat, Mod");
+				}
+			}
+		}
 		if ( !done )
 			name += f->Data()->getNameDirectory(this);
 		if ( !f->Data()->dir().empty() )
+		{
 			name += L"|";
 			name += f->Data()->dir();
+		}
 						first = false;
 					else
 						s += "|";
 					s += CBaseFile::ConvertGameToString(i);
+				}
 			}
 		}
 		s += L" " + name;
 		if(!files.contains(s))
 			files.pushBack(s, f->Data()->fileTypeString());
+	}
 		if ( node->Data()->iGame == 0 )
 			foundAll = true;
 		else if ( node->Data()->iGame == game ) { // now check the version
 			if ( node->Data()->sVersion.empty() ) {
 				if (node->Data()->sVersion.compareVersion(sVersion) == COMPARE_OLDER)
 					return false;
 				return true;
+			}
 			else {
 				if ( node->Data()->iVersion > iVersion )
 					return false;
 			this->setExportFilename(CFileIO(filename).changeFileExtension(L"zip").toString());
 		else if (sFirst.Compare(L"AutoRarExport"))
 			this->setExportFilename(CFileIO(filename).changeFileExtension(L"rar").toString());
 		else
 			this->setFilename(filename);
 	}
 	else if (sFirst.Compare(L"WebSite"))		this->setWebSite(sRest.toString());
 	else if (sFirst.Compare(L"ForumLink") || sFirst.Compare("Forum")) this->setForumLink(sRest.toString());
 	else if (sFirst.Compare(L"Email"))			this->setEmail(sRest.toString());
 	else if (sFirst.Compare(L"WebAddress"))		this->setWebAddress(sRest.toString());
 	else if (sFirst.Compare(L"WebMirror"))
 	else if (sFirst.Compare(L"CombineGameFiles"))
 		_bCombineFiles = sRest.Compare(L"true") || sRest.Compare(L"yes") || sRest.toInt();
 	else if (sFirst.Compare(L"UpdateFile"))
 		this->createUpdateFile(sRest);
 	else if (sFirst.Compare(L"ExportZip"))
 	{
 		Utils::WString ext = L"zip";
 		Utils::WString game = sRest.word(1);
 		Utils::WString file = _replaceFilename(CFileIO(sRest.words(2)).fullFilename());
 		if (game.contains(L"|"))
 		{
 			std::vector<Utils::WString> games;
 			if(game.tokenise(L"|", games))
+			{
 				for (size_t i = 0; i < games.size(); ++i)
+				{
 					unsigned int g = CBaseFile::GetGameFromString(games[i].toString());
 					Utils::WString filename = CFileIO(file).dir() + L"/" + CFileIO(file).baseName() + L"_" + CBaseFile::ConvertGameToString(g) + L"." + ext;
 					this->addAutoExport(g, filename.toString());
+				}
+			}
 		}
 		else
+		{
 			unsigned int g = CBaseFile::GetGameFromString(game.toString());
 			Utils::WString filename = CFileIO(file).dir() + L"/" + CFileIO(file).baseName() + L"_" + CBaseFile::ConvertGameToString(g) + L"." + ext;
 			this->addAutoExport(g, filename.toString());
 		}
 	}
 	else if (sFirst.Compare(L"Extract"))
+	{
 		Utils::WString game = sRest.word(1);
 		Utils::WString dir = CDirIO(sRest.words(2)).dir();
 		if (game.contains(L"|"))
 					C_File *newfile = this->appendFile(file, filetype, addGame, packed, dir);
 					if (newfile && progress)
 						progress->UpdateFile(newfile);
 					if ( newfile )
 						newfile->SetShared(shared);
 				}
 			}
+		}
+	}
 	else
+	{
 		unsigned int addGame = game;
 	return NULL;
+}
 void CBaseFile::convertNormalMod(C_File *f, const Utils::String &to) const
 {
 	C_File *match = this->findMatchingMod(f);
 	if ( match )
 	{
 		// file link
 		if ( !match->GetData() )
 			match->ReadFromFile();
 		match->changeBaseName(to);
 	}
 	// file link
 	if ( !f->GetData() )
 		f->ReadFromFile();
 	f->changeBaseName(to);
 }
 void CBaseFile::convertAutoText(C_File *f) const
 {
 	Utils::WString to;
 	if ( f->baseName().contains(L"-L") )
 		to = L"0000-L" + f->baseName().token(L"-L", 2);
 	else if ( f->baseName().contains("-l") )
 		to = L"0000-L" + f->baseName().token(L"-l", 2);
 		to = f->baseName().left(-4) + L"0000";
 	// file link
 	if ( !f->GetData() )
 		f->ReadFromFile();
 	f->changeBaseName(to);
+}
 void CBaseFile::convertFakePatch(C_File *f) const
+{
 	// find next available fake patch
 	int num = 0;
 	bool found = true;
 	while ( found )
+	{
 		++num;
 		found = false;
+		}
+	}
 	Utils::String to = Utils::String::PadNumber(num, 2);
 	C_File *match = this->findMatchingMod(f);
 	// file link
 	if ( !f->GetData() )
 		f->ReadFromFile();
 	f->changeBaseName(to);
 	// need to edit the file
 	if (f->GetFileType() == FILETYPE_SCRIPT || f->GetFileType() == FILETYPE_UNINSTALL)
 		f->renameScript(baseName);
 	f->changeBaseName(baseName);
-}
-void CBaseFile::addWebMirror(const Utils::String& str)
-{
-	if (!_lMirrors.contains(str))
-	{
-		_lMirrors.pushBack(str, "");
-		_changed();
-	}
-}
-void CBaseFile::removeWebMirror(const Utils::String& str)
-{
-	_lMirrors.remove(str, true);
-	_changed();
+}
 Utils::WString CBaseFile::createUpdateFile(const Utils::WString &dir) const
+{
 	Utils::WString file = this->getNameValidFile() + L"_" + this->author() + L".dat";

Subversion Repositories spk

(root)//libspk/src/BaseFile.cpp – Rev 207 → 208