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

 	m_bAutoGenerateUpdateFile = false;
 	m_SHeader.iValueCompression = SPKCOMPRESS_ZLIB;
 	m_SHeader2.iFileCompression = SPKCOMPRESS_ZLIB;
 	m_SHeader2.iDataCompression = SPKCOMPRESS_LZMA;
 	m_pParent = NULL;
-	m_bChanged = false;
+	_changed();
 	m_bUpdate = false;
 	ClearError();
 	m_iLoadError = 0;
+	{
 		SNames *n = node->Data();
 		if ( n->iLanguage == lang )
 			return n->sName;
+	}
-	return m_sName;
+	return this->name();
+}
 /*
 ##########################################################################################
+	}
+}
 CyString CBaseFile::GetNameValidFile ()
+{
-	CyString name = m_sName;
+	CyString name = this->name();
 	name.RemoveChar ( ':' );
 	name.RemoveChar ( '/' );
 	name.RemoveChar ( '\\' );
 	name.RemoveChar ( '*' );
 	name.RemoveChar ( '?' );
 		m_lFiles.remove(node, true);
 		break;
+	}
 	file->UpdateSigned();
-	m_bChanged = true;
+	_changed();
 	m_lFiles.push_back ( file );
+}
 C_File *CBaseFile::AddFile ( CyString file, CyString dir, int type, int game )
+{
 		// must already exist, delete this one
 		m_lFiles.remove(node, true);
 		break;
+	}
-	m_bChanged = true;
+	_changed();
 	newfile->UpdateSigned();
 	m_lFiles.push_back ( newfile );
 	return newfile;
+}
 	m_lFiles.erase ( pos + 1 );
 	if ( file )
 		delete file;
-	m_bChanged = true;
+	_changed();
 	return true;
+}
 			node->DeleteData();
+	}
 	m_lFiles.RemoveEmpty();
-	m_bChanged = true;
+	_changed();
+}
 void CBaseFile::RecompressAllFiles ( int type, CProgressInfo *progress )
+{
 	for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() )
+	{
 		if ( n->iLanguage == lang )
+		{
 			m_lNames.RemoveCurrent();
 			delete n;
-			m_bChanged = true;
+			_changed();
+		}
+	}
+}
 void CBaseFile::AddLanguageName ( int lang, const Utils::String &name )
 	n = new SNames;
 	n->iLanguage = lang;
 	n->sName = name;
 	m_lNames.push_back ( n );
-	m_bChanged = true;
+	_changed();
+}
 CyString CBaseFile::GetFullPackageName(CyString format, int lang)
+{
 	if ( format.Empty() )
 		return GetFullPackageName(lang);
-	CyString args[3] = { this->GetLanguageName(lang), this->GetVersion(), this->GetAuthor() };
+	CyString args[3] = { this->GetLanguageName(lang), this->version(), this->author() };
 	return format.Args(args, 3);
+}
 /*
 	Func:   CreateFilesLine
 */
 void CBaseFile::ReadAllFilesToMemory ()
