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

 	m_bCreate = false;
+}
 CCatFile::~CCatFile ()
+{
+	m_fDatFile.close();
+	m_fCatFile.close();
 	for ( SInCatFile *c = m_lFiles.First(); c; c = m_lFiles.Next() )
+	{
 		if ( c->sData )
 			delete c->sData;
 		delete c;
 		return fo.ChangeFileExtension ( "pbd" );
 	return f;
+}
-bool CCatFile::AppendFile ( CyString filename, CyString to, bool pck, bool bXor, CyString *sChangeTo)
+bool CCatFile::AppendFile(const Utils::String &filename, const Utils::String &sTo, bool pck, bool bXor, Utils::String *sChangeTo)
+{
-	if ( (!m_bCreate) && (!m_fCatFile.Exists ()) )
+	CLog::logf(CLog::Log_IO, 1, "CCatFile::AppendFile() Adding file, %s, into cat file, %s::%s [PCK:%s XOR:%s]", filename.c_str(), this->m_fCatFile.GetFilename().ToString().c_str(), sTo.c_str(), (pck) ? "Yes" : "No", (bXor) ? "Yes" : "No");
-		return false;
+	if ( filename.isin ( "::" ) ) return WriteFromCat ( filename.token("::", 1), filename.token("::", 2));
+	if ( (!m_bCreate) && (!m_fCatFile.exists ()) ) {
+		CLog::logf(CLog::Log_IO, 2, "CCatFile::AppendFile() Cat File: %s, doesn't exist, quitting...", m_fCatFile.GetFullFilename().ToString().c_str());
+		return false;
+	}
+	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;
 	}
-	if ( filename.IsIn ( "::" ) )
-		return WriteFromCat ( filename.GetToken ( "::", 1, 1 ), filename.GetToken ( "::", 2, 2 ) );
-	// first open the file to check it exists
-	FILE *id = fopen ( filename.c_str(), "rb" );
-	if ( !id )
-		return false;
-	fclose ( id );
-	// then check if the file already exists
-	/*
-	if ( !m_lFiles.empty() )
-	{
-		SInCatFile *f = FindData ( to );
-		if ( f )
-		{
-			if ( !RemoveFile ( f ) )
-				return false;
-		}
-	}*/
 	// 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 );
+		to = PckChangeExtension(to);
-	}
-	if ( sChangeTo ) {
-		*sChangeTo = to;
+	}
+	if ( sChangeTo ) *sChangeTo = to.ToString();
 	if ( !m_lFiles.empty() ) {
 		SInCatFile *checkf = FindData ( to );
 		if ( checkf ) {
+			CLog::logf(CLog::Log_IO, 2, "CCatFile::AppendFile() removing existing filechanging file extension for packed file, %s => %s", to.c_str(), PckChangeExtension(to).ToString().c_str());
-			if ( !RemoveFile ( checkf ) ) return false;
+			if ( !RemoveFile(checkf) ) {
+				CLog::logf(CLog::Log_IO, 1, "CCatFile::AppendFile() unable to remove existing file, quitting...");
+				return false;
+			}
+		}
 	}
 	bool append = false;
 	SInCatFile *f = new SInCatFile;
 	f->sData = 0;
 	f->lOffset = this->GetEndOffset();
 	bool dofile = true;
