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

 #include "emp.h"
 #include <time.h>
 #include <vector>
+#include "OriginalFiles.h"
 #ifdef _RAR
 #include <unrar.h>
 #endif
 enum {READ_START, READ_GLOBAL, READ_SCRIPT, READ_SCRIPTFILE, READ_WARES};
 	CLinkList<SComponantEntry2>	lEntries;
 } SComponantEntry;
 CyString CPackages::m_sTempDir;
-CPackages::CPackages() : m_pCurrentGameExe(NULL)
+CPackages::CPackages() : m_pCurrentGameExe(NULL),
+	_pOriginalFiles(NULL)
+{
 	m_bRenameText = false;
 	m_iLanguage = 0;
 	m_iGame = -1;
 	m_iGameVersion = -1;
 	m_lFiles.MemoryClear();
 	m_lUninstallFiles.MemoryClear();
 	for ( CListNode<CBaseFile> *pNode = m_lPackages.Front(); pNode; pNode = pNode->next() )
 		pNode->Data()->GetFileList()->clear();
 	m_lPackages.MemoryClear();
-	m_lOriginalFiles.MemoryClear();
+	SafeDelete(_pOriginalFiles);
 	m_iFakePatch = -1;
 	m_bVanilla = false;
 	m_pEnabledMod = NULL;
 	m_bLoaded = false;
 	m_iLanguage = 0;
 	m_iSaveGameManager = -1;
 	m_lNonRemovedFiles.Clear();
 	m_lGlobals.Clear();
 	m_lFakePatchOrder.Clear();
+	if ( _pOriginalFiles ) delete _pOriginalFiles;
+	_pOriginalFiles = new COriginalFiles(m_sCurrentDir.ToString());
 	m_bVanilla = true;
 	// check the pluginmanager data file exists
 	CFileIO datFile(m_sCurrentDir + "/PluginManager/pluginmanager.dat");
 	if ( datFile.exists() )
 				else if ( cmd == "spkinstaller" )
+				{
 					fVersion = rest.toFloat();
 					spkinstaller = true;
+				}
-				else if ( cmd == "BetaVersion" )
+				else if ( cmd == "betaversion" )
 					fBeta = rest.toFloat();
-				else if ( cmd == "Uninstall" )
+				else if ( cmd == "uninstall" )
+				{
 					C_File *uf = new C_File();
 					uf->SetFileType(FILETYPE_SCRIPT);
 					uf->SetCreationTime(rest.token(" ", 1).toLong());
 					uf->SetFilename(m_sCurrentDir + "/Scripts/" + rest.tokens(" ", 2));
 					m_lUninstallFiles.push_back(uf);
+				}
-				else if ( cmd == "NonRemovedFile" )
+				else if ( cmd == "nonremovedfile" )
+				{
 					if ( !CFileIO::Remove(rest) )
 						m_lNonRemovedFiles.PushBack(CyString(rest));
+				}
-				else if ( cmd == "Original" )
+				else if ( cmd == "original" )
-				{
-					C_File *uf = new C_File();
-					uf->SetFileType(rest.token(" ", 1).toLong());
-					if ( uf->GetFileType() == FILETYPE_EXTRA )
-					{
-						uf->SetDir(rest.tokens(" ", 2).tokens(":", 2));
-						uf->SetFilename(rest.tokens(" ", 2).token(":", 1));
-					}
-					else
-						uf->SetFilename(rest.tokens(" ", 2));
-					uf->SetFilename(m_sCurrentDir + "/" + uf->GetNameDirectory(NULL));
-					m_lOriginalFiles.push_back(uf);
+					_pOriginalFiles->parse(rest);
-				}
 				else if ( cmd.Compare("GlobalSetting") )
 					m_lGlobals.PushBack(CyString(rest.token(":", 1)), CyString(rest.tokens(":", 2)));
 				else if ( cmd.Compare("FakePatchOrder") )
 					m_lFakePatchOrder.PushBack(CyString(rest.token(":", 1)), CyString(rest.tokens(":", 2)));
 				else if ( cmd.Compare("EMPPriceOverride") )
 bool CPackages::UpdatePackages(int doStatus, bool individual)
+{
 	// if theres no original files, then set the current structure as the base
 	if ( doStatus == 0 || doStatus == -1 )
+	{
-		if ( m_lOriginalFiles.empty() || m_bRedo )
-		{
-			StoreOriginalFiles(FILETYPE_SCRIPT, "scripts");
+		_pOriginalFiles->update(m_bRedo, &m_lFiles);
-			StoreOriginalFiles(FILETYPE_TEXT, "t");
-			StoreOriginalFiles(FILETYPE_SOUND, "soundtrack");
-			StoreOriginalFiles(FILETYPE_EXTRA, "mov");
-		}
+	}
 	// update each package
 	// parent/child, signed status
 	if ( doStatus == -1 || doStatus == 1 )
 		// find any uninstall files and remove them
 		CLog::log(CLog::Log_Install, 3, "Purging uninstall scripts");
 		this->PurgeUninstallScripts(package, errors);
 		// backup any original files before installing
-		CLog::log(CLog::Log_Install, 3, "Checking for any original files to backup");
-		CDirIO oDir(m_sCurrentDir + "/PluginManager/Original");
-		for ( CListNode<C_File> *oNode = m_lOriginalFiles.Front(); oNode; oNode = oNode->next() )
-		{
-			C_File *of = oNode->Data();
-			for ( CListNode<C_File> *checkNode = package->GetFileList()->Front(); checkNode; checkNode = checkNode->next() )
-			{
-				C_File *f = checkNode->Data();
-				// match the same filetype
-				if ( of->GetFileType() != f->GetFileType() )
-					continue;
-				// same file
-				if ( of->GetFilename().Compare(f->GetFilename()) )
-				{
-					// check if original file already exists (assume already backed up)
-					if ( !BackupOriginalFile(of, errors) )
+		_pOriginalFiles->backup(package, errors);
-						continue;
-					break;
-				}
-			}
-		}
+	}
 	// install all the files
 	CLog::log(CLog::Log_Install, 3, "Checking for any existing files");
 	if ( oldPackage )
 		if ( f->GetFileType() == FILETYPE_EXTRA && f->GetDir().Left(6).lower() == "extras" )
 			removeDirs.PushBack("Extras", true);
 		if ( RemoveFile(f, errors) )
+		{
-			// check if its an original file and restore
-			if ( IsOriginalFile(f) )
+			original = _pOriginalFiles->restoreFile(f, errors);
-			{
-				CFileIO of(m_sCurrentDir + "/PluginManager/Original/" + f->GetNameDirectory(NULL));
-				if ( of.exists() )
-				{
-					original = true;
-					if ( of.Rename(m_sCurrentDir + "/" + f->GetNameDirectory(NULL)) )
-						this->AddLogEntry(SPKINSTALL_ORIGINAL_RESTORE, f->GetNameDirectory(NULL), errors);
-					else
-						this->AddLogEntry(SPKINSTALL_ORIGINAL_RESTORE_FAIL, f->GetNameDirectory(NULL), errors);
-				}
-			}
+		}
 		else // problem removeing (try when the program closes)
 			m_lNonRemovedFiles.PushBack(f->GetFilePointer());
 		// check for fake patchs
 			lines.PushBack(uString);
+		}
+	}
 	// write the original file data
