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

 					if ( cmd == L"<script>" )
+					{
 						if ( packageFile->IsMod() && packageFile->IsEnabled() )
 							m_pEnabledMod = packageFile;
-						m_lPackages.push_back(packageFile);
-						this->ConvertOldPackage(packageFile);
+						_processAddPackage(packageFile);
 						packageFile = new CSpkFile();
 						iStatus = READ_SCRIPT;
+					}
 					else if ( cmd == L"<ship>" )
+					{
-						m_lPackages.push_back(packageFile);
-						this->ConvertOldPackage(packageFile);
+						_processAddPackage(packageFile);
 						packageFile = new CXspFile();
 						iStatus = READ_SCRIPT;
+					}
 					else if ( cmd == L"<base>" )
+					{
-						m_lPackages.push_back(packageFile);
-						this->ConvertOldPackage(packageFile);
+						_processAddPackage(packageFile);
 						packageFile = new CBaseFile();
 						iStatus = READ_SCRIPT;
+					}
 					else if ( cmd == L"<archive>" )
+					{
-						m_lPackages.push_back(packageFile);
-						this->ConvertOldPackage(packageFile);
+						_processAddPackage(packageFile);
 						packageFile = new CArchiveFile();
 						iStatus = READ_SCRIPT;
+					}
-					else if ( cmd == L"<;/scripts>" )
+					else if (cmd == L"<;/scripts>")
+					{
 						if ( packageFile->IsMod() && packageFile->IsEnabled() )
 							m_pEnabledMod = packageFile;
-						m_lPackages.push_back(packageFile);
-						this->ConvertOldPackage(packageFile);
+						_processAddPackage(packageFile);
+					}
 					else
+					{
 						int fileNum = line.token(L"::", 1).toLong();
 						if ( fileNum >= 0 && fileNum < m_lFiles.size() )
 void CPackages::PurgeWares()
+{
 	// mark all delete wares as available
 	for ( int i = 0; i < WAREBUFFERS; i++ )
 	{
 		for ( CListNode<SGameWare> *node = m_lGameWares[i].Front(); node; node = node->next() )
+		{
 			SGameWare *w = node->Data();
 			if ( !w ) continue;
 			if ( w->iType == WARETYPE_DELETED )
 				logDir = m_sMyDoc + L"/" + exe->sMyDoc;
+		}
+	}
 	return CFileIO(logDir).fullFilename();
 }
 Utils::WString CPackages::saveDirectory()
+{
 	Utils::WString logDir = this->logDirectory();
 	if ( m_iGameFlags & EXEFLAG_NOSAVESUBDIR )
 		return logDir;
 		Utils::WString file = Utils::WString::PadNumber(m_iFakePatch, 2);
 		if (checkValidPluginManagerFile(file))
 			useFile = file;
 		else if (checkIfPluginManagerFile(file))
 			useFile = file;
 	}
 	if ( useFile.empty() )
+	{
 		int nextfree = this->findNextFakePatch();
 		--nextfree; // gets the end fake patch
 				useFile = file;
 				break;
+			}
 			--nextfree;
+		}
 	}
 	Utils::WString addonDir = this->getAddonDir();
 	// couldn't find the correct file, lets search for it
 	if ( useFile.empty() ) {
 		int nextfree = this->findNextFakePatch();
 			if ( files )
+			{
 				Utils::WString useAddonDir = addonDir;
 				if ( !useAddonDir.empty() ) useAddonDir += L"\\";
 				for (auto itr = files->cbegin(); itr != files->cend(); itr++)
 				{
 					if ((*itr)->sFile.Compare(L"PlugMan\\TFake.pck") )
 						continue;
 					if ((*itr)->sFile.Compare(useAddonDir + L"t\\44" + Utils::WString::PadNumber(PMTEXTFILE, 4) + L".pck"))
 						continue;
 					if ((*itr)->sFile.Compare(useAddonDir + L"t\\" + Utils::WString::PadNumber(PMTEXTFILE, 4) + L"-L044.pck"))
 						continue;
 					found = true;
 					break;
+				}
+			}
 			// no files, jsut delete them
 			CFileIO catFile(m_sCurrentDir + L"/" + useFile + L".cat");
 			if ( !files || !found )
+			{
 				if ( catFile.remove() )
 				{
 					CFileIO datFile(m_sCurrentDir + L"/" + useFile + L".dat");
 					if ( datFile.remove() )
 						return true;
 				}
 			}
 			else
+			{
 				if ( catFile.Rename(m_sCurrentDir + L"/PluginManager/PlugMan_Fake.cat") )
+				{
 					CFileIO datFile(m_sCurrentDir + L"/" + useFile + L".dat");
 					if ( datFile.Rename(m_sCurrentDir + L"/PluginManager/PlugMan_Fake.dat") )
 						return true;
 					// TODO: it failed, restore cat file and do error
 				}
 			}
+		}
 		// if we're here, we tryed, and failed
 		return false;
