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

 int CBaseFile::CheckFile(const Utils::WString &filename, float *version )
+{
 	CFileIO File(filename);
 	if ( !File.startRead() ) return 0;
-	Utils::String line = File.readEndOfLineStr();
+	Utils::WString line = File.readEndOfLine();
-	Utils::String type = line.token(";", 1);
+	Utils::WString type = line.token(L";", 1);
 	File.close();
 	// check for old version
-	if ( line.left(3) == "HiP" ) return SPKFILE_OLD;
+	if ( line.left(3) == L"HiP" ) return SPKFILE_OLD;
 	// check for format
-	if ( version ) *version = line.token(";", 2);
+	if ( version ) *version = line.token(L";", 2);
-	if ( type == "BaseCycrow" )	return SPKFILE_BASE;
+	if ( type == L"BaseCycrow" )	return SPKFILE_BASE;
-	if ( type == "SPKCycrow" )	return SPKFILE_SINGLE;
+	if ( type == L"SPKCycrow" )	return SPKFILE_SINGLE;
-	if ( type == "XSPCycrow" )	return SPKFILE_SINGLESHIP;
+	if ( type == L"XSPCycrow" )	return SPKFILE_SINGLESHIP;
-	if ( type == "MSPKCycrow" )	return SPKFILE_MULTI;
+	if ( type == L"MSPKCycrow" )	return SPKFILE_MULTI;
 	return SPKFILE_INVALID;
+}
 void CBaseFile::ClearFileData()
+{
 	_addFile(newfile);
 	return newfile;
+}
-bool CBaseFile::addFileNow(const Utils::String &file, const Utils::String &dir, FileType type, CProgressInfo* progress)
+bool CBaseFile::addFileNow(const Utils::WString &file, const Utils::WString &dir, FileType type, CProgressInfo* progress)
+{
 	C_File* f = addFile(file, dir, type);
 	if (!f->ReadFromFile())
 		return false;
 			return f;
+	}
 	return NULL;
+}
-bool CBaseFile::removeFile(const Utils::String& file, FileType type, const Utils::String& dir, int game)
+bool CBaseFile::removeFile(const Utils::WString& file, FileType type, const Utils::WString& dir, int game)
+{
 	C_File* f = findFile(file, type, dir, game);
 	if (!f)
 		return false;
 	return removeFile(f);
+	}
 	return true;
+}
-Utils::String CBaseFile::_install_adjustFilepointer(C_File *pFile, bool bEnabled, const Utils::WString &sDestination)
+Utils::WString CBaseFile::_install_adjustFilepointer(C_File *pFile, bool bEnabled, const Utils::WString &sDestination)
+{
 	Utils::WString filename = sDestination;
 	if ( !filename.empty() ) filename += L"/";
 	if ( (IsPatch()) && (pFile->fileType() == FILETYPE_MOD) )
 		pFile->SetDisabled(true);
+	}
 	CLog::logf(CLog::Log_Install, 2, "Adjusting the file pointer to correct install destintation, %s", pFile->filePointer().c_str());
-	return filename.toString();
+	return filename;
+}
 C_File *CBaseFile::_install_checkFile(C_File *pFile, Utils::WStringList *errorStr, bool *bDoFile, CLinkList<C_File> *pFileList)
