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

 #include "XspFile.h"
 #include "TextDB.h"
 #include "Packages.h"
 #include "Utils/StringList.h"
+#include "CyString.h"
 #define DELETELIST(list) if ( list ) { list->MemoryClear(); delete list; }
 namespace SPK {
 	_lLasers(NULL),
 	_lMissiles(NULL),
 	_lCockpits(NULL),
 	_lComponentSections(NULL),
 	_lDummySections(NULL),
-	_lBodiesSections(NULL)
+	_lBodiesSections(NULL),
+	_lShips(NULL)
+{
 	m_bLoaded = false;
 	m_pMap = new FileList;
 	m_pModMap = new FileList;
 	m_iLang = 0;
+}
 CVirtualFileSystem::~CVirtualFileSystem(void)
+{
-	if ( m_pMap )		delete m_pMap;
+	_clear();
-	if ( m_pModMap )	delete m_pModMap;
 	if ( m_pTexts )		delete m_pTexts;
 	if ( m_pModTexts )  delete m_pModTexts;
-	DELETELIST(_lShields);
-	DELETELIST(_lLasers);
-	DELETELIST(_lMissiles);
-	DELETELIST(_lCockpits);
-	DELETELIST(_lComponentSections);
-	DELETELIST(_lDummySections);
-	DELETELIST(_lBodiesSections);
+}
+void CVirtualFileSystem::setAddon(const Utils::String &addon)
+{
+	m_sAddon = addon;
+}
 void CVirtualFileSystem::setLanguage(int iLang)
+{
 	m_iLang = iLang;
+}
+}
 Utils::String CVirtualFileSystem::nextShield()
+{
 	return _returnText(_lShields->Next());
 }
 Utils::String CVirtualFileSystem::firstComponentSection()
+{
 	if ( !_lComponentSections || _lComponentSections->empty() ) _updateComponentSections();
 	return _returnLine(_lComponentSections->First());
 Utils::String CVirtualFileSystem::firstDummySection()
+{
 	if ( !_lDummySections || _lDummySections->empty() ) _updateDummySections();
 	return _returnLine(_lDummySections->First());
 }
 Utils::String CVirtualFileSystem::nextDummySection()
+{
 	return _returnLine(_lDummySections->Next());
+}
+}
 Utils::String CVirtualFileSystem::nextBodiesSection()
+{
 	return _returnLine(_lBodiesSections->Next());
 }
 std::pair<Utils::String, Utils::String> CVirtualFileSystem::nextLaser()
+{
 	return _returnPair(_lLasers->Next());
+}
 std::pair<Utils::String, Utils::String>  CVirtualFileSystem::firstMissile()
+{
 	if ( !_lMissiles || _lMissiles->empty() ) _updateMissiles();
 	return _returnPair(_lMissiles->First());
 }
 std::pair<Utils::String, Utils::String> CVirtualFileSystem::nextMissile()
+{
 	return _returnPair(_lMissiles->Next());
+}
+}
 Utils::String CVirtualFileSystem::_returnID(Utils::SStringList *s)
+{
 	if ( s ) return s->str.token(";", -2);
 	return Utils::String::Null();
 }
 Utils::String CVirtualFileSystem::_returnLine(Utils::SStringList *s)
+{
 	if ( s ) return s->str;
 	return Utils::String::Null();
 }
 bool CVirtualFileSystem::LoadFilesystem(const Utils::String &dir, int maxPatch)
+{
 	return this->LoadFilesystem(dir, "", maxPatch);
+}
 	m_sDir = dir;
 	this->_clear();
 	int number = 1;
-	while ( CFileIO(CyString(dir) + "/" + CyString::Number(number).PadNumber(2) + ".cat").ExistsOld() )
+	while ( CFileIO::Exists(dir + "/" + Utils::String::PadNumber(number, 2) + ".cat") )
+	{
 		if ( maxPatch && maxPatch < number ) break;
-		CyString file = CyString(dir) + "/" + CyString::Number(number).PadNumber(2);
+		Utils::String file = dir + "/" + Utils::String::PadNumber(number, 2);
-		if ( !CFileIO(file + ".dat").ExistsOld() )
+		if ( !CFileIO::Exists(file + ".dat") )
 			break;
 		CCatFile cat;
 		if ( cat.Open(file + ".cat", m_sAddon, CATREAD_JUSTCONTENTS, false) == CATERR_NONE )
+		{
 			for ( CListNode<SInCatFile> *c = cat.GetFiles()->Front(); c; c = c->next() ) {
-				this->_addModFile(CFileIO(c->Data()->sFile).GetFullFilename().ToString(), CyString(file + ".cat").ToString(), m_pMap);
+				this->_addModFile(CFileIO(c->Data()->sFile).fullFilename(), file + ".cat", m_pMap);
 				m_bLoaded = true;
+			}
+		}
 		++number;
 	}
 	// add all the files from the mod
 	if ( !mod.empty() )
 		this->addMod(mod);
 	// now add all the extracted data
 	this->_addDir(m_sDir, "");
 	return m_bLoaded;