+	}
+				}
+			}
 			if ( (count && !noncount) || (count > noncount) )
 				found = true;
 		}
+	}
 	return found;
+}
+	}
 	if ( package->forumLink().empty() && package->webSite().contains(L"forum.egosoft")) {
 		package->setForumLink(package->webSite());
 		package->setWebSite(L"");
 	}
 	// convert the version
 	if ( package->GetType() == TYPE_SPK )
+	{
 		CSpkFile *spk = (CSpkFile *)package;
 				spk->SetLibrary();
+			}
 			if ( spk->GetScriptType() != CSpkFile::SCRIPTTYPE_CUSTOM )
 				spk->setScriptType(L"");
 		}
 	}
 	else if ( package->GetType() == TYPE_XSP )
+	{
 		CXspFile *xsp = (CXspFile *)package;
 		Utils::WString data = xsp->shipData();
 		xsp->setShipData(data);
+	}
 	// any extra files that are in director folder
 	if ( package->AnyFileType(FILETYPE_EXTRA) )
 	{
 		for ( C_File *f = package->GetFirstFile(FILETYPE_EXTRA); f; f = package->GetNextFile(f) )
+		{
 			if ( !f->dir().Compare(L"director") )
 				continue;
 			if (f->checkFileExt(L"xml") || f->checkFileExt(L"pck"))
+			{
 				f->setDir(L"");
 				f->setFileType(FILETYPE_MISSION);
+			}
+		}
+	}
+}
+void CPackages::_processAddPackage(CBaseFile* p)
+{
+	if (p)
+	{
+		this->ConvertOldPackage(p);
+		p->completeFile();
+		m_lPackages.push_back(p);
+	}
+}
 void CPackages::UpdatePackage(CBaseFile *p)
+{
 					node->Data()->SetLoadError(error);
 					errorPackageList->push_back(p);
+				}
 				else
 					++count;
 			}
+		}
 		packageList.clear();
+	}
 	for ( SMultiSpkFile *ms = package->GetFileList()->First(); ms; ms = package->GetFileList()->Next() )
 	bool shuffle = package->anyFakePatchOrder();
 	// merge the update into the old package
 	bool dontAdd = false;
 	if ( package->GetType() == TYPE_SPK )
+	{
 		if ( ((CSpkFile *)package)->IsPackageUpdate() )
+		{
 			// now copy any files from a mod
 			for ( CListNode<C_File> *f = package->GetFileList()->Front(); f; f = f->next() )
 	// store enabled mod
 	if ( package->IsMod() && !disabled ) {
 		m_pEnabledMod = package;
 		CLog::log(CLog::Log_Install, 1, L"Setting package as primary mod");
 	}
 	package->updateTextDB();
+	package->completeFile();
 	m_bRemoveDir = true;
 	CLog::log(CLog::Log_Install, 1, L"Saving data to file");
 	this->WriteData();
 						this->PrepareDisablePackage(depP);
+				}
 				if ( m_lDisableList.size() )
 					this->disablePreparedPackages(errors, progress, disabledPackages);
 			}
 		}
 	}
 	// interate through all the files in the package
 	int fileCount = 0;
 	for ( CListNode<C_File> *node = fileList.Front(); node; node = node->next() )