-	if ( !m_lOriginalFiles.empty() )
+	_pOriginalFiles->writeData(&lines);
-	{
-		for ( CListNode<C_File> *node = m_lOriginalFiles.Front(); node; node = node->next() )
-		{
-			C_File *uf = node->Data();
-			CyString uString = "Original: ";
-			uString += CyString::Number((long)uf->GetFileType()) + " ";
-			uString += uf->GetFilename();
-			if ( uf->GetFileType() == FILETYPE_EXTRA && !uf->GetDir().Empty())
-			{
-				uString += ":";
-				uString += uf->GetDir();
-			}
-			lines.PushBack(uString);
-		}
-	}
 	// write the global changes
 	if ( !m_lGlobals.Empty() )
+	{
 		for ( SStringList *str = m_lGlobals.Head(); str; str = str->next )
 				this->AddLogEntry(SPKINSTALL_CREATEDIRECTORY, f->GetDirectory(package), errors);
+			}
+		}
 		// check if theres an original file to backup
-		C_File *of = GetOriginalFile(f);
-		if ( of )
-		{
-			// check if the orignal file is already backed up
-			if ( !CFileIO(m_sCurrentDir + "/PluginManager/Original/" + f->GetNameDirectory(package)).ExistsOld() )
-			{
-				// lets back up the file now
-				BackupOriginalFile(of, errors);
+		_pOriginalFiles->doBackup(f, errors);
-			}
-		}
 		CyString newFilename = f->GetNameDirectory(package);
 		// fake patches need to be renamed
 		if ( f->IsFakePatch() )
