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

 	return true;
+}
-void CBaseFile::RemoveAllFiles ( int type, int game )
+void CBaseFile::removeAllFiles(FileType type, int game)
+{
 	if ( m_lFiles.empty() )
 		return;
 	for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() )
+	{
+		if (game == 0 && node->Data()->game() && node->Data()->game() != GAME_ALLNEW)
+			continue;
-		if ( game > -1 ) {
+		if ( game > -1 )
+		{
+			unsigned int fileGame = node->Data()->game() & ~GAME_ALLNEW;
-			if ( node->Data()-&gt;GetGame() != game )
+			if (fileGame != (1 &lt;< game))
+			{
+				// just remove the game from file
+				if (fileGame & (1 << game))
+					node->Data()->setGame(node->Data()->game() & ~(1 << game));
 				continue;
+			}
+		}
-		if ( type == -1 || node->Data()->GetFileType() == type )
+		if ( type == FILETYPE_UNKNOWN || node->Data()->GetFileType() == type )
 			node->DeleteData();
+	}
 	m_lFiles.RemoveEmpty();
 	_changed();
+}
 void CBaseFile::RecompressAllFiles ( int type, CProgressInfo *progress )
+{
 		if ( progress )
 			progress->UpdateFile(file);
 		if ( file->GetCompressionType() == type )
 			continue;
 		if ( !file->GetData() )
 			file->ReadFromFile();
 		file->ChangeCompression ( type, progress );
 	}
 }
 void CBaseFile::CompressAllFiles ( int type, CProgressInfo *progress, CProgressInfo *overallProgress, int level )
+{
 	if ( overallProgress ) overallProgress->SetMax(m_lFiles.size());
 		if ( !file->GetData() )
 			file->ReadFromFile();
 		file->CompressData ( type, progress, level );
 		if ( overallProgress ) overallProgress->SetDone(++iCount);
+	}
+}
 bool CBaseFile::UncompressAllFiles ( CProgressInfo *progress )
+{
 	int countFile = 0;
 	for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() )
 	{
 		C_File *fit = node->Data();
 		if ( progress )
+		{
 			progress->UpdateFile ( fit );
 			progress->UpdateProgress(countFile++, m_lFiles.size());
+		}
 		bool uncomprToFile = false;
 		if ( progress )
 			progress->SwitchSecond();
+					{
 						uncomprToFile = true;
 						fit->SetFullDir("temp");
+					}
+				}
 				if (!uncomprToFile)
 					return false;
+			}
+		}
 void CBaseFile::ClearNames ()
+{
 	m_lNames.clear(true);
+}
 void CBaseFile::RemoveLanguageName ( int lang )
 {
 	SNames *n;
 	for ( n = m_lNames.First(); n; n = m_lNames.Next() )
 	{
 		if ( n->iLanguage == lang )
+		{
 			m_lNames.RemoveCurrent();
 			delete n;
 			_changed();
+		}
 	// not found, add a new entry
 	n = new SNames;
 	n->iLanguage = lang;
 	n->sName = name;
 	m_lNames.push_back ( n );
 	_changed();
+}
 CyString CBaseFile::GetFullPackageName(CyString format, int lang)
+{
 	if ( progress )
+	{
 		progress->SetDone(0);
 		progress->UpdateStatus(STATUS_COMPRESS);
 	}
 	if ( updateheader )
+	{
 		m_SHeader2.iNumFiles = 0;
 		m_SHeader2.lFullSize = 0;
 				pFile->SetFullDir ( filename + "PluginManager/Disabled/" + pFile->GetDirectory(this) );
+		}
 		pFile->SetDisabled(true);
+	}
-	CLog::logf(CLog::Log_Install, 2, "Adjusting the file pointer to correct install destintation, %s", pFile->GetFilePointer().c_str());
+	CLog::logf(CLog::Log_Install, 2, "Adjusting the file pointer to correct install destintation, %s", pFile->filePointer().c_str());
 	return filename.ToString();
+}
 C_File *CBaseFile::_install_checkFile(C_File *pFile, CyStringList *errorStr, bool *bDoFile, CLinkList<C_File> *pFileList)
 			CyString tofile = pCheckFile->filePointer().token("::", 2);
 			CCatFile tocat;
 			int err = tocat.open(fit->filePointer().token("::", 1), "", CATREAD_CATDECRYPT, true);
 			if ( (err == CATERR_NONE) || (err == CATERR_CREATED) ) {
-				tocat.AppendFile(pCheckFile->GetFilePointer().ToString(), tofile.ToString());
+				tocat.AppendFile(pCheckFile->filePointer(), tofile.ToString());
 				CLog::logf(CLog::Log_Install, 2, "Adding existing file into new mod File, %s => %s", fit->filePointer().token("::", 1).c_str(), tofile.c_str());
+			}
 			CCatFile fromcat;
 			err = fromcat.open(pCheckFile->filePointer().token("::", 1), "", CATREAD_CATDECRYPT, 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().ToString()).c_str());