+{
 	// no file to read from
-	if ( m_sFilename.Empty() )
+	if ( this->filename().empty() ) return;
-		return;
 	// now open the file
-	FILE *id = fopen ( m_sFilename.c_str(), "rb" );
+	FILE *id = fopen ( this->filename().c_str(), "rb" );
 	if ( !id )
 		return;
 	// read the header
 	GetEndOfLine ( id, NULL, false );
 bool CBaseFile::ReadFileToMemory(C_File *f)
+{
 	if ( f->GetData() && f->GetDataSize() )
 		return true;
 	// no file to read from
-	if ( m_sFilename.Empty() || !f )
+	if ( this->filename().empty() || !f )
 		return false;
 	// check the file is part of the package
 	if ( !m_lFiles.FindData(f) )
 		return false;
 	// now open the file
-	FILE *id = fopen ( m_sFilename.c_str(), "rb" );
+	FILE *id = fopen ( this->filename().c_str(), "rb" );
 	if ( !id )
 		return false;
 	// read the header
 	GetEndOfLine ( id, NULL, false );
+}
 void CBaseFile::ReadIconFileToMemory ()
+{
 	// no file to read from
-	if ( m_sFilename.Empty() )
+	if ( this->filename().empty() )
 		return;
 	if ( !m_pIconFile )
 		return;
 	// now open the file
-	FILE *id = fopen ( m_sFilename.c_str(), "rb" );
+	FILE *id = fopen ( this->filename().c_str(), "rb" );
 	if ( !id )
 		return;
 	// read the header
 	GetEndOfLine ( id, NULL, false );
 			lPatches.PushBack(fit->GetBaseName(), newname);
+		}
 		// rename the file
 		fit->FixOriginalName();
+		CLog::logf(CLog::Log_Install, 2, "Adjusting fake patch number, %s => %s", fit->GetNameDirectory(this).c_str(), (newname + "." + fit->GetFileExt()).c_str());
 		fit->SetName ( newname + "." + fit->GetFileExt() );
 		// find the next gap
 		if ( !opposite ) {
 			startfake = pPackages->FindNextFakePatch(startfake + 1);
 		if ( !fit->IsAutoTextFile() )
 			continue;
 		CyString newname = SPK::FormatTextName(starttext, pPackages->GetLanguage(), (pPackages->GetCurrentGameFlags() & EXEFLAG_TCTEXT));
 		fit->FixOriginalName();
+		CLog::logf(CLog::Log_Install, 2, "Adjusting text file, %s => %s", fit->GetNameDirectory(this).c_str(), (newname + "." + fit->GetFileExt()).c_str());
 		fit->SetName ( newname + "." + fit->GetFileExt() );
 		++starttext;
+	}
+}
+bool CBaseFile::_install_setEnabled(bool bEnable, C_File *fit)
+{
+	if ( !bEnable )
+	{
+		if ( (fit->GetFileType() == FILETYPE_UNINSTALL) || (fit->GetFileType() == FILETYPE_README) || (fit->GetFileType() == FILETYPE_ADVERT) )
+			bEnable = true;
+		else if ( (fit->GetFileType() == FILETYPE_EXTRA) && (fit->GetDir().Left(7).ToLower() == "Extras/") )
+			bEnable = true;
+		else if ( (IsPatch()) && (fit->GetFileType() == FILETYPE_MOD) && (!fit->IsFakePatch()) )
+			bEnable = true;
+		if ( bEnable ) CLog::logf(CLog::Log_Install, 3, "Filetype(%d) is always enabled, setting enabled flag", fit->GetFileType());
+	}
+	return bEnable;
+}
+bool CBaseFile::_install_uncompress(C_File *fit, CProgressInfo *progress, CyStringList *errorStr, bool *uncomprToFile)
+{
+	*uncomprToFile = false;
+	m_sLastError = fit->GetNameDirectory(this);
+	m_iLastError = SPKERR_UNCOMPRESS;
+	if ( !fit->UncompressData ( progress ) )
+	{
+		CLog::log(CLog::Log_Install, 2, "Failed to uncompress data, attempting file decompression");
+		if ( fit->GetCompressionType() == SPKCOMPRESS_7ZIP )
+		{
+			if ( fit->UncompressToFile ( NullString, this, false, progress ) )
+				*uncomprToFile = true;
+		}
+		if ( !uncomprToFile )
+		{
+			if ( errorStr )
+				errorStr->PushBack(m_sLastError, ERRORLOG(SPKINSTALL_UNCOMPRESS_FAIL));
+			CLog::log(CLog::Log_Install, 1, "Unable to decompress file, skipping");
+			return false;
+		}
+	}
+	ClearError ();
+	return true;
+}
+bool CBaseFile::_install_checkVersion(C_File *pFile, const Utils::String &sDestination)
+{
+	// new check if we should install the file
+	// first get the version
+	if ( !m_bOverrideFiles && pFile->ReadScriptVersion() )
+	{
+		CLog::log(CLog::Log_Install, 2, "Checking for existing file version");
+		C_File checkfile;
+		CyString checkfilename = sDestination;
+		if ( !checkfilename.Empty() ) checkfilename += "/";
+		checkfilename += pFile->GetNameDirectory(this);
+		checkfile.SetFilename ( checkfilename );
+		checkfile.SetFileType ( pFile->GetFileType() );
+		if ( checkfile.CheckValidFilePointer() ) {
+			if ( checkfile.ReadScriptVersion() > pFile->GetVersion() ) {
+				CLog::log(CLog::Log_Install, 1, "Newer version of the file found in directory, skipping");
+				return false;
+			}
+		}
+	}
+	return true;
+}
+Utils::String CBaseFile::_install_adjustFilepointer(C_File *pFile, bool bEnabled, const Utils::String &sDestination)
+{
+	CyString filename = sDestination;
+	if ( !filename.Empty() ) filename += "/";
+	if ( (IsPatch()) && (pFile->GetFileType() == FILETYPE_MOD) )
+		pFile->SetDir ( CyString("Patch") );
+	if ( pFile->IsInMod() )
+	{
+		if ( bEnabled )
+			pFile->SetFilename(filename + pFile->GetInMod() + "::" + pFile->GetNameDirectory(this));
+		else
+			pFile->SetFilename(filename + "PluginManager/DisabledFiles.cat::" + pFile->GetNameDirectory(this));
+	}
+	else
+		pFile->SetFilename ( filename + pFile->GetNameDirectory(this) );
+	if ( !bEnabled )
+	{
+		if ( !pFile->IsInMod() )
+		{
+			if ( pFile->IsFakePatch() )
+				pFile->SetFilename ( filename + "PluginManager/Disabled/FakePatches/FakePatch_" + this->GetNameValidFile() + "_" + this->author() + "_" + pFile->GetName() );
+			else if ( pFile->IsAutoTextFile() )
+				pFile->SetFilename ( filename + "PluginManager/Disabled/TextFiles/Text_" + this->GetNameValidFile() + "_" + this->author() + "_" + pFile->GetName() );
+			else
+				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());
+	return filename.ToString();
+}
+C_File *CBaseFile::_install_checkFile(C_File *pFile, CyStringList *errorStr, bool *bDoFile, CLinkList<C_File> *pFileList)
+{
+	if ( !pFile->IsFakePatch() && pFile->GetFileType() != FILETYPE_README )
+	{
+		C_File *cFile;
+		for ( cFile = pFileList->First(); cFile; cFile = pFileList->Next() )
+		{
+			if ( !cFile->MatchFile(pFile) ) continue;
+			if ( !m_bOverrideFiles && !cFile->CompareNew(pFile) ) {
+				if ( errorStr ) errorStr->PushBack(pFile->GetNameDirectory(this), ERRORLOG(SPKINSTALL_SKIPFILE));
+				CLog::log(CLog::Log_Install, 1, "Newer version of the file already installed, skipping");
+				*bDoFile = false;
+			}
+			break;
+		}
+		return cFile;
+	}
+	return NULL;
+}
+bool CBaseFile::_install_checkFileEnable(C_File *pCheckFile, C_File *fit, const Utils::String &sDestination, bool bEnabled, CyStringList *errorStr)
+{
+	// found a file, check if its in the disabled directory
+	CyString dir = pCheckFile->GetFilePointer();
+	dir = dir.GetToken ( 1, dir.NumToken ('/') - 1, '/' );
+	CyString lastDir = dir.GetToken ( dir.NumToken('/'), '/' ).ToLower();
+	// if its disabled, rename it so its enabled
+	if ( ((pCheckFile->IsDisabled()) || (lastDir == "disabled") || (dir.ToLower().IsIn ("/disabled/"))) && (bEnabled) )
+	{
+		CLog::logf(CLog::Log_Install, 2, "Existing file, %s, is disabled, re-enabling it", pCheckFile->GetFilePointer().c_str());
+		// first check if the directory exists
+		if ( pCheckFile->IsInMod() ) {
+			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 );
+				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 ( err == CATERR_NONE ) {
+				fromcat.RemoveFile(tofile);
+				CLog::logf(CLog::Log_Install, 2, "Removing file from existing mod, %s::%s", pCheckFile->GetFilePointer().GetToken("::", 1, 1).c_str(), tofile.c_str());
+			}
+			CLog::logf(CLog::Log_Install, 1, "Adjusting existing file name %s => %s", pCheckFile->GetFilePointer().c_str(), fit->GetFilePointer().c_str());
+			pCheckFile->SetFilename ( fit->GetFilePointer() );
+			CLog::logf(CLog::Log_Install, 2, "Adjusting In Mod setting, %s => %s", pCheckFile->GetInMod().c_str(), fit->GetInMod().c_str());
+			pCheckFile->SetInMod(fit->GetInMod());
+		}
+		else {
+			CyString to = pCheckFile->GetDirectory(this);
+			CDirIO Dir(sDestination);
+			if ( !Dir.Exists(to) ) {
+				if ( !Dir.Create ( to ) ) {
+					if ( errorStr )	errorStr->PushBack(to, ERRORLOG(SPKINSTALL_CREATEDIRECTORY_FAIL));
+					return false;
+				}
+				if ( errorStr )	errorStr->PushBack(to, ERRORLOG(SPKINSTALL_CREATEDIRECTORY));
+			}
+			CyString destfile = CyString(sDestination) + "/" + pCheckFile->GetNameDirectory(this);
+			if ( CFileIO(destfile).Exists() ) CFileIO(destfile).Remove();
+			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);
+		if ( errorStr ) errorStr->PushBack(pCheckFile->GetNameDirectory(this), ERRORLOG(SPKINSTALL_ENABLEFILE));
+	}
+	return true;
+}
 bool CBaseFile::InstallFiles ( CyString destdir, CProgressInfo *progress, CLinkList<C_File> *filelist, CyStringList *errorStr, bool enabled, CPackages *packages )
