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

+{
 	// no file to read from
 	if ( this->filename().empty() ) return;
 	// now open the file
-	std::fstream File(this->filename(), std::ios::in | std::ios::binary);
+	CFileIO File(this->filename());
-	if ( !File.is_open() ) return;
+	if ( !File.startRead() ) return;
 	// read the header
-	CBaseFile::readEndOfLine(File);
+	File.readEndOfLine();
 	// skip past values
-	File.seekg(4 + m_SHeader.lValueCompressSize, std::ios::cur);
+	File.seek(4 + m_SHeader.lValueCompressSize);
 	// read the next header
-	CBaseFile::readEndOfLine(File);
+	File.readEndOfLine();
 	// skip past files
-	File.seekg(4 + m_SHeader2.lSize, std::ios::cur);
+	File.seek(4 + m_SHeader2.lSize);
 	if ( m_pIconFile )
+	{
 		if ( (!m_pIconFile->GetData()) && (!m_pIconFile->Skip()) )
 			m_pIconFile->readFromFile(File, m_pIconFile->GetDataSize());
 		else
-			File.seekg(4 + m_pIconFile->GetDataSize(), std::ios::cur);
+			File.seek(4 + m_pIconFile->GetDataSize());
+	}
 	for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() )
+	{
 		C_File *fit = node->Data();
 		if ( (!fit->GetData()) && (!fit->Skip()) )
 			fit->readFromFile(File, fit->GetDataSize());
 		else
-			File.seekg(4 + fit->GetDataSize(), std::ios::cur);
+			File.seek(4 + fit->GetDataSize());
+	}
 	File.close();
+}
 	if ( f->GetData() && f->GetDataSize() ) return true;	// already loaded the data
 	if ( this->filename().empty() || !f ) return false;		// no filename to load from
 	if ( !m_lFiles.FindData(f) ) return false;				// unable to find file entry
 	// now open the file
-	std::fstream File(this->filename(), std::ios::in | std::ios::binary);
+	CFileIO *File = _startRead();
-	if ( !File.is_open() ) return false;
+	if ( !File ) return false;
-	// read the header
-	CBaseFile::readEndOfLine(File, NULL, false);
-	// skip past values
-	File.seekg(4 + m_SHeader.lValueCompressSize, std::ios::cur);
-	// read the next header
-	CBaseFile::readEndOfLine(File, NULL, false);
-	// skip past files
-	File.seekg(4 + m_SHeader2.lSize, std::ios::cur);
-	if ( m_pIconFile ) File.seekg(4 + m_pIconFile->GetDataSize(), std::ios::cur);
+	if ( m_pIconFile ) File->seek(4 + m_pIconFile->GetDataSize());
 	for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() ) {
 		C_File *fit = node->Data();
 		if (fit == f ) {
-			fit->readFromFile(File, fit->GetDataSize());
+			fit->readFromFile(*File, fit->GetDataSize());
 			break;
+		}
-		else File.seekg(4 + fit->GetDataSize(), std::ios::cur);
+		else File->seek(4 + fit->GetDataSize());
+	}
-	File.close();
+	delete File;
 	return true;
+}
-void CBaseFile::ReadIconFileToMemory ()
+CFileIO *CBaseFile::_startRead()
+{
 	// no file to read from
-	if ( this->filename().empty() )
+	if ( this->filename().empty() ) return NULL;
-		return;
-	if ( !m_pIconFile )
-		return;
 	// now open the file
-	std::fstream stream(this->filename(), std::ios::in | std::ios::binary);
+	CFileIO *File = new CFileIO(this->filename());
-	if ( !stream.is_open() ) return;
+	if ( !File->startRead() ) return NULL;
 	// read the header
-	CBaseFile::readEndOfLine(stream, NULL, false);
+	File->readEndOfLine();
 	// skip past values
-	stream.seekg(4 + m_SHeader.lValueCompressSize, std::ios::cur);
+	File->seek(4 + m_SHeader.lValueCompressSize);
 	// read the next header
-	CBaseFile::readEndOfLine(stream, NULL, false);
+	File->readEndOfLine();
 	// skip past files
-	stream.seekg(4 + m_SHeader2.lSize, std::ios::cur);
+	File->seek(4 + m_SHeader2.lSize);
-	if ( m_pIconFile ) {
+	return File;
-		if ( (!m_pIconFile->GetData()) && (!m_pIconFile->Skip()) )
-			m_pIconFile->readFromFile(stream, m_pIconFile->GetDataSize() );
-		else
-			stream.seekg(4 + m_pIconFile->GetDataSize(), std::ios::cur);
-	}
+}
+void CBaseFile::ReadIconFileToMemory ()
+{
+	if ( !m_pIconFile )	return;
+	CFileIO *File = _startRead();
+	if ( !File ) return;
+	if ( (!m_pIconFile->GetData()) && (!m_pIconFile->Skip()) )
+		m_pIconFile->readFromFile(*File, m_pIconFile->GetDataSize());
+	else
+		File->seek(4 + m_pIconFile->GetDataSize());
-	stream.close();
+	delete File;
+}
 void CBaseFile::_install_adjustFakePatches(CPackages *pPackages)
