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

 			continue;
 		if ( f->GetName() != file->GetName () )
 			continue;
 		if ( f->GetDir() != file->GetDir() )
 			continue;
-		if ( f->GetGame() != file->GetGame() )
+		if ( f->game() != file->game() )
 			continue;
 		m_lFiles.remove(node, true);
 		break;
+	}
 	_addFile(file);
+}
-C_File *CBaseFile::AddFile ( CyString file, CyString dir, int type, int game )
+C_File *CBaseFile::AddFile(CyString file, CyString dir, int type, int game)
+{
+	return addFile(file.ToString(), dir.ToString(), (FileType)type, game);
+}
+C_File *CBaseFile::addFile(const Utils::String &file, const Utils::String &dir, FileType type, int game)
+{
-	C_File *newfile = new C_File ( file );
+	C_File *newfile = new C_File(file);
-	newfile->SetDir ( dir );
+	newfile->SetDir(dir);
-	newfile->SetFileType ( type );
+	newfile->SetFileType(type);
-	newfile->SetGame(game);
+	newfile->setGame(game);
 	// first check if the file already exists
 	for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() )
+	{
 		C_File *f = node->Data();
 			continue;
 		if ( f->GetName() != newfile->GetName () )
 			continue;
 		if ( f->GetDir() != newfile->GetDir() )
 			continue;
-		if ( f->GetGame() != newfile->GetGame() )
+		if ( f->game() != newfile->game() )
 			continue;
 		// must already exist, delete this one
 		m_lFiles.remove(node, true);
 		break;
 		if ( type != f->GetFileType() )
 			continue;
 		if ( dir != f->GetDir() )
 			continue;
-		if ( game != f->GetGame() )
+		if ( game != f->game() )
 			continue;
 		if ( f->GetName().ToLower() == lfile )
 			return f;
+	}
 	return NULL;
 		bool uncomprToFile = false;
 		if ( progress )
 			progress->SwitchSecond();
-		if ( !fit->UncompressData ( progress ) )
+		if(!fit->isExternalFile())
+		{
-			if ( fit->GetCompressionType() == SPKCOMPRESS_7ZIP )
+			if (!fit->UncompressData(progress))
+			{
-				if ( !fit->UncompressToFile ( "temp", this, false, progress ) )
+				if (fit->GetCompressionType() == SPKCOMPRESS_7ZIP)
-					return false;
-				else
+				{
+					if (!fit->UncompressToFile("temp", this, false, progress))
+						return false;
+					else
+					{
-					uncomprToFile = true;
+						uncomprToFile = true;
-					fit->SetFullDir ( "temp" );
+						fit->SetFullDir("temp");
+					}
+				}
-			}
-			if ( !uncomprToFile )
+				if (!uncomprToFile)
-				return false;
+					return false;
+			}
+		}
 		if ( progress )
 			progress->SwitchSecond();
+	}
 		C_File checkfile;
 		CyString checkfilename = sDestination;
 		if ( !checkfilename.Empty() ) checkfilename += "/";
 		checkfilename += pFile->GetNameDirectory(this);
 		checkfile.SetFilename ( checkfilename );
