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

+		}
+	}
 	m_bVanilla = b;
+}
+void CPackages::setSaveGameManager(bool managed)
+{
+	m_iSaveGameManager = managed ? 1 : 0;
+	if (managed)
+	{
+		// find new save directory
+		CDirIO dir(this->saveDirectory());
+		if (dir.exists())
+		{
+			int id = 1;
+			while (dir.exists(Utils::String::PadNumber(id, 4)))
+				++id;
+			Utils::String d = Utils::String::PadNumber(id, 4);
+			dir.Create(d);
+			_sSaveDir = d;
+			CDirIO destDir1(dir.dir(d));
+			destDir1.Create("Vanilla");
+			destDir1.cd("Vanilla");
+			CDirIO destDir2(dir.dir(d));
+			destDir2.Create("Modified");
+			destDir2.cd("Modified");
+			Utils::CStringList files;
+			if (dir.dirList(files, Utils::String::Null(), "*.sav"))
+			{
+				for (auto itr = files.begin(); itr != files.end(); ++itr)
+				{
+					Utils::String f = dir.file((*itr)->str);
+					CFileIO(f).copy(destDir1.file((*itr)->str));
+					CFileIO(f).copy(destDir2.file((*itr)->str));
+				}
+			}
+		}
+	}
+	else
+	{
+		_sSaveDir.clear();
+	}
+}
 void CPackages::Reset()
+{
 	m_lFiles.MemoryClear();
 	m_lUninstallFiles.MemoryClear();
 	for ( CListNode<CBaseFile> *pNode = m_lPackages.Front(); pNode; pNode = pNode->next() )
+				}
 				else if ( cmd == "setmod" )
 					m_sSetMod = rest;
 				else if ( cmd == "shipbuffer" )
 					m_iShipBuffer = rest.toLong();
+				else if(cmd == "savedir")
+					_sSaveDir = rest;
 				else if ( cmd == "warebuffers" )
+				{
 					int max = rest.countToken(" ");
 					for ( int i = 0; i < WAREBUFFERS; i++ )
+					{
 		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() ) {
 		CLog::log(CLog::Log_IO, 3, "Removing old PluginManager.dat file");
 		CFileIO::Remove(m_sCurrentDir.ToString() + "/mods/PluginManager.dat");
+	}
 		lines.PushBack("UsedWare");
 	if ( m_bSurpressProtectedWarning )
 		lines.PushBack("SurpressProtectedWarning");
 	if ( !m_sSetMod.Empty() )
 		lines.PushBack(CyString("SetMod: ") + m_sSetMod);
+	if (!_sSaveDir.empty())
+		lines.PushBack(CyString("SaveDir: ") + _sSaveDir);
 	lines.PushBack(CyString("ShipBuffer: ") + (long)m_iShipBuffer);
 	CyString wareBuffer = "WareBuffers:";
 	for ( int i = 0; i < WAREBUFFERS; i++ )
 		wareBuffer += CyString(" ") + (long)m_iWareBuffer[i];
 	lines.PushBack(wareBuffer);
 	if ( m_iGame == GAME_X3TC )
+	{
 		if ( maxsize ) (*maxsize) = EMP_X3TC;
 		return GetX3TCEmp();
+	}
-	else if ( m_iGame == GAME_X3AP )
+	else if (m_iGame == GAME_X3AP)
+	{
+		if (maxsize) (*maxsize) = EMP_X3AP;
+		return GetX3TCEmp();
+	}
+	else if (m_iGame == GAME_X3FL)
+	{
-		if ( maxsize ) (*maxsize) = EMP_X3AP;
+		if (maxsize) (*maxsize) = EMP_X3FL;
 		return GetX3TCEmp();
+	}
 	else if ( m_iGame == GAME_X3 )
+	{
 		if ( maxsize ) (*maxsize) = EMP_X3;
+						}
 						// no remove them all
 						wareLines.DeleteFrom(maxsize);
+					}
-					else if ( m_iGame == GAME_X3TC || m_iGame == GAME_X3AP ) // check if old emp is included, and convert it
+					else if ( m_iGame == GAME_X3TC || m_iGame == GAME_X3AP || m_iGame == GAME_X3FL) // check if old emp is included, and convert it
+					{
 						if ( wareLines.Count() > 128 )
+						{
 							CyString test = wareLines.GetAt(128)->str;
 							if ( test.GetToken(";", -2).Compare("SS_WARE_SW_CUSTOM16_1;") )
 	switch(m_iGame) {
 		case GAME_X3: return 30;
 		case GAME_X3TC: return 35;
 		case GAME_X3AP: return 38;
+		case GAME_X3FL: return 39;
 		default: return 0;
+	}
+}
 void CPackages::createPluginManagerOpenText()
+	}
 	writeData.push_back(CyString("	</page>"));
 	// wares