+}
 void CVirtualFileSystem::_addDir(const Utils::String &sStart, const Utils::String &sDir)
 		for ( SStringList *strNode = list->Head(); strNode; strNode = strNode->next ) {
 			if ( CDirIO(Dir.Dir(strNode->str)).IsDir() ) _addDir(sStart, sDir + "/" + strNode->str.ToString());
 			else if ( CFileIO(strNode->str).CheckFileExtension("cat") ) continue;
 			else if ( CFileIO(strNode->str).CheckFileExtension("dat") ) continue;
 			else this->_addFile(sDir + "/" + strNode->str.ToString(), Dir.File(strNode->str).ToString(), m_pMap);
 		}
 	}
 }
 void CVirtualFileSystem::_addFile(const Utils::String &sFile, const Utils::String &sDest, FileList *pList)
+{
 	(*pList)[sFile.asFilename().removeIf(0, '/').lower()] = sDest.findReplace("//", "/");
+}
+{
 	this->_addFile(sFile, sMod + "::" + sFile, pList);
+}
 bool CVirtualFileSystem::loadMod(const Utils::String &mod)
 {
 	bool loaded = false;
 	if ( !m_pModMap ) m_pModMap = new FileList;
 	CCatFile cat;
 	if ( CCatFile::Opened(cat.Open(mod, m_sAddon, CATREAD_JUSTCONTENTS, false), false) )
+	{
 		for ( CListNode<SInCatFile> *c = cat.GetFiles()->Front(); c; c = c->next() ) {
 			this->_addModFile(CFileIO(c->Data()->sFile).GetFullFilename().ToString(), mod, m_pModMap);
 			loaded = true;
 		}
 	}
 	return loaded;
+}
 bool CVirtualFileSystem::addMod(const Utils::String &mod)
+{
+	{
 		for ( CListNode<SInCatFile> *c = cat.GetFiles()->Front(); c; c = c->next() )
+		{
 			this->_addModFile(CFileIO(c->Data()->sFile).GetFullFilename().ToString(), mod, m_pMap);
 			loaded = true;
 		}
 	}
 	return loaded;
+}
 bool CVirtualFileSystem::textExists(int iLang, int iPage, int iID) const
 {
 	if ( iLang <= 0 ) iLang = m_iLang;
 	if ( m_pTexts ) {
 		if ( m_pTexts->exists(iLang, iPage, iID) ) return m_pTexts->exists(iLang, iPage, iID);
+	}
 	if ( m_pModTexts ) {
 		if ( m_pModTexts->exists(iLang, iPage, iID) ) return m_pModTexts->exists(iLang, iPage, iID);
 	}
 	return false;
+}
 Utils::String CVirtualFileSystem::findText(int iLang, int iPage, int iID) const
+{
 	if ( iLang <= 0 ) iLang = m_iLang;
 	if ( m_pTexts ) {
 		if ( m_pTexts->exists(iLang, iPage, iID) ) return m_pTexts->get(iLang, iPage, iID);
 	}
 	if ( m_pModTexts ) {
 		if ( m_pModTexts->exists(iLang, iPage, iID) ) return m_pModTexts->get(iLang, iPage, iID);
 	}
 	return Utils::String("ReadText") + (long)iPage + "-" + (long)iID;
 }
+const Utils::String &CVirtualFileSystem::directory() const
+{
+	return m_sDir;
+}
 bool CVirtualFileSystem::isFileAvailable(const Utils::String &file)
 {
 	return !this->_findFile(file).empty();
 }
+bool CVirtualFileSystem::isTextUpdated() const
+{
+	if ( m_pTexts ) return m_pTexts->anyTextLoaded();
+	return false;
+}
 Utils::String CVirtualFileSystem::_findFile(const Utils::String &file)
