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

 	if ( m_sCurrentDir.Empty() )
 		return true;
 	if ( !m_bLoaded )
 		return true;
+	CLog::log(CLog::Log_Directory, 1, "closing directory: " + m_sCurrentDir.ToString());
 	m_sActiveDir = m_sCurrentDir;
-	if ( m_bRenameText )
+	if ( m_bRenameText ) {
+		CLog::log(CLog::Log_Directory, 2, "Creating other language files for game");
 		CreateLanguageTextFiles(errors);
+	}
+	CLog::log(CLog::Log_Directory, 2, "Backing up save game files");
 	this->BackupSaves();
-	if ( CFileIO(m_sCurrentDir + "/mods/PluginManager.dat").ExistsOld() )
+	if ( CFileIO(m_sCurrentDir + "/mods/PluginManager.dat").ExistsOld() ) {
+		CLog::log(CLog::Log_IO, 3, "Removing old PluginManager.dat file");
 		CFileIO::Remove(m_sCurrentDir.ToString() + "/mods/PluginManager.dat");
+	}
-	if ( CFileIO(m_sCurrentDir + "/mods/PluginManager.cat").ExistsOld() )
+	if ( CFileIO(m_sCurrentDir + "/mods/PluginManager.cat").ExistsOld() ) {
+		CLog::log(CLog::Log_IO, 3, "Removing old PluginManager.cat file");
 		CFileIO::Remove(m_sCurrentDir.ToString() + "/mods/PluginManager.cat");
+	}
 	if ( !m_bVanilla )
+	{
 		// base mode for Reunion
 		if ( m_iGame == GAME_X3 && m_pEnabledMod )
+				}
+			}
+		}
 		else if ( m_iGame == GAME_X3 && !m_sSetMod.Empty() && CFileIO(m_sCurrentDir + "/mods/" + m_sSetMod + ".cat").ExistsOld() && CFileIO(m_sCurrentDir + "/mods/" + m_sSetMod + ".dat").ExistsOld() )
+		{
+			CLog::log(CLog::Log_Directory, 2, "Copying mod file: " + m_sSetMod.ToString() + ", to PluginManager.cat");
 			CFileIO(m_sCurrentDir + "/mods/" + m_sSetMod + ".dat").copy(m_sCurrentDir.ToString() + "/mods/PluginManager.dat");
 			CFileIO(m_sCurrentDir + "/mods/" + m_sSetMod + ".cat").copy(m_sCurrentDir.ToString() + "/mods/PluginManager.cat");
+		}
 		if ( !CDirIO(m_sCurrentDir).Exists("mods") )
+}
 bool CPackages::RestoreFakePatch()