-	if ( m_iGame == GAME_X3AP || m_iGame == GAME_X3TC || m_iGame == GAME_X3 || lWares.size() || lShips.size() )
+	if ( m_iGame == GAME_X3AP || m_iGame == GAME_X3TC || m_iGame == GAME_X3FL || m_iGame == GAME_X3 || lWares.size() || lShips.size() )
+	{
 		if ( !gameNumber )
 			writeData.push_back(CyString("  <page id=\"17\" title=\"Plugin Manager Objects\">"));
 		else
 			writeData.push_back(CyString("  <page id=\"") + (long)gameNumber + "0017\" title=\"Plugin Manager Objects\">");
 		writeData.push_back(CyString("		<t id=\"") + (long)(SHIPSTARTTEXT - 1) + "\">ZZ_BLANKSHIP</t>");
 		// do emp
-		if ( m_iGame == GAME_X3TC || m_iGame == GAME_X3 || m_iGame == GAME_X3AP )
+		if ( m_iGame == GAME_X3TC || m_iGame == GAME_X3 || m_iGame == GAME_X3AP || m_iGame == GAME_X3FL)
 			writeData.push_back(GetEMPText());
 		// object names
 		for ( CListNode<SGameWare> *node = lWares.Front(); node; node = node->next() )
+		{
 		return true;
 	return false;
+}
-void CPackages::BackupSaves(bool vanilla)
+void CPackages::backupSaves(bool vanilla)
+{
+	if (!_sSaveDir.empty())
+	{
-	// copy any saves into the vanilla directory
+		// copy any saves into the vanilla directory
-	Utils::String dir = (vanilla) ? "Vanilla" : "Modified";
+		Utils::String dir = (vanilla) ? "Vanilla" : "Modified";
-	// make sure the directory exists
+		// make sure the directory exists
-	CDirIO saveDir(this->saveDirectory());
+		CDirIO saveDir(this->saveDirectory());
-	CDirIO gameSaveDir(m_sCurrentDir);
+		CDirIO gameSaveDir(saveDir.dir(_sSaveDir));
-	if ( !gameSaveDir.exists("PluginManager") )
-		gameSaveDir.Create("PluginManager");
-	gameSaveDir.cd("PluginManager");
-	if ( !gameSaveDir.exists("Saves") )
-		gameSaveDir.Create("Saves");
-	gameSaveDir.cd("Saves");
-	if ( !gameSaveDir.exists(dir) )
-		gameSaveDir.Create(dir);
-	gameSaveDir.cd(dir);
-	// backup the saves
+		if (!gameSaveDir.exists())
-	CyStringList *files = saveDir.DirList();
+			gameSaveDir.Create();
-	if ( files )
+		if (!gameSaveDir.exists(dir))
+			gameSaveDir.Create(dir);
+		gameSaveDir.cd(dir);
-	{
+		// backup the saves
+		Utils::CStringList files;
-		for ( SStringList *node = files->Head(); node; node = node->next )
+		if(saveDir.dirList(files, Utils::String::Null(), "*.sav"))
+		{
+			for(auto itr = files.begin(); itr != files.end(); ++itr)
+			{
-			CFileIO File(saveDir.File(node->str));
+				CFileIO File(saveDir.file((*itr)->str));
-			if ( !File.CheckFileExtension("sav") )
+				if (!File.CheckFileExtension("sav"))
-				continue;
+					continue;
-			// remove the file if already exists
+				// remove the file if already exists
-			if (gameSaveDir.exists(node->str.ToString()))
+				if (gameSaveDir.exists((*itr)->str))
-				CFileIO::Remove(gameSaveDir.File(node->str).ToString());
+					CFileIO::Remove(gameSaveDir.file((*itr)->str));
-			// copy the file into the games save dir for backup
+				// copy the file into the games save dir for backup
-			File.copy(gameSaveDir.File(File.filename()).ToString(), true);
+				File.copy(gameSaveDir.file(File.filename()), true);
+			}
+		}
-		delete files;
+	}
+}
-void CPackages::RestoreSaves(bool vanilla)
+void CPackages::restoreSaves(bool vanilla)
+{
 	// get dir to restore from
+	if (!_sSaveDir.empty())
+	{
-	Utils::String dir = (vanilla) ? "Vanilla" : "Modified";
+		Utils::String dir = (vanilla) ? "Vanilla" : "Modified";
-	CDirIO restoreDir(m_sCurrentDir + "/PluginManager/Saves/" + dir);
+		CDirIO toDir(this->saveDirectory());
-	CDirIO toDir(this->saveDirectory());
+		CDirIO restoreDir(toDir.dir(_sSaveDir));
+		restoreDir.cd(dir);
+		if (restoreDir.exists())
+		{
-	//if we are in vanilla mode, we should remove the saves (so we only have vanilla saves
+			//if we are in vanilla mode, we should remove the saves (so we only have vanilla saves
+			/*
-	if ( vanilla ) {
+			if (vanilla) {
-		CyStringList *files = toDir.DirList();
+				CyStringList *files = toDir.DirList();
-		if ( files ) {
+				if (files) {
-			for ( SStringList *node = files->Head(); node; node = node->next )
+					for (SStringList *node = files->Head(); node; node = node->next)
-			{
+					{
-				CFileIO saveFile(toDir.File(node->str));
+						CFileIO saveFile(toDir.File(node->str));
-				if ( saveFile.extension().Compare("sav") ) {
+						if (saveFile.extension().Compare("sav")) {
-					saveFile.remove();
+							saveFile.remove();
+						}
+					}
+					delete files;
+				}
+			}
-			delete files;
-		}
+			*/
-	}
-	// now we copy of the backed up save games
+			// now we copy of the backed up save games
-	CyStringList *dirs = restoreDir.DirList();
+			Utils::CStringList files;
-	if ( dirs )
+			if(restoreDir.dirList(files, Utils::String::Null(), "*.sav"))
-	{
+			{
-		for ( SStringList *node = dirs->Head(); node; node = node->next )
+				for(auto itr = files.begin(); itr != files.end(); itr++)
-		{
+				{
-			CFileIO File(restoreDir.File(node->str));
+					CFileIO File(restoreDir.file((*itr)->str));
-			// remove the file if already exists
+					// remove the file if already exists
-			if ( toDir.exists(node->str.ToString()) ) CFileIO::Remove(toDir.file(node->str.ToString()));
+					if (toDir.exists((*itr)->str)) CFileIO::Remove(toDir.file((*itr)->str));
-			// move file over
+					// move file over
-			File.copy(toDir.file(node->str.ToString()), true);
+					File.copy(toDir.file((*itr)->str), true);
+				}
+			}
+		}
-		delete dirs;
+	}
+}
 bool CPackages::RemoveCurrentDirectory()
+{
 	if ( !m_bLoaded )
 	this->RemoveAllPackages();
 	// remove all plugin manager files
 	this->RemoveCreatedFiles();
-	// restore any vanilla saves
-	/*
-	if ( !m_bVanilla )
-	{
-		this->BackupSaves();
-		m_bVanilla = true;
-		this->RestoreSaves();
-	}*/
 	this->Reset();
 	m_bLoaded = false;
 	// clear the plugin manager directory
 	CDirIO Dir(m_sCurrentDir);
 	p->sFilename = CFileIO(package->filename()).filename();
 	return p;
+}
-CyString CPackages::FormatAvailablePackageData(CBaseFile *package)
+Utils::String CPackages::FormatAvailablePackageData(CBaseFile *package)
+{
 	SAvailablePackage *p = CPackages::CreateAvailablePackageData(package);
-	CyString ret = CPackages::FormatAvailablePackageData(p);
+	Utils::String ret = CPackages::FormatAvailablePackageData(p);
 	delete p;
 	return ret;
+}
-CyString CPackages::FormatAvailablePackageData(SAvailablePackage *package)
+Utils::String CPackages::FormatAvailablePackageData(SAvailablePackage *package)
+{
-	CyString ret = (long)package->iType;
+	Utils::String ret = (long)package->iType;
-	CyString gameCompat;
+	Utils::String gameCompat;
 	for ( CListNode<SGameCompat> *node = package->lGames.Front(); node; node = node->next() ) {
-		if ( !gameCompat.Empty() )
+		if ( !gameCompat.empty() )
 			gameCompat += "!";
-		gameCompat += CyString::Number(node->Data()->iGame);
+		gameCompat += Utils::String::Number(node->Data()->iGame);
+	}
-	if ( gameCompat.Empty() )
+	if ( gameCompat.empty() )
 		gameCompat = "0";
-	ret.AddToken("::", gameCompat);
+	ret = ret.addToken("::", gameCompat);
-	ret.AddToken("::", package->sName);
+	ret = ret.addToken("::", package->sName);
-	ret.AddToken("::", package->sAuthor);
+	ret = ret.addToken("::", package->sAuthor);
-	ret.AddToken("::", package->sVersion);
+	ret = ret.addToken("::", package->sVersion);
-	ret.AddToken("::", package->sUpdated);
+	ret = ret.addToken("::", package->sUpdated);
-	ret.AddToken("::", package->sFilename);
+	ret = ret.addToken("::", package->sFilename);
-	ret.AddToken("::", CyString::Number(package->iEase));
+	ret = ret.addToken("::", Utils::String::Number(package->iEase));
-	ret.AddToken("::", CyString::Number(package->iChanging));
+	ret = ret.addToken("::", Utils::String::Number(package->iChanging));
-	ret.AddToken("::", CyString::Number(package->iRec));
+	ret = ret.addToken("::", Utils::String::Number(package->iRec));
-	ret.AddToken("::", CyString::Number(package->iPluginType));
+	ret = ret.addToken("::", Utils::String::Number(package->iPluginType));
-	ret.AddToken("::", CyString::Number(package->iScriptType));
+	ret = ret.addToken("::", Utils::String::Number(package->iScriptType));
-	ret.AddToken("::", (package->bSigned) ? "1" : "0");
+	ret = ret.addToken("::", (package->bSigned) ? "1" : "0");
-	ret.AddToken("::", package->sDesc);
+	ret = ret.addToken("::", package->sDesc);
 	return ret;
+}
 void CPackages::ParseAvailablePackage(CyString sStr, CyString webaddress)
 	p->sVersion = tok[4];
 	p->sUpdated = tok[5];
 	p->sFilename = tok[6];
 	if ( !webaddress.Empty() )
-		p->sFilename = webaddress + "/" + p->sFilename;
+		p->sFilename = webaddress.ToString() + "/" + p->sFilename;
 	p->iChanging = p->iEase = p->iPluginType = p->iRec = p->iScriptType = -1;
 	// check if we have the extra values
 	if ( num >= 12 )
+		}
+	}
 	else if ( num > 7 )
 		p->sDesc = tok[8];
-	if ( !p->sDesc.Empty() )
+	if ( !p->sDesc.empty() )
-		p->sDesc = p->sDesc.FindReplace("::newline::", "\\n");
+		p->sDesc = p->sDesc.findReplace("::newline::", "\\n");
 	AddAvailablePackage(p);
 	CLEANSPLIT(tok, num);
+}
-SAvailablePackage *CPackages::FindAvailablePackage(CyString &filename)
+SAvailablePackage *CPackages::FindAvailablePackage(const Utils::String &filename)
+{
 	for ( CListNode<SAvailablePackage> *node = m_lAvailablePackages.Front(); node; node = node->next() )
+	{
 		if ( node->Data()->sFilename.Compare(filename) )
 			return node->Data();
 			CyString extradir;
 			int type = SPK::GetAutomaticFiletype(Name, &extradir, true);
 			C_File *f = NULL;
+			Utils::String filename = CFileIO(Name).filename();
+			Utils::String dir = CFileIO(Name).dir();
 			// check for special file types
 			if ( type == FILETYPE_SCRIPT_UNINSTALL ) {
-				f = archive->AddFile(CFileIO(Name).filename(), CFileIO(Name).dir(), FILETYPE_SCRIPT);
+				f = archive->AddFile(filename, dir, FILETYPE_SCRIPT);
 				if ( f ) {
 					f->copyData((const unsigned char *)iBuf, ze.unc_size);
+				}
 				type = FILETYPE_UNINSTALL;
+			}
+			int game = 0;
+			// check for addons
+			if (dir.contains('/', true))
+			{
+				Utils::String first = dir.token("/", 1);
+				int g = m_gameExe.findAddonType(first);
+				if (g != -1)
+					game = g + 1;
+			}
 			if ( type == -1 )
-				f = archive->AddFile(CFileIO(Name).filename(), CFileIO(Name).dir(), FILETYPE_EXTRA);
+				f = archive->AddFile(filename, dir, FILETYPE_EXTRA, game);
 			else
-				f = archive->AddFile(CFileIO(Name).filename(), extradir, type);
+				f = archive->AddFile(filename, extradir, type, game);
 			if ( f )
 				f->SetData((const unsigned char *)iBuf, ze.unc_size);
 			else
 				delete[] iBuf;
 	return NullString;
+}
 int CPackages::GeneratePackageUpdateData(CyString dir, bool includeSingle)
+{
-	CyStringList filedata;
+	Utils::CStringList filedata;
 	CPackages packages;
 	CDirIO Dir(dir);
 	for ( int i = 0; i < 2; i++ )
+	{
-		CyString pattern;
+		Utils::String pattern;
 		if ( i == 0 ) pattern = "*.spk";
 		else if ( i == 1 ) pattern = ".xsp";
 		else break;
-		CyStringList *files = Dir.DirList("", pattern);
+		Utils::CStringList files;
-		if ( files )
+		if(Dir.dirList(files, "", pattern))
+		{
-			for ( SStringList *node = files->Head(); node; node = node->next )
+			for(auto itr = files.begin(); itr != files.end(); itr++)
+			{
 				int error = 0;
-				CBaseFile *p = packages.OpenPackage(Dir.File(node->str), &error, 0, SPKREAD_NODATA);
+				CBaseFile *p = packages.OpenPackage(Dir.file((*itr)->str), &error, 0, SPKREAD_NODATA);
 				if ( !p )
 					continue;
 				if ( includeSingle )
 					p->CreateUpdateFile(dir);
-				filedata.PushBack(CPackages::FormatAvailablePackageData(p));
+				filedata.pushBack(CPackages::FormatAvailablePackageData(p));
 				delete p;
+			}
-			delete files;
+		}
+	}
-	if ( !filedata.Empty() )
+	if ( !filedata.empty() )
+	{
 		CFileIO File(dir + "/xpackagedata.dat");
-		if ( File.WriteFile(&filedata) )
+		if ( File.writeFile(&filedata) )
-			return filedata.Count();
+			return filedata.size();
+	}
 	return 0;
+}

Subversion Repositories spk

(root)/libspk/src/Packages.cpp – Rev 125 → 126