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;
 		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;
+}
 	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;
 		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 )
+	{
 		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";
 	file.removeChar(' ');

Subversion Repositories spk

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