+{
+	//TODO: add errorStr and progress as member variables
 	if ( enabled ) {
 		this->_install_adjustFakePatches(packages);
 		if ( packages ) this->_install_renameText(packages);
+	}
+	bool bFailed = false;
 	CDirIO Dir(destdir);
 	int fileCount = 0;
 	for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() )
+	{
 		C_File *fit = node->Data();
-		bool fileEnabled = enabled;
-		if ( !fileEnabled )
-		{
-			if ( (fit->GetFileType() == FILETYPE_UNINSTALL) || (fit->GetFileType() == FILETYPE_README) || (fit->GetFileType() == FILETYPE_ADVERT) )
-				fileEnabled = true;
-			else if ( (fit->GetFileType() == FILETYPE_EXTRA) && (fit->GetDir().Left(7).ToLower() == "Extras/") )
-				fileEnabled = true;
-			else if ( (IsPatch()) && (fit->GetFileType() == FILETYPE_MOD) && (!fit->IsFakePatch()) )
-				fileEnabled = true;
-		}
+		// 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() && packages->GetGame() ) {
-			if ( fit->GetGame() != packages->GetGame() )
+			if ( fit->GetGame() != packages->GetGame() ) {
+				CLog::logf(CLog::Log_Install, 1, "File didn't match game version, skipping, %d != %d", fit->GetGame(), packages->GetGame());
 				continue;
+			}
+		}
+		// update the progress display to show we are processing this file
-		if ( progress )
+		if ( progress ) {
-		{
-			if ( progress->IsSecond() )
+			if ( progress->IsSecond() ) progress->SwitchSecond();
-				progress->SwitchSecond();
 			progress->UpdateFile ( fit );
 			progress->UpdateProgress(fileCount++, m_lFiles.size());
 			progress->SwitchSecond();
+		}
 		// first uncompress the file
-		bool uncomprToFile = false;
+		//TODO: add this flag to C_File
-		m_sLastError = fit->GetNameDirectory(this);
-		m_iLastError = SPKERR_UNCOMPRESS;
-		if ( !fit->UncompressData ( progress ) )
-		{
-			if ( fit->GetCompressionType() == SPKCOMPRESS_7ZIP )
-			{
-				if ( fit->UncompressToFile ( NullString, this, false, progress ) )
-					uncomprToFile = true;
-			}
-			if ( !uncomprToFile )
+		bool uncomprToFile;
-			{
-				if ( errorStr )
-					errorStr->PushBack(m_sLastError, ERRORLOG(SPKINSTALL_UNCOMPRESS_FAIL));
+		if ( !this->_install_uncompress(fit, progress, errorStr, &uncomprToFile) ) {
-				return false;
+			bFailed = true;
-			}
+			continue;
+		}
-		ClearError ();
-		bool dofile = true;
-		// new check if we should install the file
-		// first get the version
-		if ( !m_bOverrideFiles && fit->ReadScriptVersion() )
-		{
-			C_File checkfile;
-			CyString checkfilename = destdir;
-			if ( !checkfilename.Empty() )
-				checkfilename += "/";
-			checkfilename += fit->GetNameDirectory(this);
-			checkfile.SetFilename ( checkfilename );
-			checkfile.SetFileType ( fit->GetFileType() );
-			if ( checkfile.CheckValidFilePointer() )
-			{
-				if ( checkfile.ReadScriptVersion() > fit->GetVersion() )
+		bool dofile = _install_checkVersion(fit, destdir.ToString());
-					dofile = false;
-			}
-		}
 		// change file pointer
-		CyString filename = destdir;
-		if ( !filename.Empty() )
-			filename += "/";
-		if ( (IsPatch()) && (fit->GetFileType() == FILETYPE_MOD) )
-			fit->SetDir ( CyString("Patch") );
-		if ( fit->IsInMod() )
-		{
-			if ( fileEnabled )
-				fit->SetFilename(filename + fit->GetInMod() + "::" + fit->GetNameDirectory(this));
+		Utils::String sFilename = _install_adjustFilepointer(fit, fileEnabled, destdir.ToString());
-			else
-				fit->SetFilename(filename + "PluginManager/DisabledFiles.cat::" + fit->GetNameDirectory(this));
-		}
-		else
-			fit->SetFilename ( filename + fit->GetNameDirectory(this) );
-		if ( !fileEnabled )
-		{
-			if ( !fit->IsInMod() )
-			{
-				if ( fit->IsFakePatch() )
-					fit->SetFilename ( filename + "PluginManager/Disabled/FakePatches/FakePatch_" + this->GetNameValidFile() + "_" + m_sAuthor + "_" + fit->GetName() );
-				else if ( fit->IsAutoTextFile() )
-					fit->SetFilename ( filename + "PluginManager/Disabled/TextFiles/Text_" + this->GetNameValidFile() + "_" + m_sAuthor + "_" + fit->GetName() );
-				else
-					fit->SetFullDir ( filename + "PluginManager/Disabled/" + fit->GetDirectory(this) );
-			}
-			fit->SetDisabled(true);
-		}
 		C_File *adjustPointer = NULL;
 		bool checkFile = dofile;
-		if ( filelist )
+		if ( filelist ) {
-		{
-			C_File *cFile = NULL;
-			if ( checkFile )
-			{
-				if ( !fit->IsFakePatch() && fit->GetFileType() != FILETYPE_README )
-				{
-					for ( cFile = filelist->First(); cFile; cFile = filelist->Next() )
+			C_File *cFile = (checkFile) ? _install_checkFile(fit, errorStr, &dofile, filelist) : NULL;
-					{
-						if ( !cFile->MatchFile ( fit ) )
-							continue;
-						if ( !m_bOverrideFiles && !cFile->CompareNew ( fit ) )
-						{
-							if ( errorStr )
-								errorStr->PushBack(fit->GetNameDirectory(this), ERRORLOG(SPKINSTALL_SKIPFILE));
-							dofile = false;
-						}
-						break;
-					}
-				}
-			}
 			// no matching file found, adding to main list
-			if ( !cFile )
-				filelist->push_back ( fit );
+			if ( !cFile ) filelist->push_back ( fit );
 			else
+			{
 				// if the file is not enabled, we need to check for any that might be enabled
-				if ( !fileEnabled )
+				if ( !fileEnabled ) //_install_checkDisabled(cFile, errorStr);
+				{
+					//TODO: check what this is actually doing
 					if ( !cFile->GetUsed() )
+					{
 						CFileIO rFile(cFile->GetFilePointer());
 						if ( rFile.Exists() )
+						{
 						cFile->SetFilename(fit->GetFilePointer());
 						cFile->SetDisabled(true);
+					}
 					else
+					{
-						fit->SetFullDir ( filename + fit->GetDirectory(this) );
+						cFile->SetFullDir ( CyString(sFilename) + fit->GetDirectory(this) );
-						fit->SetDisabled(false);
+						cFile->SetDisabled(false);
+					}
+				}
-				else
 				// move it to enabled
-				{
+				else {
-					// found a file, check if its in the disabled directory
-					CyString dir = cFile->GetFilePointer();
-					dir = dir.GetToken ( 1, dir.NumToken ('/') - 1, '/' );
-					CyString lastDir = dir.GetToken ( dir.NumToken('/'), '/' ).ToLower();
-					// if its disabled, rename it so its enabled
-					if ( ((cFile->IsDisabled()) || (lastDir == "disabled") || (dir.ToLower().IsIn ("/disabled/"))) && (enabled) )
+					if ( !this->_install_checkFileEnable(cFile, fit, destdir.ToString(), fileEnabled, errorStr) ) {
-					{
-						// first check if the directory exists
-						if ( cFile->IsInMod() )
-						{
-							CyString tofile = cFile->GetFilePointer().GetToken("::", 2, 2);
-							CCatFile tocat;
+						bFailed = true;
-							int err = tocat.Open ( fit->GetFilePointer().GetToken("::", 1, 1), "", CATREAD_CATDECRYPT, true );
-							if ( (err == CATERR_NONE) || (err == CATERR_CREATED) )
-							{
-								tocat.AppendFile ( cFile->GetFilePointer(), tofile );
-							}
-							CCatFile fromcat;
-							err = fromcat.Open ( cFile->GetFilePointer().GetToken("::", 1, 1), "", CATREAD_CATDECRYPT, false );
-							if ( err == CATERR_NONE )
-							{
-								fromcat.RemoveFile(tofile);
-							}
-							cFile->SetFilename ( fit->GetFilePointer() );
-							cFile->SetInMod(fit->GetInMod());
-						}
-						else
+						continue;
-						{
-							CyString to = cFile->GetDirectory(this);
-							CDirIO Dir(destdir);
-							if ( !Dir.Exists(to) )
-							{
-								if ( !Dir.Create ( to ) )
-								{
-									if ( errorStr )
-										errorStr->PushBack(to, ERRORLOG(SPKINSTALL_CREATEDIRECTORY_FAIL));
-									return false;
-								}
-								if ( errorStr )
-									errorStr->PushBack(to, ERRORLOG(SPKINSTALL_CREATEDIRECTORY));
-							}
-							CyString destfile = destdir + "/" + cFile->GetNameDirectory(this);
-							if ( CFileIO(destfile).Exists() )
-								CFileIO(destfile).Remove();
-							rename ( cFile->GetFilePointer().c_str(), destfile.c_str() );
-							cFile->SetFilename ( destdir + "/" + cFile->GetNameDirectory(this) );
-						}
-						cFile->SetDisabled(false);
-						if ( !dofile && errorStr )
-							errorStr->PushBack(cFile->GetNameDirectory(this), ERRORLOG(SPKINSTALL_ENABLEFILE));
+					}
+				}
 				adjustPointer = cFile;
-				if ( dofile )
-					adjustPointer->SetCreationTime ( fit->GetCreationTime() );
+				if ( dofile ) adjustPointer->SetCreationTime(fit->GetCreationTime());
+			}
+		}
 		if ( dofile )
+		{
+			}
 			//otherwise, just extract the file
 			else
+			{
 				// old file is found in list, switch to using new one
-				if ( (filelist) && (adjustPointer) )
+				if ( (filelist) && (adjustPointer) ) {
 					adjustPointer->CopyData(fit, false);
+					CLog::log(CLog::Log_Install, 2, "Copying data into existing file");
+				}
 				CyString fpointer = fit->GetFilePointer();
 				m_iLastError = SPKERR_CREATEDIRECTORY;
 				CyString dir = fit->GetFilePointer().GetToken ( "/", 1, fit->GetFilePointer().NumToken("/") - 1 );
 				m_sLastError = dir;
 				if ( !dir.IsIn ( "::" ) )
+				{
 					if ( !Dir.Exists(dir) )
+					{
+						CLog::logf(CLog::Log_Install, 2, "Creating directory to install file into, %s", dir.c_str());
 						if ( !Dir.Create(dir) )
+						{
 							if ( errorStr )
 								errorStr->PushBack(dir, ERRORLOG(SPKINSTALL_CREATEDIRECTORY_FAIL));
 							return false;
+						}
 						if ( errorStr )
 							errorStr->PushBack(dir, ERRORLOG(SPKINSTALL_CREATEDIRECTORY));
+					}
+				}
-				else
+				else {
+					CLog::logf(CLog::Log_Install, 2, "Adjusting file extension for file in mod, %s => %s", fit->GetFilePointer().c_str(), CCatFile::PckChangeExtension(fit->GetFilePointer()).c_str());
 					fit->SetFilename(CCatFile::PckChangeExtension(fit->GetFilePointer()));
+				}
 				m_iLastError = SPKERR_WRITEFILE;
 				m_sLastError = fit->GetFilePointer();
 				CyString sInstalledFile = fit->GetNameDirectory(this);
 				if ( fit->IsDisabled() )
 						sInstalledFile.Erase(0, 1);
+				}
 				if ( !fit->WriteFilePointer() )
+				{
+					CLog::log(CLog::Log_Install, 1, "Failed to write the file");
 					if ( errorStr )
 						errorStr->PushBack(sInstalledFile, ERRORLOG(SPKINSTALL_WRITEFILE_FAIL));
+				}
 				else
+				{
+					CLog::log(CLog::Log_Install, 1, "File written successfully");
+					CLog::log(CLog::Log_Install, 2, "Checking signed status of the file");
 					fit->UpdateSigned();
 					if ( errorStr )
 						errorStr->PushBack(sInstalledFile, ERRORLOG(SPKINSTALL_WRITEFILE));
 					switch(fit->GetFileType())
+					{
 						case FILETYPE_SCRIPT:
 						case FILETYPE_UNINSTALL:
+							CLog::log(CLog::Log_Install, 2, "Updating file signature");
 							fit->UpdateSignature();
 							break;
+					}
+				}
+			}
 			ClearError ();
+		}
 		if ( adjustPointer )
+		{
+			CLog::log(CLog::Log_Install, 2, "Adjusting pointers to existing file and deleting new file pointer");
 			node->ChangeData(adjustPointer);
 			delete fit;
+		}
+		CLog::log(CLog::Log_Install, 1, "File installation completed");
+	}
 	// now clear or data memory
+	CLog::log(CLog::Log_Install, 2, "Delting temporary file data from memory");
 	for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() )
+	{
 		// add plugin manager file to identify fake patches
 		/*
 		if ( fit->IsFakePatch() && fit->CheckFileExt ("cat") )
+		}
 */
 		node->Data()->DeleteData();
+	}
-	return true;
+	return !bFailed;
+}
 /*######################################################################################################*/
 bool CBaseFile::ParseValueLine(const Utils::String &sLine)
+{
 	Utils::String first = sLine.token(" ", 1);
 	Utils::String rest  = sLine.tokens(" ", 2);
-	if ( first.Compare("Name:") )
+	if ( first.Compare("Name:") )					this->setName(rest);
-		m_sName = rest;
-	else if ( first.Compare("Author:") )
+	else if ( first.Compare("Author:") )			this->setAuthor(rest);
-		m_sAuthor = rest;
-	else if ( first.Compare("Version:") )
+	else if ( first.Compare("Version:") )			this->setVersion(rest);
-		m_sVersion = rest;
 	else if ( first.Compare("fGameVersion:") ) {
 		if ( m_lGames.Back() ) {
 			m_lGames.Back()->Data()->sVersion = rest;
+		}
+	}
 		this->AddGameCompatability(rest, "");
 	else if ( first.Compare("GameCompat:") )
 		this->AddGameCompatability(rest.token(" ", 1), rest.tokens(" ", 2));
 	else if ( first.Compare("GameCompatExact:") )
 		this->AddGameCompatability(rest.token(" ", 1), rest.tokens(" ", 2));
-	else if ( first.Compare("Date:") )
+	else if ( first.Compare("Date:") )				this->setCreationDate(rest);
-		m_sCreationDate = rest;
 	else if ( first.Compare("WebAddress:") )		this->setWebAddress(rest);
 	else if ( first.Compare("WebSite:") )			this->setWebSite(rest);
 	else if ( first.Compare("Email:") )				this->setEmail(rest);
 	else if ( first.Compare("WebMirror1:") || first.Compare("Mirror1:") || first.Compare("WebMirror:") )
 		this->AddWebMirror(rest);
 	FILE *id = fopen ( filename.c_str(), "rb" );
 	if ( !id )
 		return false;
 	bool ret = ReadFile ( id, readtype, progress );
-	if ( ret )
-		m_sFilename = filename;
+	if ( ret ) this->setFilename(filename.ToString());
 	fclose ( id );
 	return ret;
+}
+}
 Utils::String CBaseFile::CreateValuesLine () const
