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

 	return NULL;
+}
 int CBaseFile::CheckFile ( CyString filename, float *version )
+{
-	FILE *id = fopen ( filename.c_str(), "rb" );
+	std::fstream File(filename.ToString().c_str(), std::ios::in | std::ios::binary);
-	if ( !id )
+	if ( !File.is_open() ) return 0;
-		return false;
-	CyString line = GetEndOfLine ( id, NULL, false );
+	Utils::String line = CBaseFile::readEndOfLine(File, NULL, false);
-	CyString type = line.GetToken ( 1, ';' );
+	Utils::String type = line.token(";", 1);
-	fclose ( id );
+	File.close();
 	// check for old version
-	if ( line.Left(3) == "HiP" )
+	if ( line.left(3) == "HiP" ) return SPKFILE_OLD;
-		return SPKFILE_OLD;
 	// check for format
-	if ( version )
-		*version = line.GetToken ( 2, ';' ).ToFloat();
+	if ( version ) *version = line.token(";", 2);
-	if ( type == "BaseCycrow" )
+	if ( type == "BaseCycrow" )	return SPKFILE_BASE;
-		return SPKFILE_BASE;
-	if ( type == "SPKCycrow" )
+	if ( type == "SPKCycrow" )	return SPKFILE_SINGLE;
-		return SPKFILE_SINGLE;
-	if ( type == "XSPCycrow" )
-		return SPKFILE_SINGLESHIP;
+	if ( type == "XSPCycrow" )	return SPKFILE_SINGLESHIP;
-	if ( type == "MSPKCycrow" )
+	if ( type == "MSPKCycrow" )	return SPKFILE_MULTI;
-		return SPKFILE_MULTI;
 	return SPKFILE_INVALID;
+}
 void CBaseFile::ClearFileData()