+{
 	Utils::String toFile = file.findReplace("\\", "/").lower();
 			if ( aitr != m_pMap->end() ) return aitr->second;
+		}
 		FileListItr itr = m_pMap->find(CFileIO(file).GetFullFilename().ToLower().c_str());
 		if ( itr == m_pMap->end() ) itr = m_pMap->find(CFileIO(_convertExtension(file)).GetFullFilename().ToLower().c_str());
 		if ( itr != m_pMap->end() ) return itr->second;
 	}
 	return "";
+}
 Utils::String CVirtualFileSystem::_extractFromCat(const Utils::String &sCat, const Utils::String &sFile, const Utils::String &sTo)
+{
 			if ( catFile.ExtractFile(sFile) ) return sFile;
+		}
+	}
 	return "";
 }
 Utils::String CVirtualFileSystem::_extract(const Utils::String &sFile, const Utils::String &sTo)
+{
 	// check if we need to unpack the file
 	if ( CCatFile::CheckPackedExtension(sFile) ) {
+	}
 	return sFile;
+}
 Utils::String CVirtualFileSystem::ExtractGameFile(const Utils::String &file, const Utils::String &to)
 {
 	Utils::String sIn = _findFile(file);
 	Utils::String sFile = file;
 	if ( sIn.empty() ) return "";
 	else if ( File.CheckFileExtension("xml") ) {
 		return File.ChangeFileExtension("pck").ToString();
+	}
 	else if ( File.CheckFileExtension("pbb") ) {
 		return File.ChangeFileExtension("bob").ToString();
 	}
 	else if ( File.CheckFileExtension("bob") ) {
 		return File.ChangeFileExtension("pbb").ToString();
 	}
 	else if ( File.CheckFileExtension("pbd") ) {
 		return File.ChangeFileExtension("bod").ToString();
 	}
 	else if ( File.CheckFileExtension("bod") ) {
 		return File.ChangeFileExtension("pbd").ToString();
 	}
 	return sFile;
 }
-CyStringList *CVirtualFileSystem::GetTShipsEntries()
+Utils::CStringList *CVirtualFileSystem::getTShipsEntries()
 {
-	Utils::String sTo = this->ExtractGameFile("types/tships.pck", CPackages::tempDirectory() + "/tships.txt");
-	if ( !sTo.empty() ) {
-		CFileIO TShips(sTo);
-		if ( TShips.exists() )
-		{
-			CyStringList *lines = TShips.ReadLinesStr();
-			if ( lines )
-			{
-				// remove any commands, blank lines, and start
-				// and put the id as the data
-				int entries = -1;
-				for ( SStringList *str = lines->Head(); str; str = str->next )
-				{
-					str->str.RemoveFirstSpace();
-					str->str.RemoveChar(9);
-					str->str.RemoveChar('\r');
-					str->str.RemoveChar('\n');
-					if ( str->str.Empty() )
-					{
-						str->remove = true;
-						continue;
-					}
-					if ( str->str[0] == '/' )
-					{
-						str->remove = true;
-						continue;
-					}
-					if ( entries == -1 )
-					{
-						entries = str->str.GetToken(";", 2, 2).ToInt();
-						str->remove = true;
-						continue;
-					}
-					// hopefully we now have a valid tships line
+	if ( !_lShips || _lShips->empty() ) _updateShips();
-					int num = -1;
-					while ( str->data.Empty() )
-						str->data = str->str.GetToken(";", num--, (num + 2));
-				}
-			}
-			// remove the tmp file
-			TShips.remove();
-			if ( lines )
-				lines->RemoveMarked();
-			return lines;
+	return _lShips;
-		}
-	}
-	return NULL;
 }
 C_File *CVirtualFileSystem::extractGameFileToPackage(CBaseFile *pPackage, const Utils::String &sFile, FileType iFileType)
 {
 	return this->extractGameFileToPackage(pPackage, sFile, iFileType, sFile);
+}
 C_File *CVirtualFileSystem::extractGameFileToPackage(CBaseFile *pPackage, const Utils::String &sFile, FileType iFileType, const Utils::String &sTo)
+{
 			if ( f->ReadFromFile(CPackages::GetTempDirectory() + "tmp.dat") ) {
 				File.remove();
 				return f;
+			}
+		}
 		File.remove();
+	}
 	return NULL;
+}
 Utils::String CVirtualFileSystem::getTShipsEntry(const Utils::String &sId)