+{
 	if ( !pFile->IsFakePatch() && pFile->GetFileType() != FILETYPE_README )
 	Func:   ParseHeader
 	Input:  Header String - string formated directly from the file
 	Return: Boolean - If string is a valid header
 	Desc:   Splits up the main header string to get all required settings
 */
-bool CBaseFile::_parseHeader(const Utils::String &header)
+bool CBaseFile::_parseHeader(const Utils::WString &header)
+{
-	if ( !this->_checkHeader(header.token(";", 1)))
+	if ( !this->_checkHeader(header.token(L";", 1)))
 		return false;
-	m_SHeader.fVersion = header.token(";", 2).toFloat();
+	m_SHeader.fVersion = header.token(L";", 2).toFloat();
 	if ( m_SHeader.fVersion > FILEVERSION )
 		return false;
-	m_SHeader.iValueCompression = header.token(";", 3).toInt();
+	m_SHeader.iValueCompression = header.token(L";", 3).toInt();
-	m_SHeader.lValueCompressSize = header.token(";", 4).toLong();
+	m_SHeader.lValueCompressSize = header.token(L";", 4).toLong();
 	return true;
+}
-bool CBaseFile::_checkHeader(const Utils::String header) const
+bool CBaseFile::_checkHeader(const Utils::WString &header) const
+{
-	if ( header.Compare("BaseCycrow") )
+	if ( header.Compare(L"BaseCycrow") )
 		return true;
 	return false;
+}
 /*
 	Func:   ParseFileHeader
 	Input:  Header String - string formated directly from the file
 	Return: Boolean - If string is a valid header
 	Desc:   Splits up the file header string to get all required settings
 */
-bool CBaseFile::_parseFileHeader(const Utils::String &header)
+bool CBaseFile::_parseFileHeader(const Utils::WString &header)
+{
-	if (header.token(";", 1) != "FileHeader")
+	if (header.token(L";", 1) != L"FileHeader")
 		return false;
-	m_SHeader2.iNumFiles = header.token(";", 2).toInt();
+	m_SHeader2.iNumFiles = header.token(L";", 2).toInt();
-	m_SHeader2.lSize = header.token(";", 3).toInt();
+	m_SHeader2.lSize = header.token(L";", 3).toInt();
-	m_SHeader2.lFullSize = header.token(";", 4).toInt();
+	m_SHeader2.lFullSize = header.token(L";", 4).toInt();
-	m_SHeader2.iFileCompression = header.token(";", 5).toInt();
+	m_SHeader2.iFileCompression = header.token(L";", 5).toInt();
-	m_SHeader2.iDataCompression = header.token(";", 6).toInt();
+	m_SHeader2.iDataCompression = header.token(L";", 6).toInt();
 	return true;
+}
 	Func:   ParseFilesLine
 	Input:  String - single line from a file to set
 	Return: Boolean - returns true if value exists
 	Desc:   Reads the line and assigns the parameters for the file
 */
-bool CBaseFile::_parseFilesLine(const Utils::String &line)
+bool CBaseFile::_parseFilesLine(const Utils::WString &line)
+{
-	if ( !line.contains(":") )
+	if ( !line.contains(L":") )
 		return false;
-	Utils::String command = line.token(":", 1);
+	Utils::WString command = line.token(L":", 1);
-	long size = line.token(":", 2).toInt();
+	long size = line.token(L":", 2).toInt();
-	long usize = line.token(":", 3).toInt ();
+	long usize = line.token(L":", 3).toInt ();
-	long compression = line.token(":", 4).toInt ();
+	long compression = line.token(L":", 4).toInt ();
-	if ( command == "Icon" )
+	if ( command == L"Icon" )
+	{
-		_sIconExt = line.token(":", 5).toWString();
+		_sIconExt = line.token(L":", 5);
 		m_pIconFile = new C_File ();
 		m_pIconFile->SetDataSize ( size - 4 );
 		m_pIconFile->SetDataCompression ( compression );
 		m_pIconFile->SetUncompressedDataSize ( usize );
 		return true;
+	}
-	time_t time = line.token(":", 5).toLong();
+	time_t time = line.token(L":", 5).toLong();
-	bool compressToFile = (line.token(":", 6).toInt() == 1) ? true : false;
+	bool compressToFile = (line.token(L":", 6).toInt() == 1) ? true : false;
-	Utils::String name  = line.token(":", 7);
+	Utils::WString name  = line.token(L":", 7);
-	Utils::String dir = line.token(":", 8);
+	Utils::WString dir = line.token(L":", 8);
 	if ( name.empty() )
 		return true;
 	bool shared = false;
-	if ( command.left(1) == "$" )
+	if ( command.left(1) == L"$" )
+	{
 		shared = true;
 		command.erase(0, 1);
+	}
 	FileType type = FILETYPE_UNKNOWN;
-	if ( command == "Script" )
+	if ( command == L"Script" )
 		type = FILETYPE_SCRIPT;
-	else if ( command == "Text" )
+	else if ( command == L"Text" )
 		type = FILETYPE_TEXT;
-	else if ( command == "Readme" )
+	else if ( command == L"Readme" )
 		type = FILETYPE_README;
-	else if ( command == "Map" )
+	else if ( command == L"Map" )
 		type = FILETYPE_MAP;
-	else if ( command == "Mod" )
+	else if ( command == L"Mod" )
 		type = FILETYPE_MOD;
-	else if ( command == "Uninstall" )
+	else if ( command == L"Uninstall" )
 		type = FILETYPE_UNINSTALL;
-	else if ( command == "Sound" )
+	else if ( command == L"Sound" )
 		type = FILETYPE_SOUND;
-	else if ( command == "Mission" )
+	else if ( command == L"Mission" )
 		type = FILETYPE_MISSION;
-	else if ( command == "Extra" )
+	else if ( command == L"Extra" )
 		type = FILETYPE_EXTRA;
-	else if ( command == "Screen" )
+	else if ( command == L"Screen" )
 		type = FILETYPE_SCREEN;
-	else if ( command == "Backup" )
+	else if ( command == L"Backup" )
 		type = FILETYPE_BACKUP;
-	else if ( command == "Advert" )
+	else if ( command == L"Advert" )
 		type = FILETYPE_ADVERT;
-	else if ( command == "ShipScene" )
+	else if ( command == L"ShipScene" )
 		type = FILETYPE_SHIPSCENE;
-	else if ( command == "CockpitScene" )
+	else if ( command == L"CockpitScene" )
 		type = FILETYPE_COCKPITSCENE;
-	else if ( command == "ShipOther" )
+	else if ( command == L"ShipOther" )
 		type = FILETYPE_SHIPOTHER;
-	else if ( command == "ShipModel" )
+	else if ( command == L"ShipModel" )
 		type = FILETYPE_SHIPMODEL;
 	if (type == FILETYPE_UNKNOWN)
 		return false;
 	C_File *file = new C_File();
-	if (dir.left(5).Compare("GAME_")) {
+	if (dir.left(5).Compare(L"GAME_")) {
-		unsigned int iGame = dir.token("_", 2).toInt();
+		unsigned int iGame = dir.token(L"_", 2).toInt();
 		if (!iGame)
 			file->setGame(0);
 		else
 			file->setGame(1 << 31 | 1 << iGame);
-		dir = Utils::String::Null();
+		dir = Utils::WString::Null();
+	}
-	else if ( line.countToken(":") >= 9 )
+	else if ( line.countToken(L":") >= 9 )
+	{
-		Utils::String game = line.token(":", 9);
+		Utils::WString game = line.token(L":", 9);
-		if (game.contains("_"))
+		if (game.contains(L"_"))
+		{
-			unsigned int iGame = game.token("_", 2).toInt();
+			unsigned int iGame = game.token(L"_", 2).toInt();
 			if (iGame)
 				file->setGame(1 << 31 | 1 << iGame);
 			else
 				file->setGame(0);
+		}
 			else
 				file->setGame(1 << 31 | 1 << iGame);
+		}
+	}
-	if (dir.Compare("NULL")) {
+	if (dir.Compare(L"NULL")) {
-		dir = Utils::String::Null();
+		dir = Utils::WString::Null();
+	}
 	file->setFileType(type);
 	file->SetCreationTime ( time );
 	file->setName(name);
 	Input:  filename - the name of the file to open and read
 			readdata - If falses, dont read the files to memory, just read the headers and values
 	Return: boolean - return ture if acceptable format
 	Desc:   Opens and reads the spk file and loads all data into class
 */
-bool CBaseFile::readFile(const Utils::String &filename, int readtype, CProgressInfo *progress)
+bool CBaseFile::readFile(const Utils::WString &filename, int readtype, CProgressInfo *progress)
+{
 	CFileIO File(filename);
 	if ( !File.startRead() ) return false;
 	bool ret = this->readFile(File, readtype, progress);
 	return true;
+}
 bool CBaseFile::IsMod()
 {
 	// check for any mod files that are not fake patchs
 	for ( CListNode<C_File> *fNode = m_lFiles.Front(); fNode; fNode = fNode->next() )
 	{
 		C_File *f = fNode->Data();
 		if ( f->GetFileType() != FILETYPE_MOD )
 			continue;
 		if ( !f->IsFakePatch() )
 			return true;
+	}
 			values += Utils::WString(L"GameCompat: ") + (long)gc->Data()->iGame + L" " + (long)gc->Data()->iVersion + L"\n";
+	}
 	if (computeSigned(true))
 		values += L"Signed\n";
 	for ( int j = 0; j < 2; j++ ) {
 		const CInstallText *text;
 		Utils::WString textStart;
 		switch(j) {
 			case 0:	textStart = L"Uninstall"; text = this->uninstallText(); break;
 			case 1: textStart = L"Install"; text = this->installText(); break;
 		}
 		for ( unsigned int i = 0; i < text->count(); i++ ) {
 			int iLang = text->language(i);
 			if ( !text->getBefore(iLang).empty() ) values += textStart + L"Before: " + (long)iLang + L"|" + text->getBefore(iLang) + L"\n";
 			if ( !text->getAfter(iLang).empty() ) values += textStart + L"After: " + (long)iLang + L"|" + text->getAfter(iLang) + L"\n";
+		}
 	for (auto itr = _lFakePatchBefore.begin(); itr != _lFakePatchBefore.end(); itr++)
 		values += L"FakePatchBefore: " + (*itr)->str + L"||" + (*itr)->data + L"\n";
 	for (auto itr = _lFakePatchAfter.begin(); itr != _lFakePatchAfter.end(); itr++)
 		values += L"FakePatchAfter: " + (*itr)->str + L"||" + (*itr)->data + L"\n";
 	values += Utils::WString(L"PluginType: ") + (long)this->pluginType() + L"\n";
 	return values;
+}
 /*
 	Func:   WriteFile
 	Input:  filename - The filename of the spk file to write to
 	Desc:   Writes the data to an spk file
 */
-bool CBaseFile::writeFile(const Utils::String &filename, CProgressInfo *progress) const
+bool CBaseFile::writeFile(const Utils::WString &filename, CProgressInfo *progress) const
+{
 	CFileIO File(filename);
 	if ( File.startWrite() ) return writeData(File, progress);
 	return false;
+}
+	{
 		valueComprLen = valueUncomprLen;
 		valueCompr = (unsigned char *)calloc((unsigned int)valueComprLen, 1);
 		memcpy ( valueCompr, (const unsigned char *)data, valueComprLen );
 		valueheader = SPKCOMPRESS_NONE;
 	}
 	// write the main header to the file
 	if ( !this->writeHeader(file, valueheader, valueComprLen) )	return false;
 	// write the compressed data to file
 	file.put(static_cast<unsigned char>(valueUncomprLen >> 24));
+			}
 			if ( progress ) progress->IncDone((int)writeSize);
+		}
+	}
 	return true;
