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

 			CyString tofile = pCheckFile->GetFilePointer().GetToken("::", 2, 2);
 			CCatFile tocat;
 			int err = tocat.Open ( fit->GetFilePointer().GetToken("::", 1, 1), "", CATREAD_CATDECRYPT, true );
 			if ( (err == CATERR_NONE) || (err == CATERR_CREATED) ) {
-				tocat.AppendFile ( pCheckFile->GetFilePointer(), tofile );
+				tocat.AppendFile(pCheckFile->GetFilePointer().ToString(), tofile.ToString());
 				CLog::logf(CLog::Log_Install, 2, "Adding existing file into new mod File, %s => %s", fit->GetFilePointer().GetToken("::", 1, 1).c_str(), tofile.c_str());
+			}
 			CCatFile fromcat;
 			err = fromcat.Open ( pCheckFile->GetFilePointer().GetToken("::", 1, 1), "", CATREAD_CATDECRYPT, false );
+				}
 				if ( errorStr )	errorStr->PushBack(to, ERRORLOG(SPKINSTALL_CREATEDIRECTORY));
+			}
 			CyString destfile = CyString(sDestination) + "/" + pCheckFile->GetNameDirectory(this);
-			if ( CFileIO(destfile).Exists() ) CFileIO(destfile).Remove();
+			if ( CFileIO(destfile).ExistsOld() ) CFileIO::Remove(destfile.ToString());
 			CLog::logf(CLog::Log_Install, 1, "Adjusting existing filename, %s => %s", pCheckFile->GetFilePointer().c_str(), destfile.c_str());
 			rename ( pCheckFile->GetFilePointer().c_str(), destfile.c_str() );
 			pCheckFile->SetFilename ( CyString(sDestination) + "/" + pCheckFile->GetNameDirectory(this) );
+		}
 		pCheckFile->SetDisabled(false);