+{
 	return fullsize;
+}
+Utils::String CBaseFile::readEndOfLine(std::fstream &stream, int *line, bool upper )
+{
+	Utils::String str;
+	std::getline(stream, str, '\n');
+	if ( line ) ++(*line);
+	if ( upper ) return str.upper();
+	return str;
+}
 /*
 	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
+{
 	// no file to read from
 	if ( this->filename().empty() ) return;
 	// now open the file
-	FILE *id = fopen ( this->filename().c_str(), "rb" );
+	std::fstream File(this->filename(), std::ios::in | std::ios::binary);
-	if ( !id )
+	if ( !File.is_open() ) return;
-		return;
 	// read the header
-	GetEndOfLine ( id, NULL, false );
+	CBaseFile::readEndOfLine(File);
 	// skip past values
-	fseek ( id, 4, SEEK_CUR );
-	fseek ( id, m_SHeader.lValueCompressSize, SEEK_CUR );
+	File.seekg(4 + m_SHeader.lValueCompressSize, std::ios::cur);
 	// read the next header
-	GetEndOfLine ( id, NULL, false );
+	CBaseFile::readEndOfLine(File);
 	// skip past files
-	fseek ( id, 4, SEEK_CUR );
-	fseek ( id, m_SHeader2.lSize, SEEK_CUR );
+	File.seekg(4 + m_SHeader2.lSize, std::ios::cur);
 	if ( m_pIconFile )
+	{
 		if ( (!m_pIconFile->GetData()) && (!m_pIconFile->Skip()) )
-			m_pIconFile->ReadFromFile ( id, m_pIconFile->GetDataSize() );
+			m_pIconFile->readFromFile(File, m_pIconFile->GetDataSize());
 		else
-		{
-			fseek ( id, 4, SEEK_CUR );
-			fseek ( id, m_pIconFile->GetDataSize(), SEEK_CUR );
+			File.seekg(4 + m_pIconFile->GetDataSize(), std::ios::cur);
-		}
+	}
 	for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() )
+	{
 		C_File *fit = node->Data();
 		if ( (!fit->GetData()) && (!fit->Skip()) )
-			fit->ReadFromFile ( id, fit->GetDataSize() );
+			fit->readFromFile(File, fit->GetDataSize());
 		else
-		{
-			fseek ( id, 4, SEEK_CUR );
-			fseek ( id, fit->GetDataSize(), SEEK_CUR );
+			File.seekg(4 + fit->GetDataSize(), std::ios::cur);
-		}
+	}
-	fclose ( id );
+	File.close();
+}
 bool CBaseFile::ReadFileToMemory(C_File *f)
+{
-	if ( f->GetData() && f->GetDataSize() )
+	if ( f->GetData() && f->GetDataSize() ) return true;	// already loaded the data
-		return true;
-	// no file to read from
-	if ( this->filename().empty() || !f )
+	if ( this->filename().empty() || !f ) return false;		// no filename to load from
-		return false;
-	// check the file is part of the package
-	if ( !m_lFiles.FindData(f) )
+	if ( !m_lFiles.FindData(f) ) return false;				// unable to find file entry
-		return false;
 	// now open the file
-	FILE *id = fopen ( this->filename().c_str(), "rb" );
+	std::fstream File(this->filename(), std::ios::in | std::ios::binary);
-	if ( !id )
-		return false;
+	if ( !File.is_open() ) return false;
 	// read the header
-	GetEndOfLine ( id, NULL, false );
+	CBaseFile::readEndOfLine(File, NULL, false);
 	// skip past values
-	fseek ( id, 4, SEEK_CUR );
-	fseek ( id, m_SHeader.lValueCompressSize, SEEK_CUR );
+	File.seekg(4 + m_SHeader.lValueCompressSize, std::ios::cur);
 	// read the next header
-	GetEndOfLine ( id, NULL, false );
+	CBaseFile::readEndOfLine(File, NULL, false);
 	// skip past files
-	fseek ( id, 4, SEEK_CUR );
-	fseek ( id, m_SHeader2.lSize, SEEK_CUR );
+	File.seekg(4 + m_SHeader2.lSize, std::ios::cur);
-	if ( m_pIconFile )
-	{
-		fseek ( id, 4, SEEK_CUR );
-		fseek ( id, m_pIconFile->GetDataSize(), SEEK_CUR );
+	if ( m_pIconFile ) File.seekg(4 + m_pIconFile->GetDataSize(), std::ios::cur);
-	}
-	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 *fit = node->Data();
-		if (fit == f )
+		if (fit == f ) {
-		{
-			fit->ReadFromFile ( id, fit->GetDataSize() );
+			fit->readFromFile(File, fit->GetDataSize());
 			break;
+		}
-		else
-		{
-			fseek ( id, 4, SEEK_CUR );
-			fseek ( id, fit->GetDataSize(), SEEK_CUR );
+		else File.seekg(4 + fit->GetDataSize(), std::ios::cur);
-		}
+	}
-	fclose(id);
+	File.close();
 	return true;
+}
 void CBaseFile::ReadIconFileToMemory ()
+{
 	if ( !m_pIconFile )
 		return;
 	// now open the file
-	FILE *id = fopen ( this->filename().c_str(), "rb" );
+	std::fstream stream(this->filename(), std::ios::in | std::ios::binary);
-	if ( !id )
+	if ( !stream.is_open() ) return;
-		return;
 	// read the header
-	GetEndOfLine ( id, NULL, false );
+	CBaseFile::readEndOfLine(stream, NULL, false);
 	// skip past values
-	fseek ( id, 4, SEEK_CUR );
-	fseek ( id, m_SHeader.lValueCompressSize, SEEK_CUR );
+	stream.seekg(4 + m_SHeader.lValueCompressSize, std::ios::cur);
 	// read the next header
-	GetEndOfLine ( id, NULL, false );
+	CBaseFile::readEndOfLine(stream, NULL, false);
 	// skip past files
-	fseek ( id, 4, SEEK_CUR );
-	fseek ( id, m_SHeader2.lSize, SEEK_CUR );
+	stream.seekg(4 + m_SHeader2.lSize, std::ios::cur);
-	if ( m_pIconFile )
+	if ( m_pIconFile ) {
-	{
 		if ( (!m_pIconFile->GetData()) && (!m_pIconFile->Skip()) )
-			m_pIconFile->ReadFromFile ( id, m_pIconFile->GetDataSize() );
+			m_pIconFile->readFromFile(stream, m_pIconFile->GetDataSize() );
 		else
-		{
-			fseek ( id, 4, SEEK_CUR );
-			fseek ( id, m_pIconFile->GetDataSize(), SEEK_CUR );
+			stream.seekg(4 + m_pIconFile->GetDataSize(), std::ios::cur);
-		}
+	}
-	fclose ( id );
+	stream.close();
+}
 void CBaseFile::_install_adjustFakePatches(CPackages *pPackages)
+{
 	CyStringList lPatches;
 		if ( errorStr ) errorStr->PushBack(pCheckFile->GetNameDirectory(this), ERRORLOG(SPKINSTALL_ENABLEFILE));
+	}
 	return true;
+}
+bool CBaseFile::_install_createDirectory(CDirIO &Dir, const Utils::String &sTo, C_File *pFile, CyStringList *errorStr)
+{
+	m_sLastError = sTo;
+	if ( !sTo.isin ( "::" ) )
+	{
+		if ( !Dir.Exists(sTo) )
+		{
+			CLog::logf(CLog::Log_Install, 2, "Creating directory to install file into, %s", sTo.c_str());
+			if ( !Dir.Create(sTo) )
+			{
+				if ( errorStr )
+					errorStr->PushBack(CyString(sTo), ERRORLOG(SPKINSTALL_CREATEDIRECTORY_FAIL));
+				return false;
+			}
+			if ( errorStr )
+				errorStr->PushBack(CyString(sTo), ERRORLOG(SPKINSTALL_CREATEDIRECTORY));
+		}
+	}
+	else {
+		CLog::logf(CLog::Log_Install, 2, "Adjusting file extension for file in mod, %s => %s", pFile->GetFilePointer().c_str(), CCatFile::PckChangeExtension(pFile->GetFilePointer()).c_str());
+		pFile->SetFilename(CCatFile::PckChangeExtension(pFile->GetFilePointer()));
+	}
+	return true;
+}
+void CBaseFile::_install_writeFile(C_File *pFile, const Utils::String &sDestination, CyStringList *errorStr)
+{
+	m_iLastError = SPKERR_WRITEFILE;
+	m_sLastError = pFile->GetFilePointer();
+	CyString sInstalledFile = pFile->GetNameDirectory(this);
+	if ( pFile->IsDisabled() )
+	{
+		sInstalledFile = pFile->GetFilePointer().Remove(sDestination);
+		if ( sInstalledFile[0] == '/' || sInstalledFile[0] == '\\' )
+			sInstalledFile.Erase(0, 1);
+	}
+	if ( !pFile->WriteFilePointer() )
+	{
+		CLog::log(CLog::Log_Install, 1, "Failed to write the file");
+		if ( errorStr )
+			errorStr->PushBack(sInstalledFile, ERRORLOG(SPKINSTALL_WRITEFILE_FAIL));
+	}
+	else
+	{
+		CLog::log(CLog::Log_Install, 1, "File written successfully");
+		CLog::log(CLog::Log_Install, 2, "Checking signed status of the file");
+		pFile->UpdateSigned();
+		if ( errorStr )
+			errorStr->PushBack(sInstalledFile, ERRORLOG(SPKINSTALL_WRITEFILE));
+		switch(pFile->GetFileType())
+		{
+			case FILETYPE_SCRIPT:
+			case FILETYPE_UNINSTALL:
+				CLog::log(CLog::Log_Install, 2, "Updating file signature");
+				pFile->UpdateSignature();
+				break;
+		}
+	}
+}
 bool CBaseFile::InstallFiles ( CyString destdir, CProgressInfo *progress, CLinkList<C_File> *filelist, CyStringList *errorStr, bool enabled, CPackages *packages )
+{
 	//TODO: add errorStr and progress as member variables
 	if ( enabled ) {
 		this->_install_adjustFakePatches(packages);
 			// no matching file found, adding to main list
 			if ( !cFile ) filelist->push_back ( fit );
 			else
+			{
 				// if the file is not enabled, we need to check for any that might be enabled
-				if ( !fileEnabled ) //_install_checkDisabled(cFile, errorStr);
+				if ( !fileEnabled ) //_install_checkDisabled(cFile, destdir, errorStr);
+				{
 					//TODO: check what this is actually doing
 					if ( !cFile->GetUsed() )
+					{
 						CFileIO rFile(cFile->GetFilePointer());
 						cFile->SetFilename(fit->GetFilePointer());
 						cFile->SetDisabled(true);
+					}
 					else
+					{
-						cFile->SetFullDir ( CyString(sFilename) + fit->GetDirectory(this) );
+						fit->SetFullDir ( CyString(sFilename) + fit->GetDirectory(this) );
-						cFile->SetDisabled(false);
+						fit->SetDisabled(false);
+					}
+				}
 				// move it to enabled
 				else {
 					if ( !this->_install_checkFileEnable(cFile, fit, destdir.ToString(), fileEnabled, errorStr) ) {
 			// uncompressed to file, rename and move
 			if ( uncomprToFile )
+			{
 				m_iLastError = SPKERR_WRITEFILE;
 				CyString to = fit->GetDirectory(this);
-				//to = to.GetToken ( 1, to.NumToken ('/') - 1, '/' );
-				if ( !fileEnabled )
-					to = CyString("PluginManager/Disabled/") + to;
+				if ( !fileEnabled )	to = CyString("PluginManager/Disabled/") + to;
-				CDirIO Dir(destdir);
-				if ( !Dir.Exists(to) )
-				{
-					if ( !Dir.Create ( to ) )
+				if ( !_install_createDirectory(Dir, to.ToString(), fit, errorStr) ) {
-					{
-						if ( errorStr )
+					bFailed = true;
-							errorStr->PushBack(to, ERRORLOG(SPKINSTALL_CREATEDIRECTORY_FAIL));
-						return false;
+					continue;
-					}
-					if ( errorStr )
-						errorStr->PushBack(to, ERRORLOG(SPKINSTALL_CREATEDIRECTORY));
+				}
 				int err = 1;
 				m_sLastError = to;
-				if ( !fit->GetTempFile ().Empty() )
-					err = rename ( fit->GetTempFile().c_str(), to.c_str() );
+				if ( !fit->GetTempFile ().Empty() )	err = rename ( fit->GetTempFile().c_str(), to.c_str() );
-				if ( err )
+				if ( err ) {
+					bFailed = true;
-					return false;
+					continue;
+				}
+			}
 			//otherwise, just extract the file
 			else
+			{
 				// old file is found in list, switch to using new one
 				CyString fpointer = fit->GetFilePointer();
 				m_iLastError = SPKERR_CREATEDIRECTORY;
 				CyString dir = fit->GetFilePointer().GetToken ( "/", 1, fit->GetFilePointer().NumToken("/") - 1 );
 				dir = dir.Remove(destdir);
-				if ( dir[0] == '/' || dir[0] == '\\' )
+				if ( dir[0] == '/' || dir[0] == '\\' ) dir.Erase(0, 1);
-					dir.Erase(0, 1);
-				m_sLastError = dir;
-				if ( !dir.IsIn ( "::" ) )
-				{
-					if ( !Dir.Exists(dir) )
-					{
-						CLog::logf(CLog::Log_Install, 2, "Creating directory to install file into, %s", dir.c_str());
+				if ( !_install_createDirectory(Dir, dir.ToString(), fit, errorStr) ) {
-						if ( !Dir.Create(dir) )
-						{
-							if ( errorStr )
+					bFailed = true;
-								errorStr->PushBack(dir, ERRORLOG(SPKINSTALL_CREATEDIRECTORY_FAIL));
-							return false;
+					continue;
-						}
-						if ( errorStr )
-							errorStr->PushBack(dir, ERRORLOG(SPKINSTALL_CREATEDIRECTORY));
-					}
-				}
-				else {
-					CLog::logf(CLog::Log_Install, 2, "Adjusting file extension for file in mod, %s => %s", fit->GetFilePointer().c_str(), CCatFile::PckChangeExtension(fit->GetFilePointer()).c_str());
-					fit->SetFilename(CCatFile::PckChangeExtension(fit->GetFilePointer()));
+				}
-				m_iLastError = SPKERR_WRITEFILE;
-				m_sLastError = fit->GetFilePointer();
-				CyString sInstalledFile = fit->GetNameDirectory(this);
-				if ( fit->IsDisabled() )
-				{
-					sInstalledFile = fit->GetFilePointer().Remove(destdir);
+				_install_writeFile(fit, destdir.ToString(), errorStr);
-					if ( sInstalledFile[0] == '/' || sInstalledFile[0] == '\\' )
-						sInstalledFile.Erase(0, 1);
-				}
-				if ( !fit->WriteFilePointer() )
-				{
-					CLog::log(CLog::Log_Install, 1, "Failed to write the file");
-					if ( errorStr )
-						errorStr->PushBack(sInstalledFile, ERRORLOG(SPKINSTALL_WRITEFILE_FAIL));
-				}
-				else
-				{
-					CLog::log(CLog::Log_Install, 1, "File written successfully");
-					CLog::log(CLog::Log_Install, 2, "Checking signed status of the file");
-					fit->UpdateSigned();
-					if ( errorStr )
-						errorStr->PushBack(sInstalledFile, ERRORLOG(SPKINSTALL_WRITEFILE));
-					switch(fit->GetFileType())
-					{
-						case FILETYPE_SCRIPT:
-						case FILETYPE_UNINSTALL:
-							CLog::log(CLog::Log_Install, 2, "Updating file signature");
-							fit->UpdateSignature();
-							break;
-					}
-				}
+			}
 			ClearError ();
+		}
 		if ( adjustPointer )
 		CLog::log(CLog::Log_Install, 1, "File installation completed");
+	}
 	// now clear or data memory
 	CLog::log(CLog::Log_Install, 2, "Delting temporary file data from memory");
-	for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() )
+	for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() ) node->Data()->DeleteData();
-	{
-		// add plugin manager file to identify fake patches
-		/*
-		if ( fit->IsFakePatch() && fit->CheckFileExt ("cat") )
-		{
-			CFileIO plugin("pluginmanager.txt");
-			std::vector<CyString> lines;
-			CyString version;
-			version.FromFloat(GetLibraryVersion(), 2);
-			SStringList *strList = lPatches.FindData(fit->GetBaseName());
-			CyString baseName;
-			if ( strList )
-				baseName = strList->str;
-			else
-				baseName = fit->GetBaseName();
-			lines.push_back(CyString("FakePatch:") + baseName);
-			lines.push_back(CyString("spklibrary:") + version);
-			lines.push_back(CyString("Package:") + m_sName);
-			lines.push_back(CyString("Author:") + m_sAuthor);
-			lines.push_back(CyString("OriginalFile:") + fit->GetOriginalName());
-			if ( plugin.WriteFile(&lines) )
-			{
-				CCatFile cat;
-				if ( cat.Open(fit->GetFilePointer(), CATREAD_DAT, false) == CATERR_NONE )
-				{
-					cat.AppendFile(plugin.GetFilename(), plugin.GetFilename(), true);
-					cat.WriteCatFile();
-				}
-				plugin.Remove();
-			}
-		}
-*/
-		node->Data()->DeleteData();
-	}
 	return !bFailed;