-}
-bool CBaseFile::extractFile(C_File *file, const Utils::String &dir, bool includedir, CProgressInfo *progress)
-{
-	if (ReadFileToMemory(file))
-	{
-		// now finally, uncompress the file
-		long len = 0;
-		unsigned char *data = file->UncompressData(&len, progress);
-		if (!data)
-		{
-			// attempt a file decompress
-			if (file->GetCompressionType() == SPKCOMPRESS_7ZIP)
-			{
-				if (file->uncompressToFile(dir, this, includedir, progress))
-					return true;
-			}
-			return false;
-		}
-		if (!file->writeToDir(dir, this, includedir, Utils::String::Null(), data, len))
-			return false;
-		return true;
-	}
-	else
-		return false;
+}
+bool CBaseFile::extractFile(C_File *file, const Utils::WString &dir, bool includedir, CProgressInfo *progress)
+{
+	if (ReadFileToMemory(file))
+	{
+		// now finally, uncompress the file
+		long len = 0;
+		unsigned char *data = file->UncompressData(&len, progress);
+		if (!data)
+		{
+			// attempt a file decompress
+			if (file->GetCompressionType() == SPKCOMPRESS_7ZIP)
+			{
+				if (file->uncompressToFile(dir, this, includedir, progress))
+					return true;
+			}
+			return false;
+		}
+		if (!file->writeToDir(dir, this, includedir, Utils::WString::Null(), data, len))
+			return false;
+		return true;
+	}
+	else
+		return false;
+}
-bool CBaseFile::extractFile(C_File *file, const Utils::String &dir, unsigned int game, const Utils::WStringList &gameAddons, bool includedir, CProgressInfo *progress)
+bool CBaseFile::extractFile(C_File *file, const Utils::WString &dir, unsigned int game, const Utils::WStringList &gameAddons, bool includedir, CProgressInfo *progress)
+{
 	if (ReadFileToMemory(file))
+	{
 		CDirIO Dir(dir);
 		Utils::WString addonDir;
 		if (!data)
+		{
 			// attempt a file decompress
 			if (file->GetCompressionType() == SPKCOMPRESS_7ZIP)
+			{
-				if (file->uncompressToFile(Dir.dir().toString(), this, includedir, progress))
+				if (file->uncompressToFile(Dir.dir(), this, includedir, progress))
 					return true;
+			}
 			return false;
+		}
-		if (!file->writeToDir(Dir.dir().toString(), this, includedir, Utils::String::Null(), data, len))
+		if (!file->writeToDir(Dir.dir(), this, includedir, Utils::WString::Null(), data, len))
 			return false;
 		return true;
+	}
 	else
 		return false;
 }