+{
 	Utils::String values("Name: ");
-	values += Utils::String(m_sName.ToString()) + "\n";
+	values += this->name() + "\n";
-	values += Utils::String("Author: ") + m_sAuthor.ToString() + "\n";
+	values += "Author: " + this->author() + "\n";
-	values += Utils::String("Version: ") + m_sVersion.ToString() + "\n";
+	values += "Version: " + this->version() + "\n";
-	if ( !m_sCreationDate.Empty() )
-		values += Utils::String("Date: ") + m_sCreationDate.ToString() + "\n";
+	if ( !this->creationDate().empty() )values += "Date: "			+ this->creationDate()	+ "\n";
 	if ( !this->webAddress().empty() )	values += "WebAddress: "	+ this->webAddress()	+ "\n";
 	if ( !this->webSite().empty() )		values += "WebSite: "		+ this->webSite()		+ "\n";
 	if ( !this->email().empty() )		values += "Email: "			+ this->email()			+ "\n";
 	if ( !this->forumLink().empty() )	values += "ForumLink: "		+ this->forumLink()		+ "\n";
 				progress->IncDone((int)written);
+		}
+	}
-	m_bChanged = false;
+	_changed();
 	return true;
+}
 bool CBaseFile::ExtractAll ( CyString dir, int game, bool includedir, CProgressInfo *progress )