+		}
 		// must have been fine
 		this->AddLogEntry(SPKINSTALL_DISABLEFILE, f->GetNameDirectory(checkPackage), errors);
-		// check if its an original file and restore
-		if ( IsOriginalFile(f) )
+		original = _pOriginalFiles->restoreFile(f, errors);
-		{
-			CFileIO of(m_sCurrentDir + "/PluginManager/Original/" + f->GetNameDirectory(checkPackage));
-			if ( of.exists() )
-			{
-				original = true;
-				if ( of.Rename(m_sCurrentDir + "/" + f->GetNameDirectory(checkPackage)) )
-					this->AddLogEntry(SPKINSTALL_ORIGINAL_RESTORE, f->GetNameDirectory(checkPackage), errors);
-				else
-					this->AddLogEntry(SPKINSTALL_ORIGINAL_RESTORE_FAIL, f->GetNameDirectory(checkPackage), errors);
-			}
-		}
 		// extra file thats not in the extras directory
 		if ( f->GetFileType() == FILETYPE_EXTRA || f->GetFileType() == FILETYPE_MAP || f->GetFileType() == FILETYPE_SOUND )
 			removeDirs.PushBack(f->GetDirectory(checkPackage), NullString, true);
 	return false;
+}
-/**
- * Update original files list
- *
- * Scan the current directory for any fiels that are already there, ie ones that have not been installed
- * Original files should be all the scripts/sounds, etc that are in an unmodified game directory
- *
- * Save list of files and check if any packages overright these files
- * Any file that gets overrighten from this list will automatically be backed up, and restored once the packages are removed
- */
-void CPackages::StoreOriginalFiles(int filetype, CyString searchPath)
-{
-	CyString ext = "pck";
-	switch ( filetype )
-	{
-		case FILETYPE_SOUND:
-			ext = "mp3";
-			break;
-	}
-	CDirIO Dir(m_sCurrentDir + "/" + searchPath);
-	CyStringList *files = Dir.DirList();
-	if ( !files )
-		return;
-	for ( SStringList *node = files->Head(); node; node = node->next )
-	{
-		CFileIO File(Dir.File(node->str));
-		if ( File.GetFileExtension().Compare(ext) )
-			AddOriginalFile(filetype, File.GetFilename(), searchPath);
-	}
-	delete files;
-}
-/**
- * Adds a file onto the original files list
- *
- * Checks if it already exists so we dont create multiples
- */
-void CPackages::AddOriginalFile(int filetype, CyString filename, CyString searchPath)
-{
-	// dont add plugin manager as original files
-	if ( filetype == FILETYPE_SCRIPT && filename.IsIn("!init.pmanager") )
-		return;
-	// first check if a matching one exists
-	for ( CListNode<C_File> *node = m_lOriginalFiles.Front(); node; node = node->next() )
-	{
-		C_File *file = node->Data();
-		if ( file->GetFileType() != filetype )
-			continue;
-		if ( file->GetFilename().Compare(filename) )
-			return;
-	}
-	// check that no packages are currently using them either, not original if being used already
-	for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() )
-	{
-		C_File *file = node->Data();
-		if ( file->GetFileType() != filetype )
-			continue;
-		if ( file->GetFilename().Compare(filename) )
-			return;
-	}
-	C_File *of = new C_File(filename);
-	of->SetFileType(filetype);
-	if ( filetype == FILETYPE_EXTRA )
-		of->SetDir(searchPath);
-	of->SetFilename(m_sCurrentDir + "/" + of->GetNameDirectory(NULL));
-	m_lOriginalFiles.push_back(of);
-}
-/**
- * Check for original file
- *
- * Checks if the file is an original file or not
- */
-bool CPackages::IsOriginalFile(C_File *file)
-{
-	if ( GetOriginalFile(file) )
-		return true;
-	return false;
-}
-/**
- * Get original file
- *
- * Finds a matching original file entry and returns it
- */
-C_File *CPackages::GetOriginalFile(C_File *file)
-{
-	if ( !file )
-		return NULL;
-	for ( CListNode<C_File> *node = m_lOriginalFiles.Front(); node; node = node->next() )
-	{
-		C_File *of = node->Data();
-		// not of the same file type
-		if ( of->GetFileType() != file->GetFileType() )
-			continue;
-		// same file name, must be the same file
-		if ( of->GetFilename().Compare(file->GetFilename()) )
-			return of;
-	}
-	return NULL;
-}
-/**
- * Backs up an original file
- *
- * Moves the file into the PluginManager/Original directory so packages dont replace them
- * Allows these files to be restored when the package is remove to prevent breaking the game
- */
-bool CPackages::BackupOriginalFile(C_File *f, CyStringList *errors)
-{
-	CyString newDir = CyString("PluginManager/Original/") + f->GetDirectory(NULL);
-	CDirIO oDir(m_sCurrentDir);
-	if ( oDir.Exists(newDir + "/" + f->GetFilename()) )
-		return true;
-	// make sure the directory exissts
-	if ( !oDir.Exists(newDir) )
-	{
-		if ( !oDir.Create(newDir) )
-		{
-			CLog::logf(CLog::Log_Install, 2, "Unable to create directory to backup original files, %s", newDir.c_str());
-			this->AddLogEntry(SPKINSTALL_CREATEDIRECTORY_FAIL, newDir, errors);
-			return false;
-		}
-		CLog::logf(CLog::Log_Install, 2, "Created new directory, %s", newDir.c_str());
-		this->AddLogEntry(SPKINSTALL_CREATEDIRECTORY, newDir, errors);
-	}
-	// now lets copy the file
-	CFileIO CopyFile(f->GetFilePointer());
-	if ( CopyFile.copy(oDir.File(newDir + "/" + f->GetFilename()).ToString()) )
-	{
-		CLog::logf(CLog::Log_Install, 2, "Original file: %s has been backed up", f->GetNameDirectory(NULL).c_str());
-		this->AddLogEntry(SPKINSTALL_ORIGINAL_BACKUP, f->GetNameDirectory(NULL), errors);
-		return true;
-	}
-	else
-	{
-		CLog::logf(CLog::Log_Install, 2, "Failed to backup the original file: %s", f->GetNameDirectory(NULL).c_str());
-		this->AddLogEntry(SPKINSTALL_ORIGINAL_BACKUP_FAIL, f->GetNameDirectory(NULL), errors);
-		return false;
-	}
-}
 void CPackages::ShuffleTextFiles(CyStringList *errors)