+	{
 		C_File *f = node->Data();
 		// display progress if needed
 		if ( progress )
+		{
 			progress->UpdateProgress(fileCount++, maxFiles);
 			progress->UpdateFile(f);
+		}
 		// skip uninstall files
 		if ( f->GetFileType() == FILETYPE_UNINSTALL )
 		{
 			uninstallFiles.push_back(f);
 			continue;
+		}
 		// only delete files that are not used
 		if ( uninstalledPackages )
 			uninstalledPackages->push_back(p);
 		else
 			delete p;
+		for (CListNode<SGameShip>* wNode = m_lGameShips.Front(); wNode; wNode = wNode->next())
+		{
+			if (wNode->Data()->pPackage == p)
+			{
+				wNode->Data()->pPackage = NULL;
+				break;
+			}
+		}
+	}
 	m_lInstallList.clear();
 	// check unistall files
 		if ( m_iGame == GAME_X3 && m_pEnabledMod )
+		{
 			C_File *fDat = m_pEnabledMod->GetFirstFile(FILETYPE_MOD);
 			while (fDat && !fDat->IsFakePatch() && !fDat->checkFileExt(L"dat"))
 				fDat = m_pEnabledMod->GetNextFile(fDat);
 			if ( fDat )
+			{
 				C_File *fCat = m_pEnabledMod->GetFirstFile(FILETYPE_MOD);
 				while ( fCat && !fCat->IsFakePatch() && !fCat->checkFileExt(L"cat") && !fCat->baseName().Compare(fDat->baseName()) )
 					fCat = m_pEnabledMod->GetNextFile(fCat);
+	{
 		m_bRemoveDir = false;
 		Utils::WStringList removeDirs;
 		removeDirs.pushBack(L".");
 		removeUnusedDirectories(removeDirs, errors);
 	}
 	this->setCurrentDir(L"");
 	m_bLoaded = false;
 	return true;
 }
 Utils::WString CPackages::getModKey() const
+{
 	return m_gameExe.getModKey(m_iGame - 1);
+}
+{
 	if ( !m_pEnabledMod )
+	{
 		if ( m_sSetMod.empty() && m_iGame == GAME_X3 )
 			return L"PluginManager";
 		return m_sSetMod;
+	}
 	if ( !m_pEnabledMod->IsEnabled() )
 		return m_sSetMod;
 		std::vector<Utils::WString> lines;
 		lines.push_back(L"//pluginmanager fake patch");
 		CLog::log(CLog::Log_Directory, 3, L"Writing pluginmanagerfake.txt file to add to Fake Patch");
 		if ( !fakeFile.writeFile(lines) ) {
 			CLog::log(CLog::Log_Directory, 3, L"Writing pluginmanagerfake.txt failed!!");
 		}
 		else {
 			CLog::log(CLog::Log_Directory, 2, "Adding TFake.pck file into FakePatch");
 			CCatFile fakePatch;
 			if (fakePatch.open(catFile.fullFilename(), this->getAddonDir(), CATREAD_DAT, true) == CATERR_NONE)
+			{
 				fakePatch.appendFile(fakeFile.fullFilename(), L"PlugMan\\TFake.pck", true, false);
 				fakePatch.WriteCatFile();
+			}
 		}
 		// backup existing mod files incase something happens to them
 		if ( !datFile.exists() || !catFile.exists() ) {
 			CLog::log(CLog::Log_Directory, 2, Utils::WString("ERROR: ") + (!catFile.exists() ? L"cat" : L"dat") + L" file appears to be missing");
 		}
 		else {
 			catFile.GetDirIO().create(L"Backup");
 			catFile.copy(catFile.dir() + L"/Backup/" + catFile.filename());
 			datFile.copy(datFile.dir() + L"/Backup/" + datFile.filename());
 		}
 		// find next available fake patch
 		m_iFakePatch = this->findNextFakePatch();
 		CLog::log(CLog::Log_Directory, 2, L"Finding next available fake patch number: " + (long)m_iFakePatch);
 		lines.pushBack(L"SurpressProtectedWarning");
 	if ( !m_sSetMod.empty() )
 		lines.pushBack(L"SetMod: " + m_sSetMod);
 	if (!_sSaveDir.empty())
 		lines.pushBack(L"SaveDir: " + _sSaveDir);
-	lines.pushBack(L"ShipBuffer: " + (long)m_iShipBuffer);
+	lines.pushBack(L"ShipBuffer: " + Utils::WString::Number(m_iShipBuffer));
 	Utils::WString wareBuffer = L"WareBuffers:";
 	for ( int i = 0; i < WAREBUFFERS; i++ )
 		wareBuffer += Utils::WString(L" ") + (long)m_iWareBuffer[i];
 	lines.pushBack(wareBuffer);
 	for ( int i = 0; i < WAREBUFFERS; i++ )
+	{
 		m_gameExe.parseExe(L"x2.exe|0:5:1:NOSAVESUBDIR:HKCU/Software/EgoSoftware/X2/ModName:X2 The Threat:!GAMEDIR!:2:1604608!2150400:1.4 Artifical Life:1974272:1.5 Uplink");
 		m_gameExe.parseExe(L"x3.exe|30:5:1:0:HKCU/Software/Egosoft/X3/ModName:X3 Reunion:Egosoft/X3:2:2347008:2.0 Bala Gi:2367488!2375680:2.5 Uplink");
 		m_gameExe.parseExe(L"x3tc.exe|35:5:1:NO_XOR|TC_TEXT|MYDOCLOG:HKCU/Software/Egosoft/X3TC/ModName:X3 Terran Conflict:Egosoft/X3TC:3:1933464!1933520:2.0 Aldrin Expansion:-1:2.5 A New Home (Superbox):-1:3.0 Balance of Power");
 		m_gameExe.parseExe(L"x3ap.exe|38:2:2:NO_XOR|TC_TEXT|MYDOCLOG|ADDON:HKCU/Software/Egosoft/X3AP/ModName:X3 Albion Prelude:Egosoft/X3AP:addon!x3tc.exe:3:-1:2.0 The War Continues:-1:2.5 Operation Loose Ends:-1:3.0 Shady Business");
-		m_gameExe.parseExe(L"x3fl.exe|39:3:3:NO_XOR|TC_TEXT|MYDOCLOG|ADDON:HKCU/Software/Egosoft/X3FL/ModName:X3 Farnham's Legacy:Egosoft/X3FL:addon2!x3tc.exe:0");
+		m_gameExe.parseExe(L"x3fl.exe|39:3:3:NO_XOR|TC_TEXT|SETTINGFILE|MYDOCLOG|ADDON:HKCU/Software/Egosoft/X3FL/ModName:X3 Farnham's Legacy:Egosoft/X3FL:addon2!x3tc.exe:0");
+	}
+}
 void CPackages::startup(const Utils::WString &dir, const Utils::WString &tempDir, const Utils::WString &myDoc, const Utils::WString &mod)
+{
 	startup(dir, tempDir, myDoc);
 			// write shipyard info
 			if ( gs->pPackage )
+			{
 				int doStart = start + 5;
-				for ( int i = SHIPYARD_ARGON; i &lt;= SHIPYARD_MAX; i *= 2 )
+				for (ShipyardRace i = ShipyardRace::Argon; i <= ShipyardRace::Max; i = static_cast<ShipyardRace>(static_cast<unsigned int&gt;(i) * 2))
+				{
-					writeData.push_back(Utils::WString(L"		<t id=\"") + (long)(doStart) + L"\">" + ((gs->pPackage->IsShipyard(i)) ? Utils::WString::Number(1) : Utils::WString::Number(0)) + L"</t>");
+					writeData.push_back(Utils::WString(L"		<t id=\"") + (long)(doStart) + L"\">" + ((gs->pPackage->isShipyard(i)) ? Utils::WString::Number(1) : Utils::WString::Number(0)) + L"</t>");
 					++doStart;
+				}
+			}
 			start += 20;
 			pckFile.WriteData((char *)pckData, newFileSize);
 			this->addCreatedFile(pckFile.fullFilename());
+		}
+	}
 	textFile.remove();
