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

 	if ( m_bCatChanged ) {
 		WriteCatFile ();
 		m_fCatFile.close();
+	}
+	_clearFiles();
+	if ( m_sData ) delete []m_sData;
+}
+void CCatFile::_clearFiles()
+{
 	for ( SInCatFile *c = m_lFiles.First(); c; c = m_lFiles.Next() )
+	{
 		if ( c->sData )
 			delete []c->sData;
 		delete c;
+	}
-	if ( m_sData ) delete []m_sData;
 	m_lFiles.clear();
+}
 bool CCatFile::IsAddonDir(CyString dir)
 {
 	CyString d = dir;
 	d = d.FindReplace("\\", "/");
 	d = d.GetToken("/", 1, 1);
 	if ( d.Compare("types") )
 	return false;
+}
 int CCatFile::Open ( CyString sCatfile, CyString addon, int readtype, bool create )
+{
 	Utils::String catfile = sCatfile.ToString();
 	m_bCreate = false;
 	Utils::String datfile;
 	if ( !catfile.right(4).Compare(".cat") ) {
 		datfile = catfile + ".dat";
 	if ( readtype == CATREAD_JUSTCONTENTS ) create = false;
 	// first check if the dat file exists and opens
 	bool created = false;
 	if ( readtype != CATREAD_JUSTCONTENTS ) {
-		std::ifstream file(datfile);
-		if ( !file.good() ) {
+		if ( !CFileIO::Exists(datfile) ) {
 			if ( create ) created = true;
 			else		  return CATERR_NODATFILE;
+		}
-		if ( file.is_open() ) file.close();
 	}
 	// now open the cat file to read
 	CFileIO File(catfile);
 	if ( !File.startRead() ) {
 		if ( create ) created = true;
 		else		  return CATERR_NOCATFILE;
 	}
 	if ( created ) {
 		m_fCatFile.Open(catfile);
 		m_fDatFile.Open(datfile);
 		m_bCreate = true;
 		return CATERR_CREATED;
 	// find the file size
 	if ( !File.fileSize() ) {
 		File.close();
 		return CATERR_FILEEMPTY;
 	}
 	// size must be multiples of 5
 	size_t size = File.fileSize() + ((File.fileSize() % 5) ? 5 - (File.fileSize() % 5) : 0);
 	// read cat to buffer
 	try {
 		return CATERR_READCAT;
+	}
 	m_sData[size] = 0;
 	m_iDataType = CATFILE_READ;
 	File.close();
 	if ( readtype != CATREAD_CAT ) {
 		if ( !DecryptData () ) return CATERR_DECRYPT;
 		m_sData[File.fileSize()] = 0;
-		ReadFiles ();
+		readFiles ();
+	}
 	m_sAddonDir = addon;
 	m_fCatFile.Open ( catfile );
 		if ( m_fDatFile.startRead() ) {
 			compare = m_fDatFile.fileSize();
 			m_fDatFile.close();
+		}
 		SInCatFile *c = m_lFiles.Back ()->Data();
-		//if ( (c->lSize + c->lOffset) != compare ) return CATERR_MISMATCH;
+		if ( (c->lSize + c->lOffset) != compare ) {
+//			return CATERR_MISMATCH;
+		}
 	}
 	if ( readtype >= CATREAD_DAT ) LoadDatFile ();
 	return CATERR_NONE;
+}
 bool CCatFile::RemoveFile ( CyString file )
+{
 	if ( !m_sAddonDir.Empty() ) {
 		SInCatFile *f = FindData ( m_sAddonDir + "\\" + file );
 		if ( f )
 			RemoveFile(f);
+	}
+	{
 		SInCatFile *f = FindData ( CyString("addon\\") + file );
 		if ( f )
 			RemoveFile(f);
 void CCatFile::LoadDatFile ()
+{
 	if ( m_fDatFile.NoFile() )
 		return;
 	if ( m_fDatFile.startRead() ) {
 		for ( CListNode<SInCatFile> *node = m_lFiles.Front(); node; node = node->next() )
+		{
 			SInCatFile *c = node->Data();
 			if ( c->sData )	delete c->sData;
+		}
 		m_fDatFile.close();
+	}
+}
-bool CCatFile::ReadFiles ()
+bool CCatFile::readFiles ()
+{
-	int num = 0;
 	size_t offset = 0;
+	int max = 0;
+	Utils::String *lines = Utils::String(m_sData).tokenise("\n", &max);
+	_clearFiles();
+	if ( lines && max ) {
+		int start = 1;
+		_sReadFilename = lines[0];
+		if ( _sReadFilename.token(" ", -1).isNumber() ) {
+			_sReadFilename.clear();
+			start = 0;
+		}
+		for(int i = start; i < max; i++) {
+			Utils::String l = lines[i];
+			SInCatFile *catfile = new SInCatFile;
+			catfile->lSize = static_cast<size_t>(l.token(" ", -1).toLong());
+			catfile->sFile = l.tokens(" ", 1, -2);
+			catfile->lOffset = offset;
+			catfile->sData = 0;
+			offset += catfile->lSize;
+			m_lFiles.push_back ( catfile );
+		}
+	}
+	CLEANSPLIT(lines, max);
+/*
 	unsigned char *data = m_sData;
 	int spacePos = -1;
 	while ( m_sData[num] != '\0' ) {
 		if ( m_sData[num] == '\n' ) {
 			m_sData[num] = 0;
+		}
 		else if ( m_sData[num] == ' ' )
 			spacePos = num;
 		++num;
+	}
+*/
 	return true;
+}
 bool CCatFile::DecryptData ( unsigned char *data, size_t size )
+{
+{
 	delete m_sData;
 	m_sData = NULL;
 	m_iDataType = CATFILE_NONE;
 	m_lSize = 0;
 }
 bool CCatFile::ReadFileToData ( CyString filename )
+{
 	SInCatFile *c = FindData ( filename );
 	return ReadFileToData ( c );
 	if ( pFile->bDecrypted ) return;
 	pFile->bDecrypted = true;
 	this->DecryptDAT(pFile->sData, pFile->lSize);
+}
 void CCatFile::DecryptDAT(unsigned char *buffer, size_t size)
 {
 	for(unsigned char *pos=buffer, *end=buffer + size; pos < end; pos++){
 		*pos^=0x33;
+	}
+}
 unsigned char *CCatFile::readData ( CyString filename, size_t *size )
 	/*int iOffset = 0;
 	if ( iFiletype == FILETYPE_PCK ) {
 		iOffset = 1;
 		for(size_t i=0; i < c->lSize; i++){
 			c->sData[i] ^= magic;
 		}
+	}
 	return UnPCKData ( c->sData + iOffset, c->lSize - iOffset, size );*/
 	return UnPCKData(c->sData, c->lSize, size, (iFiletype == FILETYPE_PCK) ? true : false);
+	}
 	// now just write the new cat file
 	m_lFiles.remove ( f );
 	m_bCatChanged = true;
 	return true;
+}
 bool CCatFile::WriteCatFile ()
+{
 	if ( (m_bCreate) && (m_lFiles.empty()) ) return false;
-	Utils::String cat = m_fCatFile.filename() + "\n";
+	Utils::String cat = m_fDatFile.filename() + "\n";
 	for ( CListNode<SInCatFile> *node = m_lFiles.Front(); node; node = node->next() ) {
 		if ( !node->Data() ) continue;
 		if ( node->Data()->sFile.Empty() ) continue;
 		Utils::String str = node->Data()->sFile.ToString();
 		cat += str.findReplace("/", "\\").findReplace("\\\\", "\\") + " " + (long)node->Data()->lSize + "\n";
 	try {
 		unsigned char *data = new unsigned char[len + 1];
 		memcpy(data, cat.c_str(), cat.length() * sizeof(unsigned char));
 		for ( size_t i = len; i >= cat.length(); i-- ) data[i] = '\0';
 		this->DecryptData(data, len);
 		bool ret = m_fCatFile.write(data, cat.length());
 		delete []data;
+	}
 	catch(std::exception &e) {
 		CLog::logf(CLog::Log_IO, 2, "CCatFile::WriteCatFile() unable to malloc, %d (%s)", len + 1, e.what());
 		return false;
+	}
 	m_fCatFile.close();
 	m_bCatChanged = false;
 	return ret;
 }
 bool CCatFile::CheckExtensionPck ( CyString filename )
+{
 	CyString ext = filename.GetToken ( ".", filename.NumToken  ( "." ) ).lower();
 	if ( ext == "xml" )
 		return true;
 	else if ( ext == "txt" )
 		return true;
 	else if ( ext == "bob" )
 		return true;
 	else if ( ext == "bod" )
 		return true;
 	return false;
+}
 bool CCatFile::CheckPackedExtension(const Utils::String &sFilename)
 	Utils::String ext = CFileIO(sFilename).extension().lower();
 	if ( ext == "pck" )
 		return true;
 	else if ( ext == "pbb" )
 		return true;
 	else if ( ext == "pbd" )
 		return true;
 	return false;
+}
 CyString CCatFile::PckChangeExtension ( CyString f )
+{
 	CFileIO fo ( f );
 	CyString ext = fo.GetFileExtension ().lower();
 	if ( ext == "txt" )
 		return fo.ChangeFileExtension ( "pck" );
 	else if ( ext == "xml" )
 		return fo.ChangeFileExtension ( "pck" );
 	else if ( ext == "bob" )
 		return fo.ChangeFileExtension ( "pbb" );
 	else if ( ext == "bod" )
+	}
 	CyString to = sTo;
 	if ( !m_sAddonDir.Empty() && CCatFile::IsAddonDir(to) ) {
 		CLog::logf(CLog::Log_IO, 3, "CCatFile::AppendFile() changing destination to included addon fir, %s => %s", to, m_sAddonDir + "/" + to);
 		to = m_sAddonDir + "\\" + to;
 	}
 	// change the file extension and remove the file again
 	if ( pck && CheckExtensionPck(filename) ) {
 		CLog::logf(CLog::Log_IO, 3, "CCatFile::AppendFile() changing file extension for packed file, %s => %s", to.c_str(), PckChangeExtension(to).ToString().c_str());
 		to = PckChangeExtension(to);
+	}
 	bool append = false;
 	SInCatFile *f = new SInCatFile;
 	f->sData = 0;
 	f->lOffset = this->GetEndOffset();
 	bool dofile = true;
 	if ( !m_lFiles.size() )	{
 		CLog::logf(CLog::Log_IO, 3, "CCatFile::AppendFile() no existing files found, wipeing the existing dat file");
 		m_fDatFile.WipeFile();
 	f->sData = 0;
 	if ( m_lFiles.empty() )
 		f->lOffset = 0;
 	else
 		f->lOffset = m_fDatFile.GetFilesize();
 	// if file extension is packed but not the file, then pack it, "pck" forces it to be packed unless it already is
 	f->lSize = size;
 	if ( (((pck) && (CheckExtensionPck (to.ToString()))) || ((CheckPackedExtension ( to.ToString() )))) && (!IsDataPCK ( data, size )) )
+	{
 	f->sData = 0;
 	if ( bWritten ) this->ClearError();
 	return bWritten;
+}
+const Utils::String &CCatFile::internalDatFilename() const
+{
+	return _sReadFilename;
+}
 CyString CCatFile::GetErrorString ()
+{
 	switch ( m_iError )

Subversion Repositories spk

(root)//libspk/src/CatFile.cpp – Rev 84 → 85