-bool CBaseFile::extractFile(int filenum, const Utils::String &dir, unsigned int game, const Utils::WStringList &gameAddons, bool includedir, CProgressInfo *progress)
+bool CBaseFile::extractFile(int filenum, const Utils::WString &dir, unsigned int game, const Utils::WStringList &gameAddons, bool includedir, CProgressInfo *progress)
 {
 	// invalid valus
 	if (filenum < 0)
 		return false;
 	// out of range
 	if (filenum > m_lFiles.size())
 		return false;
 	// get the file pointer
 	C_File *file = m_lFiles.Get(filenum);
 	return extractFile(file, dir, game, gameAddons, includedir, progress);
+}
-bool CBaseFile::extractFile(int filenum, const Utils::String &dir, bool includedir, CProgressInfo *progress)
+bool CBaseFile::extractFile(int filenum, const Utils::WString &dir, bool includedir, CProgressInfo *progress)
+{
 	// invalid valus
 	if (filenum < 0)
 		return false;
 	// out of range
 	if (filenum > m_lFiles.size())
 		return false;
 	// get the file pointer
 	C_File *file = m_lFiles.Get(filenum);
 	return extractFile(file, dir, includedir, progress);
+}
-bool CBaseFile::extractAll(const Utils::String &dir, int game, const Utils::CStringList &gameAddons, bool includedir, CProgressInfo *progress)
+bool CBaseFile::extractAll(const Utils::WString &dir, int game, const Utils::WStringList &gameAddons, bool includedir, CProgressInfo *progress)
+{
 	// no file to read from
 	if (this->filename().empty())
 		return false;
 		if (progress)
 			progress->UpdateFile(fit);
 		CDirIO Dir(dir);
-		Utils::String addonDir;
+		Utils::WString addonDir;
 		if (fit->isFileInAddon())
+		{
 			int addonGame = fit->getForSingleGame();
 			if (!addonGame) addonGame = game;
 			if (addonGame > 0)
-				addonDir = gameAddons.findString(Utils::String::Number(addonGame));
+				addonDir = gameAddons.findString(Utils::WString::Number(addonGame));
+		}
 		if (!addonDir.empty())
 			Dir.cd(addonDir);
 		Dir.create(fit->getDirectory(this));
 		long size = 0;
 		unsigned char *data = fit->UncompressData(&size, progress);
 		if ((!data) && (fit->GetCompressionType() == SPKCOMPRESS_7ZIP)) {
-			if (!fit->uncompressToFile(Dir.dir().toString(), this, includedir, progress)) return false;
+			if (!fit->uncompressToFile(Dir.dir(), this, includedir, progress)) return false;
+		}
-		else if ((!data) || (!fit->writeToDir(Dir.dir().toString(), this, includedir, Utils::String::Null(), data, size))) return false;
+		else if ((!data) || (!fit->writeToDir(Dir.dir(), this, includedir, Utils::WString::Null(), data, size))) return false;
+	}
 	delete File;
 	return true;