+	// write out the settings file
+	if (m_iGameFlags & EXEFLAG_SETTINGFILE)
+	{
+		CDirIO Dir(m_sCurrentDir);
+		if (!Dir.exists(L"types"))
+			Dir.create(L"types");
+		Dir.cd(L"types");
+		std::vector<Utils::WString> writeData;
+		CFileIO dataFile(Dir.file(L"manager.txt"));
+		if (dataFile.exists())
+			dataFile.remove();
+		writeData.push_back(L"Data;" + Utils::WString::Number(m_iLastUpdated) + L";" + Utils::WString::Number(this->countPackages(TYPE_SPK, true)) + L";" + Utils::WString::Number(lWares.size()) + L";" + Utils::WString::Number(lShips.size()) + L";");
+		for (CListNode<CBaseFile>* node = m_lPackages.Front(); node; node = node->next())
+		{
+			CBaseFile* p = node->Data();
+			if (!p->IsEnabled())
+				continue;
+			if (p->GetType() != TYPE_SPK)
+				continue;
+			CSpkFile* spk = (CSpkFile*)p;
+			// count text files
+			Utils::WStringList textEntries;
+			C_File* f = p->GetFirstFile(FILETYPE_TEXT);
+			while (f)
+			{
+				Utils::WString sLang;
+				Utils::WString id;
+				if (m_iGameFlags & EXEFLAG_TCTEXT)
+				{
+					id = f->baseName().token(L"-", 1);
+					sLang = f->baseName().token(L"-", 2);
+					if (sLang.empty())
+						sLang = L"NULL";
+					else
+						sLang = sLang.erase(0, 1);  // remove the "L"
+				}
+				else
+				{
+					sLang = f->baseName().left((int)f->baseName().length() - 4).padNumber(3);
+					id = f->baseName().mid(((int)f->baseName().length() - 4) + 1, 4);
+				}
+				if (sLang != L"NULL")
+				{
+					if (sLang.toInt() == lang)
+						textEntries.pushBack(id);
+				}
+				f = p->GetNextFile(f);
+			}
+			CLinkList<SSettingType>* settings = spk->settingsList();
+			Utils::WString str = L"Script;" + spk->name() + L";" + spk->author() + L";" + spk->version() + L";" + spk->name(lang) + L";" + Utils::WString::Number(textEntries.size());
+			for (auto itr = textEntries.begin(); itr != textEntries.end(); itr++)
+				str += L";" + (*itr)->str;
+			str += L";" + Utils::WString::Number(settings ? settings->size() : 0);
+			if (settings)
+			{
+				for (CListNode<SSettingType>* sNode = settings->Front(); sNode; sNode = sNode->next())
+				{
+					SSettingType* st = sNode->Data();
+					str += L";" + st->sKey + L";" + spk->getSetting(st);
+				}
+			}
+			writeData.push_back(str + L";");
+		}
+		for (CListNode<SGameWare>* node = lWares.Front(); node; node = node->next())
+		{
+			SGameWare* w = node->Data();
+			Utils::WString str;
+			if (w->pWare && w->iType == WARETYPE_ADDED)
+				str = this->convertTextString(w->sWareName);
+			else
+				str = L"-1";
+			str += L";" + Utils::WString(w->cType) + L";" + Utils::WString::Number(w->iPos);
+			writeData.push_back(L"Ware;" + str + L";");
+		}
+		for (CListNode<SGameShip>* node = lShips.Front(); node; node = node->next())
+		{
+			SGameShip* gs = node->Data();
+			if (gs->iType == WARETYPE_NONE)
+				continue;
+			Utils::WString str;
+			if (gs->pPackage && gs->iType == WARETYPE_ADDED)
+				str = gs->sShipID;
+			else
+				str = L"-1";
+			str += L";" + Utils::WString::Number(gs->iPos);
+			// write shipyard info
+			if (gs->pPackage && gs->iType == WARETYPE_ADDED)
+			{
+				for (ShipyardRace i = ShipyardRace::Argon; i <= ShipyardRace::Max; i = static_cast<ShipyardRace>(static_cast<unsigned int>(i) * 2))
+				{
+					if (gs->pPackage->isShipyard(i))
+						str += L";" + GetShipyardName(i);
+				}
+			}
+			writeData.push_back(L"Ship;" + str + L";");
+		}
+		dataFile.writeFileUTF(&writeData);
+	}
+}
 bool CPackages::isCurrentDir(const Utils::WString &dir) const