+{
-	CyStringList *ships = this->GetTShipsEntries();
+	if ( !_lShips || _lShips->empty() ) _updateShips();
-	if ( ships )
-	{
-		SStringList *node = ships->FindData(CyString(sId).upper());
+	return _lShips->findData(sId, true);
-		if ( node )
-			return node->str.ToString();
-	}
-	return "";
+}
 void CVirtualFileSystem::extractTexts(CXspFile *pPackage, int textId)
+{
 	//TODO: check for better finding of files in map
 	if ( m_pMap ) delete m_pMap;
 	m_pMap = new FileList;
 	if ( m_pModMap ) delete m_pModMap;
 	m_pModMap = new FileList;
+	DELETELIST(_lShields);
+	DELETELIST(_lLasers);
+	DELETELIST(_lMissiles);
+	DELETELIST(_lCockpits);
+	DELETELIST(_lComponentSections);
+	DELETELIST(_lDummySections);
+	DELETELIST(_lBodiesSections);
+	DELETELIST(_lShips);
+}
 void CVirtualFileSystem::_updateTexts(int iFromPage, int iToPage, FileList *pFileList, CTextDB *pTextList)
 {
 	// read all text files
 	for ( FileListItr itr = pFileList->begin(); itr != pFileList->end(); ++itr ) {
 		Utils::String str = itr->first;
 		if ( !m_sAddon.empty() ) {
 				continue;
+		}
 		else {
 			if ( !str.left(2).Compare("t\\") && !str.left(2).Compare("t/") )
 				continue;
 		}
 		Utils::String sTo = this->ExtractGameFile(str, CPackages::tempDirectory() + "tmp.dat");
 		if ( !sTo.empty() ) {
 			// add all texts into the map, id=(pageid, tid) data=text
 			Utils::String baseFile = CFileIO(str).baseName();
 			int lang = (baseFile.isin("-L")) ? baseFile.right(3) : baseFile.truncate(-4);
 			if ( m_iLang && lang != m_iLang ) continue;
 			// open the text file to add
 			pTextList->parseTextFile(iFromPage, iToPage, sTo, lang);
 		}
 	}
+}
 void CVirtualFileSystem::clearMods(bool bIncludeStandard)
+{
 	if ( bIncludeStandard ) {
 		m_pTexts = new CTextDB();
+	}
 	if ( m_pModTexts ) delete m_pModTexts;
 	m_pModTexts = new CTextDB();
-}
-bool CVirtualFileSystem::loadShipData(CyStringList *list)
-{
-	bool ret = false;
-	Utils::String sTo = this->ExtractGameFile("types/TShips.pck", CPackages::tempDirectory() + "tmp.dat");
-	if ( !sTo.empty() ) {
-		CFileIO File(sTo);
-		CyStringList *lines = File.ReadLinesStr();
-		if ( lines )
-		{
-			bool readFirst = false;
-			for ( SStringList *str = lines->Head(); str; str = str->next )
-			{
-				if ( str->str.Empty() )
-					continue;
-				str->str.RemoveChar('\r');
-				str->str.RemoveChar(9);
-				str->str.RemoveFirstSpace();
-				if ( str->str.Empty() )
-					continue;
-				if ( str->str[0] == '/' || str->str[0] == '#' )
-					continue;
-				if ( !readFirst )
-					readFirst = true;
-				else
-				{
-					CyString t = str->str.GetToken(";", -2);
-					while ( t.Right(1) == ";" )
-						t.Truncate((int)t.Length() - 1);
-					list->PushBack(t, str->str);
-				}
-			}
-			delete lines;
-			ret = true;
-		}
-		File.remove();
-	}
-	return ret;
+}
 Utils::CStringList *CVirtualFileSystem::_updateList(const Utils::String &typesFile, int iTextPos)
+{
 	Utils::CStringList *list = new Utils::CStringList();
 void CVirtualFileSystem::_updateCockpits()
+{
 	DELETELIST(_lCockpits);
 	_lCockpits = _updateList("TCockpits", -1);
+}
+void CVirtualFileSystem::_updateShips()
+{
+	DELETELIST(_lShips);
+	_lShips = _updateList("TShips", -1);
+}
 void CVirtualFileSystem::_updateComponentSections()
+{
 	DELETELIST(_lComponentSections);

Subversion Repositories spk

(root)//libspk/src/VirtualFileSystem.cpp – Rev 94 → 101