+}
 	if ( !version.empty() )	this->addNeededLibrary(L"<package>", L"<author>", version);
+}
-bool CBaseFile::GeneratePackagerScript(bool wildcard, Utils::CStringList *list, int game, const Utils::CStringList &gameAddons, bool datafile)
+bool CBaseFile::GeneratePackagerScript(bool wildcard, Utils::WStringList *list, int game, const Utils::WStringList &gameAddons, bool datafile)
+{
-	list->pushBack("#");
+	list->pushBack(L"#");
-	list->pushBack("# Packager Script");
+	list->pushBack(L"# Packager Script");
-	list->pushBack("# -- Generated by SPK Libraries V" + Utils::String::FromFloat(GetLibraryVersion(), 2) + " --");
+	list->pushBack(L"# -- Generated by SPK Libraries V" + Utils::WString::FromFloat(GetLibraryVersion(), 2) + L" --");
-	list->pushBack("#");
+	list->pushBack(L"#");
-	list->pushBack("");
+	list->pushBack(L"");
 	if ( !datafile )
+	{
-		list->pushBack("# Variable for your game directory, where to get files from");
+		list->pushBack(L"# Variable for your game directory, where to get files from");
-		list->pushBack("# $PATH variable is used to get the current path");
+		list->pushBack(L"# $PATH variable is used to get the current path");
-		list->pushBack("Variable: $GAMEDIR $PATH");
+		list->pushBack(L"Variable: $GAMEDIR $PATH");
-		list->pushBack("");
+		list->pushBack(L"");
+	}
-	list->pushBack("# The name of the script");
+	list->pushBack(L"# The name of the script");
-	list->pushBack("Name: " + this->name().toString());
+	list->pushBack(L"Name: " + this->name());
-	list->pushBack("");
+	list->pushBack(L"");
-	list->pushBack("# The author of the script, ie, you");
+	list->pushBack(L"# The author of the script, ie, you");
-	list->pushBack("Author: " + this->author().toString());
+	list->pushBack(L"Author: " + this->author());
-	list->pushBack("");
+	list->pushBack(L"");
-	list->pushBack("# The creation data, when it was created");
+	list->pushBack(L"# The creation data, when it was created");
 	if ( datafile )
-		list->pushBack("Date: " + this->creationDate().toString());
+		list->pushBack(L"Date: " + this->creationDate());
 	else {
-		list->pushBack("# $DATE variable is used to get the current date");
+		list->pushBack(L"# $DATE variable is used to get the current date");
-		list->pushBack("Date: $DATE");
+		list->pushBack(L"Date: $DATE");
+	}
-	list->pushBack("");
+	list->pushBack(L"");
-	list->pushBack("# The version of script");
+	list->pushBack(L"# The version of script");
 	if ( datafile )
-		list->pushBack("Version: " + this->version().toString());
+		list->pushBack(L"Version: " + this->version());
 	else
+	{
-		list->pushBack("# $ASK variable is used to get an input when creating");
+		list->pushBack(L"# $ASK variable is used to get an input when creating");
-		list->pushBack("Version: $ASK");
+		list->pushBack(L"Version: $ASK");
+	}
-	list->pushBack("");
+	list->pushBack(L"");
 	if ( !m_lGames.empty() ) {
-		list->pushBack("# The game version the script is for <game> <version> (can have multiple games)");
+		list->pushBack(L"# The game version the script is for <game> <version> (can have multiple games)");
 		for ( SGameCompat *g = m_lGames.First(); g; g = m_lGames.Next() ) {
 			if (game > 0 && g->iGame != game)
 				continue;
 			Utils::WString game = CBaseFile::ConvertGameToString(g->iGame);
+			{
 				game += L" ";
 				game += (long)g->iVersion;
+			}
-			list->pushBack("Game: " + game.toString());
+			list->pushBack(L"Game: " + game);
+		}
-		list->pushBack("");
+		list->pushBack(L"");
+	}
 	if ( !this->description().empty() ) {
-		list->pushBack("# The description of the script, displays when installing");
+		list->pushBack(L"# The description of the script, displays when installing");
-		list->pushBack("Description: " + this->description().toString());
+		list->pushBack(L"Description: " + this->description());
-		list->pushBack("");
+		list->pushBack(L"");
+	}
 	if ( !this->webSite().empty() ) {
-		list->pushBack("# A link to the website for the script, ie for an online help page");
+		list->pushBack(L"# A link to the website for the script, ie for an online help page");
-		list->pushBack("WebSite: " + this->webSite().toString());
+		list->pushBack(L"WebSite: " + this->webSite());
-		list->pushBack("");
+		list->pushBack(L"");
+	}
 	if ( !this->forumLink().empty() ) {
-		list->pushBack("# A direct link to the thread in the egosoft forum");
+		list->pushBack(L"# A direct link to the thread in the egosoft forum");
-		list->pushBack("ForumLink: " + this->forumLink().toString());
+		list->pushBack(L"ForumLink: " + this->forumLink());
-		list->pushBack("");
+		list->pushBack(L"");
+	}
 	if ( !this->webAddress().empty() ) {
-		list->pushBack("# A link to the address for the update file");
+		list->pushBack(L"# A link to the address for the update file");
-		list->pushBack("WebAddress: " + this->webAddress().toString());
+		list->pushBack(L"WebAddress: " + this->webAddress());
-		list->pushBack("");
+		list->pushBack(L"");
+	}
 	if ( !this->email().empty() ) {
-		list->pushBack("# The email address of the author, to allow users to contract if needed");
+		list->pushBack(L"# The email address of the author, to allow users to contract if needed");
-		list->pushBack("Email: " + this->email().toString());
+		list->pushBack(L"Email: " + this->email());
-		list->pushBack("");
+		list->pushBack(L"");
+	}
 	if (webMirrors().size())
+	{
-		list->pushBack("# A link to the mirror address for the update file, can have many of these");
+		list->pushBack(L"# A link to the mirror address for the update file, can have many of these");
 		for(auto itr = webMirrors().begin(); itr != webMirrors().end(); itr++)
-			list->pushBack(Utils::String("WebMirror: ") + (*itr)->str.toString());
+			list->pushBack(Utils::WString(L"WebMirror: ") + (*itr)->str);
-		list->pushBack("");
+		list->pushBack(L"");
+	}
 	if ( m_bAutoGenerateUpdateFile )
+	{
-		list->pushBack("# Auto generate the package update file when created");
+		list->pushBack(L"# Auto generate the package update file when created");
-		list->pushBack("GenerateUpdateFile");
+		list->pushBack(L"GenerateUpdateFile");
+	}
 	if ( m_lNeededLibrarys.size() )
+	{
-		list->pushBack("# Needed Library dependacies, require these to be installed");
+		list->pushBack(L"# Needed Library dependacies, require these to be installed");
 		for ( CListNode<SNeededLibrary> *node = m_lNeededLibrarys.Front(); node; node = node->next() )
-			list->pushBack((L"Depend: " + node->Data()->sName + L"|" + node->Data()->sMinVersion + L"|" + node-&gt;Data()->sAuthor).toString());
+			list->pushBack(L"Depend: " + node->Data()->sName + L"|" + node->Data()->sMinVersion + L&quot;|" + node->;Data()->sAuthor);
-		list->pushBack("");
+		list->pushBack(L"");
+	}
 	if ( !_noRatings() )
+	{
-		list->pushBack("# Ratings Values, 0 to 5, <ease> <changing> <recommended>");
+		list->pushBack(L"# Ratings Values, 0 to 5, <ease> <changing> <recommended>");
-		list->pushBack(Utils::String("Ratings: ") + (long)easeOfUse() + " " + (long)gameChanging() + " " + (long)recommended());
+		list->pushBack(Utils::WString(L"Ratings: ") + (long)easeOfUse() + L" " + (long)gameChanging() + L" " + (long)recommended());
-		list->pushBack("");
+		list->pushBack(L"");
+	}
 	if (namesList()->size())
+	{
-		list->pushBack("# Package names, uses different names for different languages");
+		list->pushBack(L"# Package names, uses different names for different languages");
 		for(auto itr = namesList()->begin(); itr != namesList()->end(); itr++)
-			list->pushBack((Utils::WString("ScriptName: ") + (long)(*itr)->iLanguage + L" " + (*itr)->sName).toString());
+			list->pushBack(Utils::WString("ScriptName: ") + (long)(*itr)->iLanguage + L" " + (*itr)->sName);
-		list->pushBack("");
+		list->pushBack(L"");
+	}
 	for ( int j = 0; j < 2; j++ ) {
 		Utils::WString installText = (j == 0) ? L"Install" : L"Uninstall";
 		const CInstallText *pText = (j == 0) ? this->installText() : this->uninstallText();
 		if ( pText->any() )
+		{
-			list->pushBack((L"# " + installText + L" Texts, display text before and/or after " + installText + L"ing to inform the use of special conditions").toString());
+			list->pushBack(L"# " + installText + L" Texts, display text before and/or after " + installText + L"ing to inform the use of special conditions");
 			for ( unsigned int i = 0; i < pText->count(); i++ ) {
 				long iLang = pText->language(i);
-				if ( !pText->getBefore(iLang).empty() )	list->pushBack((installText + &quot;Before: " + iLang + L" " + pText->getBefore(iLang)).toString());
+				if ( !pText->getBefore(iLang).empty() )	list->pushBack(installText + &quot;Before: " + iLang + L" " + pText->getBefore(iLang));
-				if ( !pText->getAfter(iLang).empty()  )	list->pushBack((installText + &quot;After: " + iLang + L" " + pText->getAfter(iLang)).toString());
+				if ( !pText->getAfter(iLang).empty()  )	list->pushBack(installText + &quot;After: " + iLang + L" " + pText->getAfter(iLang));
+			}
-			list->pushBack("");
+			list->pushBack(L"");
+		}
+	}
-	list->pushBack("# Plugin Type, the type the plugin is, mainly used to show users the type, types include: Normal, Stable, Experimental, Cheat, Mod");
+	list->pushBack(L"# Plugin Type, the type the plugin is, mainly used to show users the type, types include: Normal, Stable, Experimental, Cheat, Mod");
 	switch ( this->pluginType() )
+	{
 		case PLUGIN_NORMAL:
-			list->pushBack("PluginType: Normal");
+			list->pushBack(L"PluginType: Normal");
 			break;
 		case PLUGIN_STABLE:
-			list->pushBack("PluginType: Stable");
+			list->pushBack(L"PluginType: Stable");
 			break;
 		case PLUGIN_EXPERIMENTAL:
-			list->pushBack("PluginType: Experimental");
+			list->pushBack(L"PluginType: Experimental");
 			break;
 		case PLUGIN_CHEAT:
-			list->pushBack("PluginType: Cheat");
+			list->pushBack(L"PluginType: Cheat");
 			break;
 		case PLUGIN_MOD:
-			list->pushBack("PluginType: Mod");
+			list->pushBack(L"PluginType: Mod");
 			break;
+	}
-	list->pushBack("");
+	list->pushBack(L"");
 	return true;
+}
-bool CBaseFile::GeneratePackagerScriptFile(bool wildcard, Utils::CStringList *list, int game, const Utils::CStringList &gameAddons)
+bool CBaseFile::GeneratePackagerScriptFile(bool wildcard, Utils::WStringList *list, int game, const Utils::WStringList &gameAddons)
+{
 	// now do files and wildcards
 	Utils::WStringList files;
 	for ( CListNode<C_File> *f = m_lFiles.Front(); f; f = f->next() )
+	{
+			}
+		}
 		if (foundGame)
+		{
-			Utils::WString str = gameAddons.findString(Utils::String::Number(foundGame));
+			Utils::WString str = gameAddons.findString(Utils::WString::Number(foundGame));
 			if(!str.empty())
 				name += str + L"/";
+		}
 		bool done = false;
 				if (f->Data()->game() & 1 << i)
+				{
 					if (first)
 						first = false;
 					else
-						s += "|";
+						s += L"|";
 					s += CBaseFile::ConvertGameToString(i);
+				}
+			}
+		}
+	}
 	if ( !files.empty() )
+	{
-		list->pushBack("# Files List, all the files to add, can include wild cards");
+		list->pushBack(L"# Files List, all the files to add, can include wild cards");
 		for(auto itr = files.begin(); itr != files.end(); itr++)
-			list->pushBack((*itr)->data.toString() + ": " + (*itr)->str.toString());
+			list->pushBack((*itr)->data + L": " + (*itr)->str);
-		list->pushBack("");
+		list->pushBack(L"");
+	}
 	return true;
+}
 Utils::WString CBaseFile::getAutosaveName() const
+{
-	return this->name() + L"-V" + this->version() + L"-" + this->creationDate().findReplace("/", ".");
+	return this->name() + L"-V" + this->version() + L"-" + this->creationDate().findReplace(L"/", L".");
+}
 bool CBaseFile::CheckGameCompatability(int game)
+{
 	if ( m_lGames.empty() )
+	}
 	return NULL;
+}
-void CBaseFile::AddGameCompatability(int game, const Utils::String &version)
+void CBaseFile::AddGameCompatability(int game, const Utils::WString &version)
+{
 	// first check if we already have it on the list
 	SGameCompat *Found = this->GetGameCompatability(game);
 	if ( !Found ) {
 		Found = new SGameCompat;
 		m_lGames.push_back(Found);
+	}
 	Found->iGame = game;
 	Found->iVersion = -1;
-	Found->sVersion = "";
+	Found->sVersion = L"";
-	if ( version.isin(".") || !version.isNumber() )
+	if ( version.contains(L".") || !version.isNumber() )
-		Found->sVersion = version.toWString();
+		Found->sVersion = version;
 	else
-		Found->iVersion = version.toWString();
+		Found->iVersion = version;
 	_changed();
+}
 Utils::WString CBaseFile::_replaceFilename(const Utils::WString &fname)
+{
 	else if (sFirst.Compare(L"WebMirror1"))
 		this->addWebMirror(sRest.toString());
 	else if (sFirst.Compare(L"WebMirror2"))
 		this->addWebMirror(sRest.toString());
 	else if (sFirst.Compare(L"Ftp"))
-		_sFtpAddr = sRest.toString();
+		_sFtpAddr = sRest;
 	else if (sFirst.Compare(L"Ratings"))		_setRatings(sRest.token(L" ", 1), sRest.token(L" ", 2), sRest.token(L" ", 3));
 	else if (sFirst.Compare(L"EaseOfUse"))		setEaseOfUse(sRest);
 	else if (sFirst.Compare(L"GameChanging"))	setGameChanging(sRest);
 	else if (sFirst.Compare(L"Recommended"))	setRecommended(sRest);
 	else if (sFirst.Compare(L"Depend"))
+	}
 	return NULL;
+}
-void CBaseFile::convertNormalMod(C_File *f, const Utils::String &to) const
+void CBaseFile::convertNormalMod(C_File *f, const Utils::WString &to) const
+{
 	C_File *match = this->findMatchingMod(f);
 	if ( match )
+	{
 		// file link
+	}
 	return NULL;
+}
-void CBaseFile::renameFile(C_File *f, const Utils::String &baseName) const
+void CBaseFile::renameFile(C_File *f, const Utils::WString &baseName) const
+{
 	if ( f->GetFileType() == FILETYPE_MOD )
+	{
 		C_File *match = this->findMatchingMod(f);
 		if ( match )
+	}
 	return Utils::WString::Number((long)error);
+}
-bool CBaseFile::saveToArchive(const Utils::String &filename, int game, const CGameExe *exes, CProgressInfo *progress)
+bool CBaseFile::saveToArchive(const Utils::WString &filename, int game, const CGameExe *exes, CProgressInfo *progress)
+{
 	CDirIO Dir(CFileIO(filename).dir());
 	if (!Dir.exists())
 		Dir.create();
-	TCHAR buf[5000];
-	wsprintf(buf, L"%hs", filename.c_str());
-	HZIP hz = CreateZip(buf, 0);
+	HZIP hz = CreateZip(filename.c_str(), 0);
 	if (!hz) return false;
 	// read files and compress
 	ReadAllFilesToMemory();
 	if (!UncompressAllFiles(progress))
 	// if its a ship, then add any generated files
 	this->addGeneratedFiles(hz);
 	// add the data file
-	Utils::CStringList list;
+	Utils::WStringList list;
-	Utils::CStringList addons;
+	Utils::WStringList addons;
 	if ( this->GeneratePackagerScript(false, &list, game, addons, true) )
+	{
-		if ( CFileIO("test.tmp").writeFile(&list) )
+		if ( CFileIO(L"test.tmp").writeFile(&list) )
+		{
 			ZipAdd(hz, L"pluginmanager.txt", L"test.tmp");
-			CFileIO::Remove("test.tmp");
+			CFileIO::Remove(L"test.tmp");
+		}
+	}
 	CloseZip(hz);
 	return true;
+}
-int CBaseFile::GetGameFromString(const Utils::String &sGame)
+int CBaseFile::GetGameFromString(const Utils::WString &sGame)
+{
 	int iGame = GAME_ALL;
-	if ( sGame.Compare("ALL") )
+	if ( sGame.Compare(L"ALL") )
 		iGame = GAME_ALL;
-	else if ( sGame.Compare("X3") )
+	else if ( sGame.Compare(L"X3") )
 		iGame = GAME_X3;
-	else if ( sGame.Compare("X2") )
+	else if ( sGame.Compare(L"X2") )
 		iGame = GAME_X2;
-	else if ( sGame.Compare("X3TC") )
+	else if ( sGame.Compare(L"X3TC") )
 		iGame = GAME_X3TC;
-	else if (sGame.Compare("X3AP"))
+	else if (sGame.Compare(L"X3AP"))
 		iGame = GAME_X3AP;
-	else if (sGame.Compare("X3FL"))
+	else if (sGame.Compare(L"X3FL"))
 		iGame = GAME_X3FL;
 	else if ( sGame.isNumber() )
 		iGame = sGame;
 	return iGame;

Subversion Repositories spk

(root)//libspk/src/BaseFile.cpp – Rev 209 → 210