+{
 	for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() )
+	{
 		C_File *f = node->Data();
 int CPackages::RemoveAllPackages(CyStringList *errors, CProgressInfo *progress)
+{
 	int files = 0;
 	// remove all files
-	int max = m_lFiles.size() + m_lOriginalFiles.size() + m_lUninstallFiles.size();
+	int max = m_lFiles.size() + _pOriginalFiles->count() + m_lUninstallFiles.size();
 	for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() )
+	{
 		// update the progress
 		if ( progress )
 			progress->UpdateProgress(files, max);
 		delete node->Data();
+	}
 	m_lFiles.clear();
 	// restore any original files that are backed up
-	for ( CListNode<C_File> *oNode = m_lOriginalFiles.Front(); oNode; oNode = oNode->next() )
-	{
-		// update the progress
+	//TODO: find a better way to do the progress
-		if ( progress )
-			progress->UpdateProgress(files, max);
+	files = _pOriginalFiles->restoreAll(progress, files, max);
-		++files;
-		C_File *f = oNode->Data();
-		CFileIO of(m_sCurrentDir + "/PluginManager/Original/" + f->GetNameDirectory(NULL));
-		if ( of.exists() )
-			of.Rename(m_sCurrentDir + "/" + f->GetNameDirectory(NULL));
-		//RemoveFile(oNode->Data());
-		delete oNode->Data();
-	}
-	m_lOriginalFiles.clear();
 	// remove any uninstall files that remain
 	for ( CListNode<C_File> *uNode = m_lUninstallFiles.Front(); uNode; uNode = uNode->next() )
+	{
 		// update the progress

Subversion Repositories spk

(root)//libspk/src/Packages.cpp – Rev 91 → 93