+		CLog::logf(CLog::Log_Install, 2, "Adjusting file extension for file in mod, %s => %s", pFile->filePointer().c_str(), CCatFile::PckChangeExtension(pFile->filePointer()).c_str());
-		pFile->SetFilename(CCatFile::PckChangeExtension(pFile->GetFilePointer().ToString()));
+		pFile->SetFilename(CCatFile::PckChangeExtension(pFile->filePointer()));
+	}
 	return true;
+}
 		sInstalledFile = pFile->GetFilePointer().Remove(sDestination);
 		if ( sInstalledFile[0] == '/' || sInstalledFile[0] == '\\' )
 			sInstalledFile.Erase(0, 1);
+	}
-	if ( !pFile->WriteFilePointer() )
+	if ( !pFile->writeFilePointer() )
+	{
 		CLog::log(CLog::Log_Install, 1, "Failed to write the file");
 		if ( errorStr )
 			errorStr->PushBack(sInstalledFile, ERRORLOG(SPKINSTALL_WRITEFILE_FAIL));
+	}
 		// start the install process, check if we need to the file enabled or disabled
 		CLog::logf(CLog::Log_Install, 1, "Preparing to install file: %s", fit->GetNameDirectory(this).c_str());
 		bool fileEnabled = _install_setEnabled(enabled, fit);
 		// check if the file is for the correct game version