-	if ( !m_lFiles.size() )
+	if ( !m_lFiles.size() )	{
+		CLog::logf(CLog::Log_IO, 3, "CCatFile::AppendFile() no existing files found, wipeing the existing dat file");
 		m_fDatFile.WipeFile();
+	}
-//	if ( CheckPackedExtension(to) && !CheckPackedExtension(filename) )
-	{
-		FILE *id = fopen ( filename.c_str(), "rb" );
+	CFileIO File(filename);
-		if ( !id )
+	if ( !File.startRead() ) {
+		CLog::logf(CLog::Log_IO, 3, "CCatFile::AppendFile() unable to open file, %s, for reading", filename.c_str());
-			return false;
+		return false;
-		fseek ( id, 0, SEEK_END );
+	}
-		size_t size = ftell ( id );
-		fseek ( id, 0, SEEK_SET );
+	CLog::logf(CLog::Log_IO, 3, "CCatFile::AppendFile() reading file data, %s:%d", filename.c_str(), File.fileSize());
-		unsigned char *data = new unsigned char[size + 1];
+	unsigned char *data = File.readAll();
-		fread ( data, sizeof(unsigned char), size, id );
-		data[size] = '\0';
-		fclose ( id );
+	File.close();
+	// check if we need to pack the file
-		int iFileType = this->_checkFiletype(data, 3);
+	int iFileType = this->_checkFiletype(data, 3);
+	CLog::logf(CLog::Log_IO, 3, "CCatFile::AppendFile() preparing to append file data, Type=%d", iFileType);
-		if ( CheckPackedExtension(to) && iFileType == FILETYPE_PLAIN )
+	if ( iFileType == FILETYPE_PLAIN && CheckPackedExtension(to) ) {
-		{
+		CLog::logf(CLog::Log_IO, 2, "CCatFile::AppendFile() plain text file needs to packed");
-			size_t newsize = 0;
+		size_t newsize = 0;
-			unsigned char *newdata = PCKData ( data, size, &newsize, bXor );
+		unsigned char *newdata = PCKData(data, File.fileSize(), &newsize, bXor);
+		CLog::logf(CLog::Log_IO, 1, "CCatFile::AppendFile() file has been packed, %d => %d", File.fileSize(), newsize);
-			f->lSize = newsize;
+		f->lSize = newsize;
+		CLog::logf(CLog::Log_IO, 2, "CCatFile::AppendFile() Decrypting data");
-			this->DecryptDAT(newdata, f->lSize);
+		this->DecryptDAT(newdata, f->lSize);
+		CLog::logf(CLog::Log_IO, 2, "CCatFile::AppendFile() appending data to Dat file, Offset:%d", f->lOffset);
-			append = m_fDatFile.AppendDataToPos ( (const char *)newdata, newsize, f->lOffset );
+		append = m_fDatFile.AppendDataToPos ( (const char *)newdata, newsize, f->lOffset );
-			delete [] newdata;
+		delete [] newdata;
-		}
+	}
-		else
+	else  {
-		{
+		CLog::logf(CLog::Log_IO, 2, "CCatFile::AppendFile() Decrypting data");
-			this->DecryptDAT(data, size);
+		this->DecryptDAT(data, File.fileSize());
-			f->lSize = size;
+		f->lSize = File.fileSize();
+		CLog::logf(CLog::Log_IO, 2, "CCatFile::AppendFile() appending data to Dat file, Offset:%d", f->lOffset);
-			append = m_fDatFile.AppendDataToPos ( (const char *)data, f->lSize, f->lOffset );
+		append = m_fDatFile.AppendDataToPos ( (const char *)data, f->lSize, f->lOffset );
-		}
+	}
+	CLog::logf(CLog::Log_IO, 2, "CCatFile::AppendFile() cleaning up memory");
-		delete [] data;
+	delete [] data;
-	}
-	if ( append )
+	if ( append ) {
+		CLog::logf(CLog::Log_IO, 2, "CCatFile::AppendFile() append complete, adding file into cat list");
-	{
+		m_fDatFile.close();
 		m_bCreate = false;
 		f->sFile = to;
 		m_lFiles.push_back ( f );
+		CLog::logf(CLog::Log_IO, 3, "CCatFile::AppendFile() writing the new cat file");
-		WriteCatFile ();
+		this->WriteCatFile ();
+	}
-	else
+	else {
+		CLog::logf(CLog::Log_IO, 2, "CCatFile::AppendFile() appending failed, cleaning up file data");
 		delete f;
+	}
 	return true;
 }
 bool CCatFile::AddData ( CyString catfile, unsigned char *data, size_t size, CyString to, bool pck, bool create )