+{
 	// no file to read from
-	if ( m_sFilename.Empty() )
+	if ( this->filename().empty() )
 		return false;
 	// now open the file
-	FILE *id = fopen ( m_sFilename.c_str(), "rb" );
+	FILE *id = fopen ( this->filename().c_str(), "rb" );
 	if ( !id )
 		return false;
 	fseek ( id, 0, SEEK_SET );
 	// read the header
 		list->PushBack("# $PATH variable is used to get the current path");
 		list->PushBack("Variable: $GAMEDIR $PATH");
 		list->PushBack("");
+	}
 	list->PushBack("# The name of the script");
-	list->PushBack(CyString("Name: ") + m_sName);
+	list->PushBack(CyString("Name: ") + this->name());
 	list->PushBack("");
 	list->PushBack("# The author of the script, ie, you");
-	list->PushBack(CyString("Author: ") + m_sAuthor);
+	list->PushBack(CyString("Author: ") + this->author());
 	list->PushBack("");
 	list->PushBack("# The creation data, when it was created");
 	if ( datafile )
-		list->PushBack(CyString("Date: ") + m_sCreationDate);
+		list->PushBack(CyString("Date: ") + this->creationDate());
-	else
+	else {
-	{
 		list->PushBack("# $DATE variable is used to get the current date");
 		list->PushBack("Date: $DATE");
+	}
 	list->PushBack("");
 	list->PushBack("# The version of script");
 	if ( datafile )
-		list->PushBack(CyString("Version: ") + m_sVersion);
+		list->PushBack(CyString("Version: ") + this->version());
 	else
+	{
 		list->PushBack("# $ASK variable is used to get an input when creating");
 		list->PushBack("Version: $ASK");
+	}
+	}
 	return true;