+{
 	Utils::WString cur = m_sCurrentDir;
+			{
 				SDummy *dummy = dNode->Data();
 				SDummyEntry *found = NULL;
 				for ( CListNode<SDummyEntry> *eNode = dummyList.Front(); eNode; eNode = eNode->next() )
+				{
 					if ( eNode->Data()->sSection.Compare(dummy->sSection) )
 					{
 						found = eNode->Data();
 						break;
 					}
 				}
 				if ( !found )
 				{
 					found = new SDummyEntry;
 					found->sSection = dummy->sSection;
 					dummyList.push_back(found);
+				}
 				// check if its already on the list
+{
 	for(CListNode<SWarePriceOverride> *node = m_lWarePrices.Front(); node; node = node->next()) {
 		if ( node->Data()->type == type ) {
 			if ( node->Data()->type == Ware_Custom && id.Compare(node->Data()->id) ) return node->Data()->relval;
 			else if ( node->Data()->type != Ware_Custom && node->Data()->pos == pos ) return node->Data()->relval;
 		}
 	}
 	return 0;
 }
 bool CPackages::_wareNotoOverride(enum WareTypes type, int pos, const Utils::WString &id, int *noto)
+{
 	for(CListNode<SWarePriceOverride> *node = m_lWarePrices.Front(); node; node = node->next()) {
 		if ( node->Data()->type == type && node->Data()->bNotority ) {
 	// make sure we can open the zip file
 	CBaseFile *archive = NULL;
 #ifdef _RAR
 	HANDLE hArcData;
 	int RHCode,PFCode;
-	char CmtBuf[16384];
+	wchar_t CmtBuf[16384];
 	struct RARHeaderDataEx HeaderData;
 	struct RAROpenArchiveDataEx OpenArchiveData;
 	// find the pluginmanager text to covnert to spkfile
 	if ( toInstall ) {
 		memset(&OpenArchiveData,0,sizeof(OpenArchiveData));
-		OpenArchiveData.ArcName=(char *)filename.c_str();
+		OpenArchiveData.ArcNameW=(wchar_t *)filename.c_str();
-		OpenArchiveData.CmtBuf=CmtBuf;
+		OpenArchiveData.CmtBufW=CmtBuf;
-		OpenArchiveData.CmtBufSize=sizeof(CmtBuf);
+		OpenArchiveData.CmtBufSize = sizeof(CmtBuf) / sizeof(CmtBuf[0]);
 		OpenArchiveData.OpenMode=RAR_OM_LIST;
 		hArcData=RAROpenArchiveEx(&OpenArchiveData);
 		if (OpenArchiveData.OpenResult!=0) return NULL;
 				break;
+			}
+		}
 		RARCloseArchive(hArcData);
+	}
-	if ( toInstall )
-		archive = new CArchiveFile(); // just installing an archive file
-	else
-		archive = new CSpkFile(); // converting to a spk file
 	memset(&OpenArchiveData,0,sizeof(OpenArchiveData));
-	OpenArchiveData.ArcName=(char *)filename.c_str();
+	OpenArchiveData.ArcNameW = (wchar_t*)filename.c_str();
-	OpenArchiveData.CmtBuf=CmtBuf;
+	OpenArchiveData.CmtBufW = CmtBuf;
-	OpenArchiveData.CmtBufSize=sizeof(CmtBuf);
+	OpenArchiveData.CmtBufSize = sizeof(CmtBuf) / sizeof(CmtBuf[0]);
 	OpenArchiveData.OpenMode=RAR_OM_EXTRACT;
 	OpenArchiveData.UserData=EXTRACT;
 	hArcData=RAROpenArchiveEx(&OpenArchiveData);
 	if (OpenArchiveData.OpenResult!=0) return NULL;
+	if (toInstall)
+		archive = new CArchiveFile(); // just installing an archive file
+	else
+		archive = new CSpkFile(); // converting to a spk file
 	HeaderData.CmtBuf=NULL;
 	memset(&OpenArchiveData.Reserved,0,sizeof(OpenArchiveData.Reserved));
 	bool error = false;
 	Utils::WString extractedFile = CDirIO(m_sTempDir).file(L"extracted.tst").findReplace(L"/", L"\\").findReplace(L"\\\\", L"\\");
 	while ((RHCode=RARReadHeaderEx(hArcData,&HeaderData))==0)
+	{
-		Utils::WString fileName = HeaderData.FileName;
+		Utils::WString fileName(HeaderData.FileNameW);
 		if ( HeaderData.FileAttr == 16 )
 			continue;
 		PFCode=RARProcessFileW(hArcData, RAR_EXTRACT, NULL, NULL);
 		if (PFCode!=0)

Subversion Repositories spk

(root)/libspk/src/Packages.cpp – Rev 241 → 248