-		checkfile.SetFileType ( pFile->GetFileType() );
+		checkfile.setFileType(pFile->fileType());
 		if ( checkfile.CheckValidFilePointer() ) {
 			if ( checkfile.ReadScriptVersion() > pFile->GetVersion() ) {
 				CLog::log(CLog::Log_Install, 1, "Newer version of the file found in directory, skipping");
 				return false;
+			}
 	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 ( CyString line )
+bool CBaseFile::ParseFilesLine ( CyString sLine )
+{
+	Utils::String line = sLine.ToString();
-	if ( !line.IsIn(":") )
+	if ( !line.contains(":") )
 		return false;
-	CyString command = line.GetToken ( 1, ':' );
+	Utils::String command = line.token(":", 1);
-	long size = line.GetToken ( 2, ':').ToInt ();
+	long size = line.token(":", 2).toInt();
-	long usize = line.GetToken ( 3, ':').ToInt ();
+	long usize = line.token(":", 3).toInt ();
-	long compression = line.GetToken ( 4, ':').ToInt ();
+	long compression = line.token(":", 4).toInt ();
 	if ( command == "Icon" )
+	{
-		m_sIconExt = line.GetToken ( 5, ':' );
+		m_sIconExt = line.token (":", 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.GetToken ( 5,':' ).ToLong();
+	time_t time = line.token(":", 5).toLong();
-	bool compressToFile = (line.GetToken ( 6, ':').ToInt() == 1) ? true : false;
+	bool compressToFile = (line.token(":", 6).toInt() == 1) ? true : false;
-	CyString name  = line.GetToken ( 7, ':' );
+	Utils::String name  = line.token(":", 7);
-	CyString dir = line.GetToken ( 8, ':' );
+	Utils::String dir = line.token(":", 8);
-	if ( name.Empty() )
+	if ( name.empty() )
 		return true;
 	bool shared = false;
-	if ( command.Left(1) == "$" )
+	if ( command.left(1) == "$" )
+	{
 		shared = true;
-		command.Erase ( 0, 1 );
+		command.erase(0, 1);
+	}
-	int type = -1;
+	FileType type = FILETYPE_UNKNOWN;
 	if ( command == "Script" )
 		type = FILETYPE_SCRIPT;
 	else if ( command == "Text" )
 		type = FILETYPE_TEXT;
 	else if ( command == "Readme" )
 	else if ( command == "ShipOther" )
 		type = FILETYPE_SHIPOTHER;
 	else if ( command == "ShipModel" )
 		type = FILETYPE_SHIPMODEL;
-	if ( type == -1 )
+	if (type == FILETYPE_UNKNOWN)
 		return false;
-	C_File *file = new C_File ();
+	C_File *file = new C_File();
-	if ( dir.Left(5).Compare("GAME_") ) {
+	if (dir.left(5).Compare("GAME_")) {
-		file->SetGame(dir.GetToken("_", 2, 2).ToInt());
+		file->setGame(1 << 31 | 1 << dir.token("_", 2).toInt());
-		dir = NullString;
+		dir = Utils::String::Null();
+	}
-	else if ( line.NumToken(":") >= 9 ) {
+	else if ( line.countToken(":") >= 9 )
+	{
+		Utils::String game = line.token(":", 9);
+		if (game.contains("_"))
-		file->SetGame(line.GetToken(":", 9, 9).GetToken("_", 2, 2).ToInt());
+			file->setGame(1 << 31 | 1 << game.token("_", 2).toInt());
+		else
+		{
+			int iGame = game.toInt();
+			if (iGame & (1 << 31))
+				file->setGame(iGame);
+			else
+				file->setGame(1 << 31 | 1 << iGame);
+		}
+	}
+	if (dir.Compare("NULL")) {
+		dir = Utils::String::Null();
+	}
-	file->SetFileType ( type );
+	file->setFileType(type);
 	file->SetCreationTime ( time );
 	file->SetName ( name );
 	file->SetDir ( dir );
 	file->SetDataSize ( size - 4 );
 	file->SetDataCompression ( compression );
 	if ( !version.empty() )	this->AddNeededLibrary("<package>", "<author>", version);
+}
-bool CBaseFile::GeneratePackagerScript(bool wildcard, Utils::CStringList *list, int game, bool datafile)
+bool CBaseFile::GeneratePackagerScript(bool wildcard, Utils::CStringList *list, int game, const Utils::CStringList &gameAddons, bool datafile)
+{
 	list->pushBack("#");
 	list->pushBack("# Packager Script");
 	list->pushBack("# -- Generated by SPK Libraries V" + Utils::String::FromFloat(GetLibraryVersion(), 2) + " --");
 	list->pushBack("#");
 	list->pushBack("");
 	return true;
+}
-bool CBaseFile::GeneratePackagerScriptFile(bool wildcard, Utils::CStringList *list, int game)
+bool CBaseFile::GeneratePackagerScriptFile(bool wildcard, Utils::CStringList *list, int game, const Utils::CStringList &gameAddons)
+{
 	// now do files and wildcards
 	Utils::CStringList files;
 	for ( CListNode<C_File> *f = m_lFiles.Front(); f; f = f->next() )
+	{
-		if (game && f->Data()->GetGame() != game)
+		if (game && !(f->Data()->game() & 1 << game))
 			continue;
 		Utils::String name = "$GAMEDIR/";
+		// addon directory?
+		unsigned int checkGame = f->Data()->game() & ~(1 << 31);
+		unsigned int foundGame = 0;
+		for (int i = 0; i < 31; ++i)
+		{
+			if (checkGame == 1 << i)
+			{
+				foundGame = i;
+				break;
+			}
+		}
+		if (foundGame)
+		{
+			Utils::String str = gameAddons.findString(Utils::String::Number(foundGame));
+			if(!str.empty())
+				name += str + "/";
+		}
 		bool done = false;
 		if ( wildcard )
+		{
 			Utils::String base = f->Data()->GetBaseName().ToString();
 			if ( f->Data()->GetFileType() == FILETYPE_SCRIPT )
 		if ( !f->Data()->GetDir().Empty() )
+		{
 			name += "|";
 			name += f->Data()->GetDir().ToString();
+		}
+		Utils::String s = "GAME ";
+		if (!f->Data()->game() || f->Data()->game() == GAME_ALLNEW)
-		Utils::String s = "GAME " + CBaseFile::ConvertGameToString(f->Data()->GetGame()) + " " + name;
+			s += CBaseFile::ConvertGameToString(f->Data()->game());
+		else
+		{
+			bool first = true;
+			for (int i = 0; i < 31; ++i)
+			{
+				if (f->Data()->game() & 1 << i)
+				{
+					if (first)
+						first = false;
+					else
+						s += "|";
+					s += CBaseFile::ConvertGameToString(i);
+				}
+			}
+		}
+		s += " " + name;
 		if(!files.contains(s))
 			files.pushBack(s, f->Data()->GetFileTypeString().ToString());
+	}
 	else
 		Found->iVersion = version;
 	_changed();
+}
-bool CBaseFile::LoadPackageData(const Utils::String &sFirst, const Utils::String &sRest, const Utils::String &sMainGame, Utils::CStringList &otherGames)
+bool CBaseFile::LoadPackageData(const Utils::String &sFirst, const Utils::String &sRest, const Utils::String &sMainGame, Utils::CStringList &otherGames, Utils::CStringList &gameAddons)
+{
 	if ( sFirst.Compare("Name") )					this->setName(sRest);
 	else if ( sFirst.Compare("Author") )			this->setAuthor(sRest);
 	else if ( sFirst.Compare("ScriptName") )
 		AddLanguageName(ParseLanguage(sRest.token(" ", 1)), sRest.tokens(" ", 2));
 			checkType = sFirst.right(-6);
 			shared = true;
+		}
 		// now check type name
-		int filetype = GetFileTypeFromString(checkType);
+		FileType filetype = GetFileTypeFromString(checkType);
-		if ( filetype != -1 )
+		if (filetype != FILETYPE_UNKNOWN)
-			this->AddFileScript(filetype, shared, sRest, sMainGame, otherGames);
+			this->AddFileScript(filetype, shared, sRest, sMainGame, otherGames, gameAddons);
 		else if ( !checkType.Compare("changelog") )
 			return false;
+	}
 	return true;
+}
-void CBaseFile::AddFileScript(int filetype, bool shared, CyString rest, const Utils::String &sMainGame, Utils::CStringList &otherGames)
+void CBaseFile::AddFileScript(FileType filetype, bool shared, CyString sRest, const Utils::String &sMainGame, Utils::CStringList &otherGames, Utils::CStringList &gameAddons)
+{
-	CyString dir;
+	Utils::String dir;
-	if ( rest.IsIn("|") )
-	{
-		dir = rest.GetToken("|", 2);
+	Utils::String rest = sRest.ToString();
-		rest = rest.GetToken("|", 1, 1);
-	}
-	int mainGame = CBaseFile::GetGameFromString(sMainGame);
+	unsigned int mainGame = CBaseFile::GetGameFromString(sMainGame);
+	unsigned int game = 0;
+	if ( rest.token(" ", 1).left(4).Compare("GAME") ) {
+		Utils::String gameStr = rest.token(" ", 2);
+		if (gameStr.contains("|"))
+		{
+			int max = 0;
+			Utils::String *games = gameStr.tokenise("|", &max);
+			for (int i = 0; i < max; ++i)
+			{
+				unsigned int g = CBaseFile::GetGameFromString(games[i]);
+				if (g)
+					game |= 1 << g;
+			}
+			CLEANSPLIT(games, max);
+		}
+		else
+			game = 1 << CBaseFile::GetGameFromString(gameStr);
+		rest = rest.tokens(" ", 3);
+	}
+	if (game)
+		game |= 1 << 31;
-	int game = 0;
+	if (rest.contains("|"))
+	{
-	if ( rest.GetToken(" ", 1, 1).Left(4).Compare("GAME") ) {
+		dir = rest.tokens("|", 2);
-		game = CBaseFile::GetGameFromString(rest.GetToken(" ", 2, 2).ToString());
-		rest = rest.GetToken(" ", 3);
+		rest = rest.token("|", 1);
+	}
-	rest = rest.FindReplace("\\", "/");
+	rest = rest.findReplace("\\", "/");
 	// wild cards
-	if ( rest.IsAnyIn("*?") )
+	if ( rest.containsAny("*?") )
+	{
 		CDirIO Dir(CFileIO(rest).dir());
 		CyStringList *dirList = Dir.DirList();
 		if ( dirList )
+		{
 			for ( SStringList *strNode = dirList->Head(); strNode; strNode = strNode->next )
+			{
-				CyString file = Dir.File(strNode->str);
+				Utils::String file = Dir.file(strNode->str.ToString());
-				if ( file.WildMatch(rest) )
+				if (file.match(rest))
+				{
 					int addGame = game;
 					// check if the file exists in the subdirectory too, if it does, add for each game
 					if ( game == GAME_ALL && !sMainGame.empty() && !otherGames.empty() ) {
 						CFileIO F(file);
 			delete dirList;
+		}
+	}
 	else
+	{
-		int addGame = game;
+		unsigned int addGame = game;
 		// check if the file exists in the subdirectory too, if it does, add for each game
 		if ( game == GAME_ALL && !sMainGame.empty() && !otherGames.empty() ) {
 			CFileIO F(rest);
 			for(Utils::String g = otherGames.firstString(); !g.empty(); g = otherGames.nextString()) {
 				Utils::String checkDir = F.dir() + "/" + g;
 					if ( newfile ) newfile->SetShared(shared);
+				}
+			}
+		}
+		unsigned int checkGame = addGame & ~(1 << 31);
+		unsigned int foundGame = 0;
+		for (int i = 0; i < 31; ++i)
+		{
+			if (1 << i == checkGame)
+			{
+				foundGame = i;
+				break;
+			}
+		}
+		C_File *file = NULL;
+		if (foundGame)
+		{
+			Utils::String addon = gameAddons.findString(Utils::String::Number(foundGame));
+			if (!addon.empty())
+			{
+				Utils::String dir = C_File::GetDirectory(filetype, rest, this);
+				Utils::String filename = rest;
+				if (CCatFile::IsAddonDir(dir))
+					filename = filename.findReplace(dir + "/", addon + "/" + dir + "/");
+				file = this->AppendFile(filename, filetype, addGame, dir);
+			}
+		}
+		if(!file)
-		C_File *file = this->AppendFile(rest, filetype, addGame, dir);
+			file = this->AppendFile(rest, filetype, addGame, dir);
-		if ( file )
+		if (file)
 			file->SetShared(shared);
+	}
+}
+	}
 	for (CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next())
+	{
 		if (game != -1) {
-			if (game && node->Data()->GetGame() && node->Data()->GetGame() != game)
+			if (game && !(node->Data()->game() & (1 << game)))
 				continue;
+			// extracting for all games, so ignore files that have a game set
-			if (!game && node->Data()->GetGame())
+			if (!game && node->Data()->game() && node->Data()->game() != GAME_ALLNEW)
 				continue;
+		}
 		Utils::String fname = node->Data()->GetNameDirectory(this).ToString();
 		// use the addon directory
 		if (node->Data()->isFileInAddon() && exes)
+		{
-			int whatGame = game;
+			unsigned int whatGame = game;
 			if (game == -1)
+			{
-				whatGame = node->Data()->GetGame();
+				unsigned int checkGame = node->Data()->game() & ~GAME_ALLNEW;
+				whatGame = 0;
+				for (int i = 0; i < 31; ++i)
+				{
+					if (1 << i == checkGame)
+					{
+						whatGame = i;
+						break;
+					}
+				}
+			}
-			SGameExe *e = exes->GetGame(whatGame - 1);
-			if (e)
+			if (whatGame > 0)
+			{
+				SGameExe *e = exes->GetGame(whatGame - 1);
+				if (e)
+				{
-				if (e->iFlags & EXEFLAG_ADDON)
+					if (e->iFlags & EXEFLAG_ADDON)
-					fname = e->sAddon + "/" + fname;
+						fname = e->sAddon + "/" + fname;
+				}
+			}
+		}
 		// create the directory
 		wsprintf(buf, L"%hs", fname.c_str());
+		if (node->Data()->isExternalFile())
+		{
+			CFileIO file(node->Data()->filePointer());
+			size_t size = 0;
+			unsigned char *data = file.readAll(&size);
+			ZipAdd(hz, buf, data, size);
+			delete data;
+		}
+		else
-		ZipAdd(hz, buf, node->Data()->GetData(), node->Data()->GetDataSize());
+			ZipAdd(hz, buf, node->Data()->GetData(), node->Data()->GetDataSize());
+	}
 	// if its a ship, then add any generated files
 	this->addGeneratedFiles(hz);
 	// add the data file
 	Utils::CStringList list;
+	Utils::CStringList addons;
-	if ( this->GeneratePackagerScript(false, &list, game, true) )
+	if ( this->GeneratePackagerScript(false, &list, game, addons, true) )
+	{
 		if ( CFileIO("test.tmp").writeFile(&list) )
+		{
 			ZipAdd(hz, L"pluginmanager.txt", L"test.tmp");
 			CFileIO::Remove("test.tmp");
 		iGame = GAME_X3TC;
 	else if (sGame.Compare("X3AP"))
 		iGame = GAME_X3AP;
 	else if (sGame.Compare("X3FL"))
 		iGame = GAME_X3FL;
-	else if ( sGame.Compare("XREBIRTH") )
-		iGame = GAME_XREBIRTH;
 	else if ( sGame.isNumber() )
 		iGame = sGame;
 	return iGame;
+}
+{
 	Utils::String game = "ALL";
 	switch(iGame) {
 		case GAME_ALL:
+		case GAME_ALLNEW:
 			game = "ALL";
 			break;
 		case GAME_X2:
 			game = "X2";
 			break;
 			game = "X3AP";
 			break;
 		case GAME_X3FL:
 			game = "X3FL";
 			break;
-		case GAME_XREBIRTH:
-			game = "XREBIRTH";
-			break;
 		default:
 			game = (long)iGame;
+	}
 	return game;

Subversion Repositories spk

(root)/libspk/src/BaseFile.cpp – Rev 126 → 127