+}
-CyString CBaseFile::GetAutosaveName()
+Utils::String CBaseFile::GetAutosaveName()
+{
-	CyString cdate = m_sCreationDate;
-	cdate = cdate.FindReplace("/", ".");
-	CyString name = m_sName + "-V" + m_sVersion + "-" + cdate;
+	return this->name() + "-V" + this->version() + "-" + this->creationDate().findReplace("/", ".");
-	return name;
+}
 bool CBaseFile::CheckGameCompatability(int game)
+{
 	if ( m_lGames.empty() )
 bool CBaseFile::RemoveGameCompatability(int game)
+{
 	for ( CListNode<SGameCompat> *node = m_lGames.Front(); node; node = node->next() ) {
 		if ( node->Data()->iGame == game ) {
 			m_lGames.remove(node);
-			m_bChanged = true;
+			_changed();
 			return true;
+		}
+	}
 	return false;
 	if ( version.isin(".") || !version.isNumber() )
 		Found->sVersion = version;
 	else
 		Found->iVersion = version;
-	m_bChanged = true;
+	_changed();
+}
 bool CBaseFile::LoadPackageData(const Utils::String &sFirst, const Utils::String &sRest)
+{
-	if ( sFirst.Compare("Name") )
+	if ( sFirst.Compare("Name") )					this->setName(sRest);
-		m_sName = sRest;
-	else if ( sFirst.Compare("Author") )
+	else if ( sFirst.Compare("Author") )			this->setAuthor(sRest);
-		m_sAuthor = sRest;
 	else if ( sFirst.Compare("ScriptName") )
 		AddLanguageName(ParseLanguage(sRest.token(" ", 1)), sRest.tokens(" ", 2));
 	else if ( sFirst.Compare("UninstallBefore") )	this->addUninstallText(ParseLanguage(sRest.token(" ", 1)), true, sRest.tokens(" ", 2));
 	else if ( sFirst.Compare("UninstallAfter") )	this->addUninstallText(ParseLanguage(sRest.token(" ", 1)), false, sRest.tokens(" ", 2));
 	else if ( sFirst.Compare("InstallBefore") )		this->addInstallText(ParseLanguage(sRest.token(" ", 1)), true, sRest.tokens(" ", 2));
 	else if ( sFirst.Compare("InstallAfter") )		this->addInstallText(ParseLanguage(sRest.token(" ", 1)), false, sRest.tokens(" ", 2));
-	else if ( sFirst.Compare("Date") )
+	else if ( sFirst.Compare("Date") )				this->setCreationDate(sRest);
-		m_sCreationDate = sRest;
-	else if ( sFirst.Compare("Version") )
+	else if ( sFirst.Compare("Version") )			this->setVersion(sRest);
-		m_sVersion = sRest;
-	// old version
 	else if ( sFirst.Compare("GameVersion") )
 		this->AddGameCompatability(-1, sRest);
-	else if ( sFirst.Compare("PluginType") )
+	else if ( sFirst.Compare("PluginType") ) {
-	{
 		if ( sRest.isNumber() )						this->setPluginType(sRest);
 		else if ( sRest.Compare("Normal") )			this->setPluginType(PLUGIN_NORMAL);
 		else if ( sRest.Compare("Stable") )			this->setPluginType(PLUGIN_STABLE);
 		else if ( sRest.Compare("Experimental") )	this->setPluginType(PLUGIN_EXPERIMENTAL);
 		else if ( sRest.Compare("Cheat") )			this->setPluginType(PLUGIN_CHEAT);
 		this->AddGameCompatability(CBaseFile::GetGameFromString(sGame), sRest.token(" ", 2));
+	}
 	else if ( sFirst.Compare("Description") )		this->setDescription(sRest);
 	else if ( sFirst.Compare("AutoSave") || sFirst.Compare("AutoExport") || sFirst.Compare("AutoRarExport") || sFirst.Compare("AutoZipExport") )
+	{
-		CyString filename = sRest;
+		Utils::String filename = sRest;
-		CyString name = m_sName;
-		CyString author = m_sAuthor;
-		CyString cdate = m_sCreationDate;
-		cdate = cdate.FindReplace("/", ".").Remove(" ");
+		Utils::String cdate = this->creationDate().findReplace("/", ".").remove(' ');
-		if ( filename.IsIn("$AUTOSAVE") )
+		if ( filename.isin("$AUTOSAVE") )
+		{
 			if ( this->GetType() )
-				filename.FindReplace("$AUTOSAVE", "$NAME-V$VERSION-$CDATE.xsp");
+				filename = filename.findReplace("$AUTOSAVE", "$NAME-V$VERSION-$CDATE.xsp");
 			else
-				filename.FindReplace("$AUTOSAVE", "$NAME-V$VERSION-$CDATE.spk");
+				filename = filename.findReplace("$AUTOSAVE", "$NAME-V$VERSION-$CDATE.spk");
+		}
-		if ( filename.IsIn("$NAME") )
-			filename.FindReplace("$NAME", name.Remove(" "));
+		filename = filename.findReplace("$NAME", this->name().remove(' '));
-		if ( filename.IsIn("$AUTHOR") )
-			filename.FindReplace("$AUTHOR", author.Remove(" "));
+		filename = filename.findReplace("$AUTHOR", this->author().remove(' '));
-		if ( filename.IsIn("$DATE") )
-			filename.FindReplace("$DATE", cdate);
+		filename = filename.findReplace("$DATE", cdate);
-		if ( filename.IsIn("$CDATE") )
-			filename.FindReplace("$CDATE", cdate);
+		filename = filename.findReplace("$CDATE", cdate);
-		if ( filename.IsIn("$VERSION") )
-			filename.FindReplace("$VERSION", m_sVersion);
+		filename = filename.findReplace("$VERSION", this->version());
 		if ( sFirst.Compare("AutoZipExport") || sFirst.Compare("AutoExport") )
-			m_sExportFilename = CFileIO(filename).ChangeFileExtension("zip");
+			this->setExportFilename(CFileIO(filename).ChangeFileExtension("zip").ToString());
 		else if ( sFirst.Compare("AutoRarExport") )
-			m_sExportFilename = CFileIO(filename).ChangeFileExtension("rar");
+			this->setExportFilename(CFileIO(filename).ChangeFileExtension("rar").ToString());
 		else
-			m_sFilename = filename;
+			this->setFilename(filename);
+	}
 	else if ( sFirst.Compare("WebSite") )		this->setWebSite(sRest);
 	else if ( sFirst.Compare("ForumLink") || sFirst.Compare("Forum") ) this->setForumLink(sRest);
 	else if ( sFirst.Compare("Email") )			this->setEmail(sRest);
 	else if ( sFirst.Compare("WebAddress") )	this->setWebAddress(sRest);
+	{
 		CPackages p;
 		CBaseFile *spk =  p.OpenPackage(sRest, 0, 0, SPKREAD_VALUES);
 		if ( spk )
+		{
-			this->AddNeededLibrary(spk->GetName().ToString(), spk->GetAuthor().ToString(), spk->GetVersion().ToString());
+			this->AddNeededLibrary(spk->name(), spk->author(), spk->version());
 			delete spk;
+		}
+	}
 	else if ( sFirst.Compare("Icon") )
+	{
 	f->ChangeBaseName(baseName);
+}
 CyString CBaseFile::CreateUpdateFile(CyString dir)
+{
-	CyString file = this->GetNameValidFile() + "_" + m_sAuthor + ".dat";
+	CyString file = this->GetNameValidFile() + "_" + this->author() + ".dat";
 	file.RemoveChar(' ');
 	CyStringList write;
-	write.PushBack(CyString("Package: ") + m_sName);
+	write.PushBack(CyString("Package: ") + this->name());
-	write.PushBack(CyString("Author: ") + m_sAuthor);
+	write.PushBack(CyString("Author: ") + this->author());
-	write.PushBack(CyString("Version: ") + m_sVersion);
+	write.PushBack(CyString("Version: ") + this->version());
-	write.PushBack(CyString("File: ") + CFileIO(m_sFilename).GetFilename());
+	write.PushBack(CyString("File: ") + CFileIO(this->filename()).GetFilename());
 	CFileIO File(dir + "/" + file);
 	if ( File.WriteFile(&write) )
 		return File.GetFullFilename();
 	return NullString;

Subversion Repositories spk

(root)//libspk/src/BaseFile.cpp – Rev 49 → 50