+}
 /*######################################################################################################*/
 /*
 	Func:   ParseHeader
 	Return: boolean - return ture if acceptable format
 	Desc:   Opens and reads the spk file and loads all data into class
 */
 bool CBaseFile::ReadFile ( CyString filename, int readtype, CProgressInfo *progress )
+{
-	FILE *id = fopen ( filename.c_str(), "rb" );
+	std::fstream stream(filename.ToString().c_str(), std::ios::in | std::ios::binary);
-	if ( !id )
-		return false;
+	if ( !stream.is_open() ) return false;
-	bool ret = ReadFile ( id, readtype, progress );
+	bool ret = this->readFile(stream, readtype, progress);
 	if ( ret ) this->setFilename(filename.ToString());
-	fclose ( id );
+	stream.close();
 	return ret;
+}
-bool CBaseFile::ReadFile ( FILE *id, int readtype, CProgressInfo *progress )
-{
-	ClearError ();
-	// first read the header
-	if ( !ParseHeader ( GetEndOfLine ( id, NULL, false ) ) )
+int CBaseFile::_read_Header(std::fstream &stream, int iReadType, int iMaxProgress, CProgressInfo *pProgress)
+{
-		return false;
+	int doneLen = 0;
-	if ( readtype == SPKREAD_HEADER )
+	// read data to memory
+	unsigned char *readData;
+	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 true;
+		return -1;
+	}
-	// update the progress for each section
+	unsigned char size[4];
-	int maxProgress = (readtype == SPKREAD_VALUES) ? 3 : 6;
-	if ( readtype != SPKREAD_ALL && progress )
+	stream.read((char *)size, 4);
-		progress->UpdateProgress(1, maxProgress);
+	stream.read((char *)readData, m_SHeader.lValueCompressSize);
-	long doneLen = 0;
-	// next read the data values for the spk files
-	if ( m_SHeader.lValueCompressSize )
-	{
-		// read data to memory
-		unsigned char *readData = new unsigned char[m_SHeader.lValueCompressSize];
-		unsigned char size[4];
-		fread ( size, 4, 1, id );
-		fread ( readData, sizeof(unsigned char), m_SHeader.lValueCompressSize, id );
-		unsigned long uncomprLen = (size[0] << 24) + (size[1] << 16) + (size[2] << 8) + size[3];
+	unsigned long uncomprLen = (size[0] << 24) + (size[1] << 16) + (size[2] << 8) + size[3];
-		// check for zlib compression
+	// check for zlib compression
-		if ( m_SHeader.iValueCompression == SPKCOMPRESS_ZLIB )
+	if ( m_SHeader.iValueCompression == SPKCOMPRESS_ZLIB ) {
-		{
-			// uncomress the data
+		// uncomress the data
+		try {
 			unsigned char *uncompr = new unsigned char[uncomprLen];
 			int err = uncompress ( uncompr, &uncomprLen, readData, m_SHeader.lValueCompressSize );
 			// update the progress for each section
-			if ( readtype != SPKREAD_ALL && progress )
-				progress->UpdateProgress(2, maxProgress);
+			if ( iReadType != SPKREAD_ALL && pProgress ) pProgress->UpdateProgress(2, iMaxProgress);
-			if ( err == Z_OK )
-				ReadValues ( CyString ((char *)uncompr) );
+			if ( err == Z_OK ) this->ReadValues ( CyString ((char *)uncompr) );
 			doneLen = uncomprLen;
 			delete uncompr;
+		}
-		else if ( m_SHeader.iValueCompression == SPKCOMPRESS_7ZIP )
-		{
-			long len = uncomprLen;
+		catch (std::exception &e) {
-			unsigned char *compr = LZMADecode_C ( readData, m_SHeader.lValueCompressSize, (size_t*)&len, NULL );
+			CLog::logf(CLog::Log_IO, 2, "CBaseFile::_read_Header() unable to malloc [uncompr], %d (%s)", uncomprLen, e.what());
-			// update the progress for each section
-			if ( readtype != SPKREAD_ALL && progress )
-				progress->UpdateProgress(2, maxProgress);
-			if ( compr )
+			return -1;
-				ReadValues ( CyString ((char *)compr) );
+		}
-		// no compression
-		else
-			ReadValues ( CyString ((char *)readData) );
-		delete readData;
+	}
+	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);
-	// update the progress for each section
+		if ( compr ) ReadValues ( CyString ((char *)compr) );
+	}
-	if ( readtype != SPKREAD_ALL && progress )
+	// no compression
+	else
-		progress->UpdateProgress(3, maxProgress);
+		ReadValues ( CyString ((char *)readData) );
-	if ( readtype == SPKREAD_VALUES )
-		return true;
+	delete readData;
-	// next should be the next header
-	if ( !ParseFileHeader ( GetEndOfLine (id, NULL, false) ) )
-		return false;
+	return doneLen;
+}
+int CBaseFile::_read_FileHeader(std::fstream &stream, int iReadType, int iMaxProgress, int iDoneLen, CProgressInfo *pProgress)
+{
-	// clear the current file list
+	unsigned char *readData;
+	try {
+		readData = new unsigned char[m_SHeader2.lSize];
+	}
-	m_lFiles.clear(true);
+	catch (std::exception &e) {
+		CLog::logf(CLog::Log_IO, 2, "CBaseFile::_read_FileHeader() unable to malloc [header], %d (%s)", m_SHeader2.lSize, e.what());
+		return -1;
+	}
-	// update the progress for each section
+	unsigned char size[4];
-	if ( readtype != SPKREAD_ALL && progress )
+	stream.read((char *)size, 4);
-		progress->UpdateProgress(4, maxProgress);
+	stream.read((char *)readData, m_SHeader2.lSize);
-	if ( m_SHeader2.lSize )
-	{
-		unsigned char *readData = new unsigned char[m_SHeader2.lSize];
-		unsigned char size[4];
-		fread ( size, 4, 1, id );
-		fread ( readData, sizeof(char), m_SHeader2.lSize, id );
-		unsigned long uncomprLen = (size[0] << 24) + (size[1] << 16) + (size[2] << 8) + size[3];
+	unsigned long uncomprLen = (size[0] << 24) + (size[1] << 16) + (size[2] << 8) + size[3];
-		// check for zlib compression
-		if ( m_SHeader.iValueCompression == SPKCOMPRESS_ZLIB )
-		{
+	// check for zlib compression
-			if ( uncomprLen < (unsigned long)doneLen )
+	if ( m_SHeader.iValueCompression == SPKCOMPRESS_ZLIB ) {
-				uncomprLen = doneLen;
+		if ( uncomprLen < (unsigned long)iDoneLen ) uncomprLen = iDoneLen;
+		try {
 			unsigned char *uncompr = new unsigned char[uncomprLen];
 			int err = uncompress ( uncompr, &uncomprLen, readData, m_SHeader2.lSize );
 			// update the progress for each section
-			if ( readtype != SPKREAD_ALL && progress )
-				progress->UpdateProgress(5, maxProgress);
+			if ( iReadType != SPKREAD_ALL && pProgress ) pProgress->UpdateProgress(5, iMaxProgress);
-			if ( err == Z_OK )
-				ReadFiles ( CyString ((char *)uncompr) );
+			if ( err == Z_OK ) ReadFiles ( CyString ((char *)uncompr) );
 			delete uncompr;
+		}
-		else if ( m_SHeader.iValueCompression == SPKCOMPRESS_7ZIP )
-		{
-			long len = uncomprLen;
+		catch (std::exception &e) {
-			unsigned char *compr = LZMADecode_C ( readData, m_SHeader2.lSize, (size_t*)&len, NULL );
+			CLog::logf(CLog::Log_IO, 2, "CBaseFile::_read_FileHeader() unable to malloc [uncompr], %d (%s)", uncomprLen, e.what());
-			// update the progress for each section
-			if ( readtype != SPKREAD_ALL && progress )
-				progress->UpdateProgress(5, maxProgress);
-			if ( compr )
+			return -1;
-				ReadFiles ( CyString ((char *)compr) );
+		}
-		else
-			ReadFiles ( CyString ((char *)readData) );
-		delete readData;
+	}
+	else if ( m_SHeader.iValueCompression == SPKCOMPRESS_7ZIP )
+	{
+		long len = uncomprLen;
+		unsigned char *compr = LZMADecode_C ( readData, m_SHeader2.lSize, (size_t*)&len, NULL );
+		// update the progress for each section
+		if ( iReadType != SPKREAD_ALL && pProgress ) pProgress->UpdateProgress(5, iMaxProgress);
+		if ( compr ) ReadFiles ( CyString ((char *)compr) );
+	}
+	else
+		ReadFiles ( CyString ((char *)readData) );
+	delete readData;
+	return true;
+}
+bool CBaseFile::readFile(std::fstream &stream, int readtype, CProgressInfo *progress)
+{
+	ClearError ();
+	// first read the header
+	if ( !ParseHeader(CBaseFile::readEndOfLine(stream, NULL, false)) ) return false;
+	if ( readtype == SPKREAD_HEADER ) return true;
+	// update the progress for each section
+	int maxProgress = (readtype == SPKREAD_VALUES) ? 3 : 6;
+	if ( readtype != SPKREAD_ALL && progress ) progress->UpdateProgress(1, maxProgress);
+	long doneLen = 0;
+	// next read the data values for the spk files
+	if ( m_SHeader.lValueCompressSize ) doneLen = this->_read_Header(stream, readtype, maxProgress, progress);
+	// update the progress for each section
+	if ( readtype != SPKREAD_ALL && progress ) progress->UpdateProgress(3, maxProgress);
+	if ( readtype == SPKREAD_VALUES ) return true;
+	// next should be the next header
+	if ( !ParseFileHeader(CBaseFile::readEndOfLine(stream, NULL, false)) ) return false;
+	// clear the current file list
+	m_lFiles.clear(true);
+	// update the progress for each section
+	if ( readtype != SPKREAD_ALL && progress ) progress->UpdateProgress(4, maxProgress);
+	if ( m_SHeader2.lSize ) this->_read_FileHeader(stream, readtype, maxProgress, doneLen, progress);
 	// file mismatch
 	long numfiles = m_lFiles.size();
-	if ( m_pIconFile )
+	if ( m_pIconFile ) ++numfiles;
-		++numfiles;
-	if ( m_SHeader2.iNumFiles != numfiles )
+	if ( m_SHeader2.iNumFiles != numfiles ) {
-	{
 		m_iLastError = SPKERR_FILEMISMATCH;
 		return false;
+	}
 	// update the progress for each section
-	if ( readtype != SPKREAD_ALL && progress )
-		progress->UpdateProgress(6, maxProgress);
+	if ( readtype != SPKREAD_ALL && progress )	progress->UpdateProgress(6, maxProgress);
-	if ( readtype == SPKREAD_ALL )
+	if ( readtype == SPKREAD_ALL ) {
-	{
 		int fileCount = 2;
-		if ( m_pIconFile )
-			m_pIconFile->ReadFromFile ( id, m_pIconFile->GetDataSize() );
+		if ( m_pIconFile ) m_pIconFile->readFromFile(stream, m_pIconFile->GetDataSize() );
-		// ok finally we need to read all the files
+		// ok finally we need to read all the 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() ) {
-		{
-			node->Data()->ReadFromFile ( id, node->Data()->GetDataSize() );
+			node->Data()->readFromFile(stream, node->Data()->GetDataSize() );
-			if ( progress )
-				progress->UpdateProgress(fileCount++, m_lFiles.size() + 2);
+			if ( progress )	progress->UpdateProgress(fileCount++, m_lFiles.size() + 2);
+		}
 		m_bFullyLoaded = true;
+	}

Subversion Repositories spk

(root)//libspk/src/BaseFile.cpp – Rev 50 → 51