-		if ( fit->GetGame() &&amp; packages->GetGame() ) {
+		if ( fit->game() && packages->GetGame() &amp;& fit->game() != GAME_ALLNEW) {
-			if ( fit->GetGame() != packages->GetGame() ) {
+			if(!(fit->game() & (1 << packages->GetGame())))
+			{
-				CLog::logf(CLog::Log_Install, 1, "File didn't match game version, skipping, %d != %d", fit->GetGame(), packages->GetGame());
+				CLog::logf(CLog::Log_Install, 1, "File didn't match game version, skipping, %d != %d", fit->game(), packages->GetGame());
 				continue;
+			}
 		}
 		// update the progress display to show we are processing this file
 		if ( progress ) {
 			if ( progress->IsSecond() ) progress->SwitchSecond();
 			progress->UpdateFile ( fit );
 			progress->UpdateProgress(fileCount++, m_lFiles.size());
 			progress->SwitchSecond();
 		}
 		// first uncompress the file
 		//TODO: add this flag to C_File
 		bool uncomprToFile;
 		if ( !this->_install_uncompress(fit, progress, errorStr, &uncomprToFile) ) {
 			bFailed = true;
+					}
 					else
+					{
 						fit->SetFullDir ( CyString(sInstallDir) + fit->GetDirectory(this) );
 						fit->SetDisabled(false);
 					}
 				}
 				// move it to enabled
 				else {
 					if ( !this->_install_checkFileEnable(cFile, fit, destdir.ToString(), fileEnabled, errorStr) ) {
 						bFailed = true;
 						continue;
 				m_iLastError = SPKERR_WRITEFILE;
 				CyString to = fit->GetDirectory(this);
 				if ( !fileEnabled )	to = CyString("PluginManager/Disabled/") + to;
 				if ( !_install_createDirectory(Dir, to.ToString(), fit, errorStr) ) {
 					bFailed = true;
 					continue;
 				}
 				int err = 1;
 				m_sLastError = to;
 				if ( !fit->GetTempFile ().Empty() )	err = rename ( fit->GetTempFile().c_str(), to.c_str() );
 				if ( err ) {
 					bFailed = true;
 					continue;
+				}
+			}
 			//otherwise, just extract the file
 			else
 			{
 				// old file is found in list, switch to using new one
 				if ( (filelist) && (adjustPointer) ) {
 					adjustPointer->CopyData(fit, false);
 					CLog::log(CLog::Log_Install, 2, "Copying data into existing file");
+				}
 	Desc:   Splits up the main header string to get all required settings
 */
 bool CBaseFile::ParseHeader ( CyString header )
+{
 	if ( !this->CheckHeader(header.GetToken ( 1, ';' ).ToString()) )
 		return false;
 	m_SHeader.fVersion = header.GetToken ( 2, ';' ).ToFloat();
 	if ( m_SHeader.fVersion > FILEVERSION )
 		return false;
 		m_sIconExt = line.token (":", 5);
 		m_pIconFile = new C_File ();
 		m_pIconFile->SetDataSize ( size - 4 );
 		m_pIconFile->SetDataCompression ( compression );
 		m_pIconFile->SetUncompressedDataSize ( usize );
 		return true;
+	}
 	time_t time = line.token(":", 5).toLong();
 	bool compressToFile = (line.token(":", 6).toInt() == 1) ? true : false;
 					return true;
+			}
 			return false;
+		}
-		if ( !file->WriteToDir ( dir, this, includedir, NullString, data, len ) )
+		if ( !file->writeToDir(dir.ToString(), this, includedir, Utils::String::Null(), data, len) )
 			return false;
 		return true;
+	}
 	// get the file pointer
 	C_File *file = m_lFiles.Get ( filenum );
 	return ExtractFile ( file, dir, includedir, progress );
+}
-bool CBaseFile::ExtractAll ( CyString dir, int game, bool includedir, CProgressInfo *progress )
+bool CBaseFile::extractAll(const Utils::String &dir, int game, const Utils::CStringList &gameAddons, bool includedir, CProgressInfo *progress)
+{
 	// no file to read from
-	if ( this->filename().empty() )
+	if (this->filename().empty())
 		return false;
 	// now open the file
 	CFileIO *File = _startRead();
-	if ( !File ) return false;
+	if (!File) return false;
 	// 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() ) {
+	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(*File, fit->GetDataSize()) ) return false;
+			if (!fit->readFromFile(*File, fit->GetDataSize())) return false;
+		}
 		else
 			File->seek(fit->GetDataSize());
+		if (game && !fit->isForGame(game))
+			continue;
-		if ( game ) {
+		CDirIO Dir(dir);
+		Utils::String addonDir;
+		if (fit->isFileInAddon())
+		{
+			int addonGame = fit->getForSingleGame();
-			if ( fit->GetGame() && fit->GetGame() != game )
+			if (!addonGame) addonGame = game;
-				continue;
+			if (addonGame >; 0)
+				addonDir = gameAddons.findString(Utils::String::Number(addonGame));
 		}
+		if (!addonDir.empty())
+			Dir.cd(addonDir);
 		// create directory first
-		Dir.Create(fit->GetDirectory(this));
+		Dir.create(fit->getDirectory(this));
 		long size = 0;
-		unsigned char *data = fit->UncompressData (&size, progress);
+		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 ) ) return false;
+			if (!fit->UncompressToFile(Dir.dir(), this, includedir, progress)) return false;
+		}
-		else if ( (!data) || (!fit->WriteToDir ( dir, this, includedir, NullString, data, size )) ) return false;
+		else if ((!data) || (!fit->writeToDir(Dir.dir(), this, includedir, Utils::String::Null(), data, size))) return false;
+	}
 	delete File;
 	return true;
+}
 bool CBaseFile::UpdateSigned (bool updateFiles)
+{

Subversion Repositories spk

(root)/libspk/src/BaseFile.cpp – Rev 128 → 129