+{
 	int err = Open ( catfile, "", CATREAD_CATDECRYPT, create );
 	if ( (err != CATERR_NONE) && (err != CATERR_CREATED) )
 		return false;
 	return AppendData ( data, size, to, pck );
 }
 int CCatFile::GetEndOffset()
+{
 	if ( m_lFiles.empty() )
 		return 0;
 	else
 		return m_lFiles.Back()->Data()->lOffset + m_lFiles.Back()->Data()->lSize;
+}
 bool CCatFile::AppendData ( unsigned char *data, size_t size, CyString to, bool pck, bool bXor )
 {
-	if ( (!m_bCreate) && (!m_fCatFile.Exists ()) )
+	if ( (!m_bCreate) && (!m_fCatFile.exists ()) )
 		return false;
 	if ( (size <= 0) || (!data) )
 		return false;
 	// then check if the file already exists
 	if ( !m_lFiles.empty() )
+	{
 		append = m_fDatFile.AppendDataToPos ( (const char *)data, size, f->lOffset );
+	}
 	if ( append )
+	{
+		m_fDatFile.close();
 		m_bCreate = false;
 		f->sFile = to;
 		m_lFiles.push_back ( f );
 		WriteCatFile ();
+	}
 	if ( ext == "pck" )
+	{
 		CyString firstDir = f->sFile.FindReplace("/", "\\").GetToken("\\", 1, 1).lower();
 		if ( firstDir == "t" )
 			return fo.ChangeFileExtension ( "xml" );
 		else if ( firstDir == "director" )
 			return fo.ChangeFileExtension ( "xml" );
 		return fo.ChangeFileExtension ( "txt" );
+	}
 	else if ( ext == "pbb" )
 	// load the data from file
 	ReadFileToData ( f );
 	data = this->UnpackFile(f, &size);
-	if ( !data )
+	if ( !data ) {
-	{
 		m_iError = CATERR_CANTREAD;
 		return false;
+	}
 	CFileIO fo(CCatFile::RenameFileExtension(f));
+		}
+	}
 	if ( tofile.Empty() )
 		tofile = fo.GetFilename();
+	bool bWritten = false;
 	// create the directory to extract to
 	if ( !todir.Empty() && !CDirIO(todir).Create() )
 		m_iError = CATERR_CANTCREATEDIR;
 	else
 			file += "/";
 		file += tofile;
 		file = file.FindReplace("/", "\\");
 		file = file.FindReplace("\\\\", "\\");
-		FILE *id = fopen ( file.c_str(), "wb" );
+		CFileIO File(file.c_str());
-		if ( !id )
-			m_iError = CATERR_INVALIDDEST;
+		if ( !File.startWrite() ) m_iError = CATERR_INVALIDDEST;
-		else
-		{
-			fwrite ( data, sizeof(char), size, id );
+		else bWritten = File.write(data, size);
-			fclose ( id );
-			ClearError ();
-			delete data;
-			f->sData = 0;
-			return true;
-		}
 	}
 	delete data;
 	f->sData = 0;
+	if ( bWritten ) this->ClearError();
-	return false;
+	return bWritten;
+}
 CyString CCatFile::GetErrorString ()
+{
 	switch ( m_iError )
 CyStringList *CCatFile::GetTShipsEntries()
+{
 	if ( this->ExtractFile("types/tships.pck", "tships.txt") )
+	{
 		CFileIO TShips("tships.txt");
-		if ( TShips.Exists() )
+		if ( TShips.exists() )
+		{
 			CyStringList *lines = TShips.ReadLinesStr();
 			if ( lines )
+			{
 				// remove any commands, blank lines, and start
 					while ( str->data.Empty() )
 						str->data = str->str.GetToken(";", num--, (num + 2));
+				}
+			}
 			// remove the tmp file
-			TShips.Remove();
+			TShips.remove();
 			if ( lines )
 				lines->RemoveMarked();
 			return lines;
+		}

Subversion Repositories spk

(root)//libspk/src/CatFile.cpp – Rev 51 → 52