+				{
 					//TODO: check what this is actually doing
 					if ( !cFile->GetUsed() )
+					{
 						CFileIO rFile(cFile->GetFilePointer());
-						if ( rFile.Exists() )
+						if ( rFile.exists() )
+						{
 							if ( errorStr )
+							{
-								if ( rFile.Remove() )
+								if ( rFile.remove() )
 									errorStr->PushBack(cFile->GetFilePointer().Remove(destdir), ERRORLOG(SPKINSTALL_DELETEFILE));
 								else
 									errorStr->PushBack(cFile->GetFilePointer().Remove(destdir), ERRORLOG(SPKINSTALL_DELETEFILE_FAIL));
+							}
+						}
 	Input:  filename - The filename of the spk file to write to
 	Desc:   Writes the data to an spk file
 */
 bool CBaseFile::WriteFile ( CyString filename, CProgressInfo *progress )
+{
-	FILE *id = fopen ( filename.c_str(), "wb" );
-	if ( !id )
-		return false;
+	CFileIO File(filename);
-	bool ret = WriteData ( id, progress );
+	if ( File.startWrite() ) return WriteData(File, progress);
-	fclose ( id );
-	return ret;
+	return false;
+}
-bool CBaseFile::WriteHeader(FILE *id, int valueheader, int valueComprLen)
+bool CBaseFile::WriteHeader(CFileIO &file, int valueheader, int valueComprLen)
+{
-	fprintf ( id, "BaseCycrow;%.2f;%d;%d\n", FILEVERSION, valueheader, valueComprLen );
+	return file.write("BaseCycrow;%.2f;%d;%d\n", FILEVERSION, valueheader, valueComprLen);
-	if ( ferror(id) )
-		return false;
-	return true;
+}
-bool CBaseFile::WriteData ( FILE *id, CProgressInfo *progress )
+bool CBaseFile::WriteData(CFileIO &file, CProgressInfo *progress )
+{
 	int valueheader = m_SHeader.iValueCompression, fileheader = m_SHeader.iValueCompression;
 	if ( valueheader == SPKCOMPRESS_7ZIP )
 		valueheader = SPKCOMPRESS_ZLIB;
 	if ( fileheader == SPKCOMPRESS_7ZIP )
 		memcpy ( valueCompr, values.c_str(), valueComprLen );
 		valueheader = SPKCOMPRESS_NONE;
+	}
 	// write the main header to the file
-	if ( !this->WriteHeader(id, valueheader, valueComprLen) )
+	if ( !this->WriteHeader(file, valueheader, valueComprLen) )	return false;
-		return false;
 	// write the compressed data to file
-	fputc ( (unsigned char)(valueUncomprLen >> 24), id );
+	file.put(static_cast<unsigned char>(valueUncomprLen >> 24));
-	fputc ( (unsigned char)(valueUncomprLen >> 16), id );
+	file.put(static_cast<unsigned char>(valueUncomprLen >> 16));
-	fputc ( (unsigned char)(valueUncomprLen >> 8), id );
+	file.put(static_cast<unsigned char>(valueUncomprLen >> 8));
-	fputc ( (unsigned char)valueUncomprLen, id );
+	file.put(static_cast<unsigned char>(valueUncomprLen));
-	fwrite ( valueCompr, sizeof(char), valueComprLen, id );
+	file.write(valueCompr, valueComprLen);
 	free ( valueCompr );
 	// now compress the files header
 	// create the files values
 	CyString files = CreateFilesLine ( true, progress );
 		fileheader = SPKCOMPRESS_NONE;
+	}
 	// now write the file header
 	m_SHeader2.lSize = fileComprLen;
-	fprintf ( id, "FileHeader;%d;%ld;%ld;%d;%d\n", m_SHeader2.iNumFiles, m_SHeader2.lSize, m_SHeader2.lFullSize, fileheader, m_SHeader2.iDataCompression );
+	file.write("FileHeader;%d;%ld;%ld;%d;%d\n", m_SHeader2.iNumFiles, m_SHeader2.lSize, m_SHeader2.lFullSize, fileheader, m_SHeader2.iDataCompression);
-	fputc ( (unsigned char)(fileUncomprLen >> 24), id );
-	fputc ( (unsigned char)(fileUncomprLen >> 16), id );
-	fputc ( (unsigned char)(fileUncomprLen >> 8), id );
-	fputc ( (unsigned char)fileUncomprLen, id );
-	fwrite ( fileCompr, sizeof(char), fileComprLen, id );
+	file.put(static_cast<unsigned char>(fileUncomprLen >> 24));
+	file.put(static_cast<unsigned char>(fileUncomprLen >> 16));
+	file.put(static_cast<unsigned char>(fileUncomprLen >> 8));
+	file.put(static_cast<unsigned char>(fileUncomprLen));
+	file.write(fileCompr, fileComprLen);
 	free ( fileCompr );
 	if ( progress )
+	{
 		progress->UpdateStatus(STATUS_WRITE);
 			max += m_pIconFile->GetDataSize();
 		progress->SetMax(max);
+	}
 	// now finally, write all the file data
-	if ( m_pIconFile )
+	if ( m_pIconFile ) {
-	{
-		if ( progress )
-			progress->UpdateFile(m_pIconFile);
+		if ( progress )	progress->UpdateFile(m_pIconFile);
-		fputc ( (unsigned char)(m_pIconFile->GetUncompressedDataSize() >> 24), id );
-		fputc ( (unsigned char)(m_pIconFile->GetUncompressedDataSize() >> 16), id );
-		fputc ( (unsigned char)(m_pIconFile->GetUncompressedDataSize() >> 8), id );
-		fputc ( (unsigned char)m_pIconFile->GetUncompressedDataSize(), id );
+		file.writeSize(m_pIconFile->GetUncompressedDataSize());
-		fwrite ( m_pIconFile->GetData(), sizeof(char), m_pIconFile->GetDataSize(), id );
+		file.write(m_pIconFile->GetData(), m_pIconFile->GetDataSize());
-		if ( progress )
-			progress->IncDone(m_pIconFile->GetDataSize());
+		if ( progress )	progress->IncDone(m_pIconFile->GetDataSize());
+	}
 	for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() )
+	{
-		C_File *file = node->Data();
+		C_File *f = node->Data();
-		if ( progress )
-			progress->UpdateFile(file);
+		if ( progress )	progress->UpdateFile(f);
-		fputc ( (unsigned char)(file->GetUncompressedDataSize() >> 24), id );
-		fputc ( (unsigned char)(file->GetUncompressedDataSize() >> 16), id );
-		fputc ( (unsigned char)(file->GetUncompressedDataSize() >> 8), id );
-		fputc ( (unsigned char)file->GetUncompressedDataSize(), id );
+		file.writeSize(f->GetUncompressedDataSize());
-		unsigned char *data = file->GetData();
+		unsigned char *data = f->GetData();
-		size_t remaining = file->GetDataSize();
+		size_t remaining = f->GetDataSize();
-		while ( remaining )
+		while ( remaining )	{
-		{
 			size_t writeSize = WRITECHUNK;
-			if ( writeSize > remaining )
+			if ( writeSize > remaining ) writeSize = remaining;
-				writeSize = remaining;
-			size_t written = fwrite ( data, sizeof(char), writeSize, id );
+			if ( file.write(data, writeSize) ) {
-			data += written;
+				data += writeSize;
-			remaining -= written;
+				remaining -= writeSize;
+			}
-			if ( progress )
-				progress->IncDone((int)written);
+			if ( progress ) progress->IncDone((int)writeSize);
+		}
+	}
 	_changed();
 	return true;
+}
 bool CBaseFile::ExtractFile ( C_File *file, CyString dir, bool includedir, CProgressInfo *progress )
+{
 	if ( ReadFileToMemory ( file ) )
+	{
 		// now finally, uncompress the file
 	// no file to read from
 	if ( this->filename().empty() )
 		return false;
 	// now open the file
-	FILE *id = fopen ( this->filename().c_str(), "rb" );
+	CFileIO File(this->filename());
-	if ( !id )
-		return false;
+	if ( !File.StartRead() ) return false;
-	fseek ( id, 0, SEEK_SET );
 	// read the header
-	GetEndOfLine ( id, NULL, false );
+	File.readEndOfLine();
 	// skip past values
-	fseek ( id, m_SHeader.lValueCompressSize, SEEK_CUR );
+	File.seek(m_SHeader.lValueCompressSize);
 	// read the next header
-	GetEndOfLine ( id, NULL, false );
+	File.readEndOfLine();
 	// skip past files
-	fseek ( id, 4, SEEK_CUR );
-	fseek ( id, m_SHeader2.lSize, SEEK_CUR );
+	File.seek(4 + m_SHeader2.lSize);
 	// now were in the file section
 	// skip past each one
-	if ( m_pIconFile )
-	{
-		fseek ( id, 4, SEEK_CUR );
-		fseek ( id, m_pIconFile->GetDataSize (), SEEK_CUR );
+	if ( m_pIconFile ) File.seek(4 + m_pIconFile->GetDataSize ());
-	}
 	CDirIO Dir(dir);
-	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 ( progress )
-			progress->UpdateFile ( fit );
+		if ( progress )	progress->UpdateFile ( fit );
-		if ( (!fit->GetDataSize ()) || (!fit->GetData()) )
+		if ( (!fit->GetDataSize ()) || (!fit->GetData()) ) {
-		{
-			if ( !fit->ReadFromFile ( id, fit->GetDataSize() ) )
+			if ( !fit->readFromFile(File, fit->GetDataSize()) ) return false;
-			{
-				fclose ( id );
-				return false;
-			}
+		}
 		else
-			fseek ( id, fit->GetDataSize(), SEEK_CUR );
+			File.seek(fit->GetDataSize());
 		if ( game ) {
 			if ( fit->GetGame() && fit->GetGame() != game )
 				continue;
+		}
 		// create directory first
 		Dir.Create(fit->GetDirectory(this));
 		long size = 0;
 		unsigned char *data = fit->UncompressData (&size, progress);
-		if ( (!data) && (fit->GetCompressionType() == SPKCOMPRESS_7ZIP) )
+		if ( (!data) && (fit->GetCompressionType() == SPKCOMPRESS_7ZIP) ) {
-		{
-			if ( !fit->UncompressToFile ( dir, this, includedir, progress ) )
+			if ( !fit->UncompressToFile ( dir, this, includedir, progress ) ) return false;
-			{
-				fclose ( id );
-				return false;
-			}
-		}
-		else if ( (!data) || (!fit->WriteToDir ( dir, this, includedir, NullString, data, size )) )
-		{
-			fclose ( id );
-			return false;
+		}
+		else if ( (!data) || (!fit->WriteToDir ( dir, this, includedir, NullString, data, size )) ) return false;
+	}
-	fclose ( id );
+	File.close();
 	return true;
+}
+}
 CyString CBaseFile::GetFullFileSizeString() { return SPK::GetSizeString ( this->GetFullFileSize() ); }
+// used for a multiple spk file
 unsigned char *CBaseFile::CreateData(size_t *size, CProgressInfo *progress)
+{
-	if ( this->WriteFile("temp.dat", progress) )
+	if ( this->WriteFile("temp.dat", progress) ) {
-	{
-		FILE *id = fopen("temp.dat", "rb");
+		CFileIO File("temp.dat");
-		if ( id )
-		{
-			fseek(id, 0, SEEK_END);
+		File.setAutoDelete(true);
-			*size = ftell(id);
+		return File.readAll(size);
-			fseek(id, 0, SEEK_SET);
-			unsigned char *data = new unsigned char[*size];
-			fread(data, sizeof(unsigned char), *size, id);
-			fclose(id);
-			remove("temp.dat");
-			return data;
-		}
+	}
-	remove("temp.dat");
 	return NULL;
+}
 void CBaseFile::ConvertNormalMod(C_File *f, CyString to)
 	if ( this->GeneratePackagerScript(false, &list, true) )
+	{
 		if ( CFileIO("test.tmp").WriteFile(&list) )
+		{
 			ZipAdd(hz, L"pluginmanager.txt", L"test.tmp");
-			CFileIO("test.tmp").Remove();
+			CFileIO::Remove("test.tmp");
+		}
+	}
 	CloseZip(hz);

Subversion Repositories spk

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