+{
+	CLog::log(CLog::Log_Directory, 1, "Restoring PluginManager fake patch into game");
-	m_iFakePatch = -1;
+ 	m_iFakePatch = -1;
 	CFileIO catFile(m_sCurrentDir + "/PluginManager/PlugMan_Fake.cat");
 	CFileIO datFile(m_sCurrentDir + "/PluginManager/PlugMan_Fake.dat");
 	// if only 1 exists, remove it
 	if ( catFile.exists() && !datFile.exists() ) {
+		CLog::log(CLog::Log_Directory, 1, "WARNING: cat/dat file mismatch, dat file seems to be missing, removing cat file");
 		if ( !catFile.remove() ) return false;
+	}
 	else if ( !catFile.exists() && datFile.exists() ) {
+		CLog::log(CLog::Log_Directory, 1, "WARNING: cat/dat file mismatch, cat file seems to be missing, removing dat file");
 		if ( !datFile.remove() ) return false;
+	}
 	// if both exists, lets rename them
 	if ( catFile.exists() && datFile.exists() )
+	{
+		CLog::log(CLog::Log_Directory, 3, "Creating pluginmanagerfake.txt file to add to Fake Patch");
 		// we need to add the plugin manager file in
 		CyString file = m_sTempDir;
 		if ( !file.Empty() )
 			file += "/";
 		file += "pluginmanagerfake.txt";
 		file = file.FindReplace("\\", "/");
 		CFileIO fakeFile(file);
 		std::vector<CyString> lines;
 		lines.push_back("//pluginmanager fake patch");
+		CLog::log(CLog::Log_Directory, 3, "Writing pluginmanagerfake.txt file to add to Fake Patch");
-		fakeFile.WriteFile(&lines);
+		if ( !fakeFile.WriteFile(&lines) ) {
+			CLog::log(CLog::Log_Directory, 3, "Writing pluginmanagerfake.txt failed!!");
+		}
+		else {
+			CLog::log(CLog::Log_Directory, 2, "Adding TFake.pck file into FakePatch");
-		CCatFile fakePatch;
+			CCatFile fakePatch;
-		if ( fakePatch.Open(m_sCurrentDir + "/PluginManager/PlugMan_Fake.cat", this->GetAddonDir(), CATREAD_DAT, false) == CATERR_NONE )
+			if ( fakePatch.Open(m_sCurrentDir + "/PluginManager/PlugMan_Fake.cat", this->GetAddonDir(), CATREAD_DAT, false) == CATERR_NONE )
-		{
-			if ( fakePatch.AppendFile(file.ToString(), "PlugMan\\TFake.pck") )
+			{
-				// find next available fake patch
-				m_iFakePatch = this->FindNextFakePatch();
+				if ( fakePatch.AppendFile(file.ToString(), "PlugMan\\TFake.pck") )
-				fakePatch.WriteCatFile();
+					fakePatch.WriteCatFile();
+			}
+		}
-				CyString filename = CyString::Number(m_iFakePatch).PadNumber(2);
+		// find next available fake patch
-				if ( catFile.Rename(m_sCurrentDir + "/" + filename + ".cat") )
+		m_iFakePatch = this->FindNextFakePatch();
-				{
-					if ( datFile.Rename(m_sCurrentDir + "/" + filename + ".dat") ){
+		CLog::log(CLog::Log_Directory, 2, "Finding next available fake patch number: " + (long)m_iFakePatch);
-						fakeFile.remove();
-						return true;
-					}
+		Utils::String filename = Utils::String::PadNumber(m_iFakePatch, 2);
+		CLog::log(CLog::Log_Directory, 2, "Renaming cat file to: " + filename + ".cat");
+		if ( catFile.Rename(m_sCurrentDir + "/" + filename + ".cat") )
+		{
+			CLog::log(CLog::Log_Directory, 2, "Renaming dat file to: " + filename + ".dat");
+			if ( datFile.Rename(m_sCurrentDir + "/" + filename + ".dat") ){
+				CLog::log(CLog::Log_Directory, 3, "Deleting pluginmanagerfake.txt temporary file");
-					// TODO: restore cat file
+				fakeFile.remove();
+				return true;
-				}
+			}
+			else {
+				CLog::log(CLog::Log_Directory, 2, "ERROR: failed to rename dat file");
+			}
+			// TODO: restore cat file
+		}
+		else {
+			CLog::log(CLog::Log_Directory, 2, "ERROR: failed to rename cat file");
+		}
+		CLog::log(CLog::Log_Directory, 3, "Deleting pluginmanagerfake.txt temporary file");
 		fakeFile.remove();
 		return false;
+	}
 	return true;
 void CPackages::WriteData()
+{
 	if ( m_sCurrentDir.Empty() )
 		return;
+	CLog::log(CLog::Log_Directory, 1, "Writing data file for current directory: " + m_sCurrentDir.ToString());
 	CyStringList lines;
 	CyString version;
 	version.FromFloat(GetLibraryVersion(), 2);
 	version.Prepend("SpkInstaller: ");
 	lines.PushBack(version);
 		lines.PushBack(fileline);
+	}
 	lines.PushBack("</scripts>");
-	CFileIO datFile(m_sCurrentDir + "/PluginManager/PluginManager.dat");
+	CFileIO datFile(m_sCurrentDir + "/PluginManager/PluginManager.new");
 	CDirIO Dir(m_sCurrentDir);
-	if ( !Dir.Exists("PluginManager") )
+	if ( !Dir.Exists("PluginManager") ) {
+		CLog::log(CLog::Log_IO, 2, "Creating PluginManager directory");
-		Dir.Create("PluginManager");
+ 		Dir.Create("PluginManager");
+	}
+	CLog::log(CLog::Log_IO, 2, "Writing data file: " + m_sCurrentDir.ToString() + "/PluginManager/PluginManager.new");
 	if ( !datFile.WriteFile(&lines) )
+	{
+		CLog::log(CLog::Log_IO, 1, "ERROR: Failed to write data file");
+	}
+	else {
+		CLog::log(CLog::Log_IO, 2, "Removing old data file: " + m_sCurrentDir.ToString() + "/PluginManager/PluginManager.dat");
+		if ( !CFileIO::Exists(m_sCurrentDir.ToString() + "/PluginManager/PluginManager.dat") || CFileIO::Remove(m_sCurrentDir.ToString() + "/PluginManager/PluginManager.dat") ) {
+			CLog::log(CLog::Log_IO, 2, "Renaming data file: PluginManager.new => PluginManager.dat");
+			datFile.Rename(m_sCurrentDir + "/PluginManager/PluginManager.dat");
+		}
+	}
+}
 /**
 			CLEANSPLIT(empStr, empEntries);
+		}
+	}
+}
-CyString parseXmlText(const CyString &str)
+Utils::String parseXmlText(const Utils::String &str)
+{
-	CyString newStr(str);
+	Utils::String newStr(str);
 	CyStringList changes;
 	// find all XML commands, &<command>;
-	std::string sStr = str.ToString();
+	Utils::String sStr = str;
-	std::string::size_type pos = sStr.find_first_of("&", 0);
+	Utils::String::size_type pos = sStr.find_first_of("&", 0);
-	while ( pos != std::string::npos ) {
+	while ( pos != Utils::String::npos ) {
 		// find the next space and next ;.  If ; comes first, assume its acommand
-		std::string::size_type spacePos = sStr.find_first_of(" ", pos);
+		Utils::String::size_type spacePos = sStr.find_first_of(" ", pos);
-		std::string::size_type colonPos = sStr.find_first_of(";", pos);
+		Utils::String::size_type colonPos = sStr.find_first_of(";", pos);
-		if ( colonPos != std::string::npos && colonPos < spacePos ) {
+		if ( colonPos != Utils::String::npos && colonPos < spacePos ) {
 			// replace with <::command::> so they the & doesn't get replaced
-			std::string repStr = sStr.substr(pos, (colonPos + 1) - pos);
+			Utils::String repStr = sStr.substr(pos, (colonPos + 1) - pos);
-			std::string repWithStr = "<::" + sStr.substr(pos + 1, colonPos - pos - 1) + "::>";
+			Utils::String repWithStr = "<::" + sStr.substr(pos + 1, colonPos - pos - 1) + "::>";
-			newStr.FindReplace(repStr, repWithStr);
+			newStr = newStr.findReplace(repStr, repWithStr);
-			changes.PushBack(repStr, repWithStr);
+			changes.PushBack(CyString(repStr), CyString(repWithStr));
+		}
 		// find the next command
 		pos = sStr.find_first_of("&", pos + 1);
+	}
 	// replace the & now
-	newStr = newStr.FindReplace("&", "&amp;");
+	newStr = newStr.findReplace("&", "&amp;");
 	// restore the commands
 	for ( SStringList *strNode = changes.Head(); strNode; strNode = strNode->next ) {
-		newStr.FindReplace(strNode->data, strNode->str);
+		newStr = newStr.findReplace(strNode->data.ToString(), strNode->str.ToString());
+	}
 	return newStr;
+}
-CyString CPackages::ConvertTextString(CyString text)
+Utils::String CPackages::ConvertTextString(const Utils::String &sText)
+{
 	//process any &
-	text = parseXmlText(text);
+	Utils::String text = parseXmlText(sText);
 	// change special cases
-	text = text.FindReplace("(", "\\(");
+	text = text.findReplace("(", "\\(");
-	text = text.FindReplace(")", "\\)");
+	text = text.findReplace(")", "\\)");
-	text = text.FindReplace("[", "{");
+	text = text.findReplace("[", "{");
-	text = text.FindReplace("]", "}");
+	text = text.findReplace("]", "}");
-	text = text.FindReplace(">", "&gt;");
+	text = text.findReplace(">", "&gt;");
-	text = text.FindReplace("<", "&lt;");
+	text = text.findReplace("<", "&lt;");
 	return text;
+}
 int CPackages::_gameTextNumber() const
+{
 		CyString sTextCount((long)textCount);
 		writeData.push_back(CyString("		<t id=\"") + (long)start + "\">" + this->ConvertTextString(p->name()) + "</t>");
 		writeData.push_back(CyString("		<t id=\"") + (long)(start + 1) + "\">" + this->ConvertTextString(p->author()) + "</t>");
 		writeData.push_back(CyString("		<t id=\"") + (long)(start + 2) + "\">" + this->ConvertTextString(p->version()) + "</t>");
-		writeData.push_back(CyString("		<t id=\"") + (long)(start + 3) + "\">" + this->ConvertTextString(p->GetLanguageName(lang)) + "</t>");
+		writeData.push_back(CyString("		<t id=\"") + (long)(start + 3) + "\">" + this->ConvertTextString(p->GetLanguageName(lang).ToString()) + "</t>");
 		CLinkList<SSettingType> *settings = spk->GetSettingsList();
 		if ( settings && settings->size() )
+		{
 			writeData.push_back(CyString("		<t id=\"") + (long)(start + 4) + "\">" + (long)settings->size() + "</t>");
 		writeData.push_back(CyString("		<t id=\"5\">") + CyString::Number(start) + "</t>");
 		for ( CListNode<SGameWare> *node = lWares.Front(); node; node = node->next() )
+		{
 			SGameWare *w = node->Data();
 			if ( w->pWare && w->iType == WARETYPE_ADDED )
-				writeData.push_back(CyString("		<t id=\"") + (long)start + "\">" + this->ConvertTextString(w->sWareName) + "</t>");
+				writeData.push_back(CyString("		<t id=\"") + (long)start + "\">" + this->ConvertTextString(w->sWareName.ToString()) + "</t>");
 			else
 				writeData.push_back(CyString("		<t id=\"") + (long)start + "\">-1</t>");
 			writeData.push_back(CyString("		<t id=\"") + (long)(start + 1) + "\">" + CyString((char)w->cType) + "</t>");
 			writeData.push_back(CyString("		<t id=\"") + (long)(start + 2) + "\">" + (long)w->iPos + "</t>");
 			start += 10;
 			SGameWare *w = node->Data();
 			if ( !w->pWare || w->iType != WARETYPE_ADDED )
 				continue;
 			// find the correct text for the language
-			CyString name = CSpkFile::GetWareText(w->pWare, m_iLanguage);
+			Utils::String name = CSpkFile::GetWareText(w->pWare, m_iLanguage);
-			CyString desc = CSpkFile::GetWareDesc(w->pWare, m_iLanguage);
+			Utils::String desc = CSpkFile::GetWareDesc(w->pWare, m_iLanguage);
-			if ( !name.Empty() )
+			if ( !name.empty() )
 				writeData.push_back(CyString("		<t id=\"") + (long)(w->iText + 3) + "\">" + this->ConvertTextString(name) + "</t>");
-			if ( !desc.Empty() )
+			if ( !desc.empty() )
 				writeData.push_back(CyString("		<t id=\"") + (long)(w->iText + 4) + "\">" + this->ConvertTextString(desc) + "</t>");
+		}
 		for ( CListNode<SGameShip> *node = m_lGameShips.Front(); node; node = node->next() )
+		{
 			SGameShip *s = node->Data();
 			if ( !s->pPackage || s->iType != WARETYPE_ADDED )
 				continue;
 			if ( s->pPackage->GetOriginalDescription() )
 				continue;
-			CyString name = s->pPackage->GetTextName(m_iLanguage);
+			Utils::String name = s->pPackage->GetTextName(m_iLanguage);
-			CyString desc = s->pPackage->GetTextDescription(m_iLanguage);
+			Utils::String desc = s->pPackage->GetTextDescription(m_iLanguage);
-			if ( !name.Empty() )
+			if ( !name.empty() )
 				writeData.push_back(CyString("		<t id=\"") + (long)s->iText + "\">" + this->ConvertTextString(name) + "</t>");
-			if ( !desc.Empty() )
+			if ( !desc.empty() )
 				writeData.push_back(CyString("		<t id=\"") + (long)(s->iText + 1) + "\">" + this->ConvertTextString(desc) + "</t>");
+		}
 		writeData.push_back(CyString("  </page>"));
+	}
 	writeData.push_back(CyString("</language>"));

Subversion Repositories spk

(root)/libspk/src/Packages.cpp – Rev 83 → 84