+{
 	CyStringList lPatches;
 	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 )
+{
-	std::fstream stream(filename.ToString().c_str(), std::ios::in | std::ios::binary);
+	CFileIO File(filename.ToString());
-	if ( !stream.is_open() ) return false;
+	if ( !File.startRead() ) return false;
-	bool ret = this->readFile(stream, readtype, progress);
+	bool ret = this->readFile(File, readtype, progress);
 	if ( ret ) this->setFilename(filename.ToString());
-	stream.close();
+	File.close();
 	return ret;
+}
 int CBaseFile::_read_Header(std::fstream &stream, int iReadType, int iMaxProgress, CProgressInfo *pProgress)
+{
 	delete []readData;
 	return true;
+}
-bool CBaseFile::readFile(std::fstream &stream, int readtype, CProgressInfo *progress)
+bool CBaseFile::readFile(CFileIO &File, int readtype, CProgressInfo *progress)
+{
 	ClearError ();
 	// first read the header
-	if ( !ParseHeader(CBaseFile::readEndOfLine(stream, NULL, false)) ) return false;
+	if ( !ParseHeader(File.readEndOfLine()) ) 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);
+	if ( m_SHeader.lValueCompressSize ) doneLen = this->_read_Header(File.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;
+	if ( !ParseFileHeader(File.readEndOfLine()) ) 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);
+	if ( m_SHeader2.lSize ) this->_read_FileHeader(File.stream(), readtype, maxProgress, doneLen, progress);
 	// file mismatch
 	long numfiles = m_lFiles.size();
 	if ( m_pIconFile ) ++numfiles;
 	if ( m_SHeader2.iNumFiles != numfiles ) {
 	// 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(stream, m_pIconFile->GetDataSize() );
+		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(stream, node->Data()->GetDataSize() );
+			node->Data()->readFromFile(File, node->Data()->GetDataSize());
 			if ( progress )	progress->UpdateProgress(fileCount++, m_lFiles.size() + 2);
+		}
 		m_bFullyLoaded = true;
+	}
 	// no file to read from
 	if ( this->filename().empty() )
 		return false;
 	// now open the file
-	CFileIO File(this->filename());
+	CFileIO *File = _startRead();
-	if ( !File.StartRead() ) return false;
+	if ( !File ) return false;
-	// read the header
-	File.readEndOfLine();
-	// skip past values
-	File.seek(m_SHeader.lValueCompressSize);
-	// read the next header
-	File.readEndOfLine();
-	// skip past files
-	File.seek(4 + m_SHeader2.lSize);
 	// now were in the file section
 	// skip past each one
-	if ( m_pIconFile ) File.seek(4 + m_pIconFile->GetDataSize ());
+	if ( m_pIconFile ) File->seek(4 + m_pIconFile->GetDataSize ());
 	CDirIO Dir(dir);
 	for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() ) {
 		C_File *fit = node->Data();
 		if ( progress )	progress->UpdateFile ( fit );
 		if ( (!fit->GetDataSize ()) || (!fit->GetData()) ) {
-			if ( !fit->readFromFile(File, fit->GetDataSize()) ) return false;
+			if ( !fit->readFromFile(*File, fit->GetDataSize()) ) return false;
+		}
 		else
-			File.seek(fit->GetDataSize());
+			File->seek(fit->GetDataSize());
 		if ( game ) {
 			if ( fit->GetGame() && fit->GetGame() != game )
 				continue;
+		}
 			if ( !fit->UncompressToFile ( dir, this, includedir, progress ) ) return false;
+		}
 		else if ( (!data) || (!fit->WriteToDir ( dir, this, includedir, NullString, data, size )) ) return false;
+	}
-	File.close();
+	delete File;
 	return true;
+}

Subversion Repositories spk

(root)/libspk/src/BaseFile.cpp – Rev 53 → 58