WebSVN – spk – Diff – /Tools/src/spktool.cpp

 #include <shlobj.h>
 #endif
 CyString g_dir;
 bool g_read;
+class CFileProgress : public CProgressInfo
+{
+private:
+	Utils::String _display;
+	CBaseFile *_package;
+	CPackages *_packages;
+public:
+	CFileProgress(CPackages *packages, CBaseFile *package, const Utils::String &display) :
+		_display(display),
+		_packages(packages),
+		_package(package)
+	{
+	}
+protected:
+	void ProgressUpdated(const long cur, const long max)
+	{
+	}
+	void DoingFile(C_File *file)
+	{
+		Utils::String game;
+		if (!file->game() || file->game() == GAME_ALLNEW)
+			game = "All Games";
+		else if (_packages)
+		{
+			for (unsigned int i = 0; i < 31; ++i)
+			{
+				if (file->game() & (1 << i))
+				{
+					Utils::String g = _packages->GetGameExe()->GetGameNameFromType(i - 1);
+					if (!g.empty())
+					{
+						if (game.empty())
+							game = g;
+						else
+							game = game + ", " + g;
+					}
+				}
+			}
+		}
+		if(game.empty())
+			printf("%s: %s\n", _display.c_str(), file->getNameDirectory(_package).c_str());
+		else
+			printf("%s: %s [%s]\n", _display.c_str(), file->getNameDirectory(_package).c_str(), game.c_str());
+	}
+};
 /*
 	Func:	GetInput
 	Desc:	Gets an input from the user, ie, any settings required to be typed in
 */
 */
 void PrintSyntax ( CyString cmd )
+{
 	printf ( "Syntax: %s <command>\n", cmd.c_str() );
 	printf ( "Commands:\n" );
-	printf ( "\t-v <spkfile>\n\t--version <spkfile>\n\t\tViews the contents of a spk file\n\n" );
+	printf ( "\t-v <spkfile>\n\t--view <spkfile>\n\t\tViews the contents of a spk file\n\n" );
 	printf ( "\t-e <spkfile> [destination]\n\t--extractall <spkfile> [destination]\n\t\tExtracts all the files to the destination directory [or current if no destiantion is set]\n\n" );
 	printf ( "\t-x <spkfile> <type> <file> [destination]\n\t--extract <spkfile> <type> <file> [destination]\n\t\tExtracts a single file of <type> to destination directory\n\n" );
 	printf ( "\t-x <multispkfile> <file> [destination]\n\t--extractspk <multispkfile> <spkfile> [destination]\n\t\tExtracts a single spk file from a Multi-Spk Package\n\n" );
 	printf ( "\t-c <spkfile>\n\t--create\n\t\tCreates a new spk file\n\n" );
 	printf ( "\t-a <spkfile> <type> <filename>\n\t--append <spkfile> <type> <filename>\n\t\tAppends a file to the package of set <type>\n\n" );
 		case GAME_X3FL:
 			return "X3: Farnham's Legacy";
+	}
 	return "Unknown";
+}
-void DisplayVersion ( CyString filename )
+void DisplayVersion(const Utils::String &filename)
+{
 	// first chekc if file even exists
 	FILE *id = fopen ( filename.c_str(), "rb+" );
 	if ( !id )
+	{
 	// otherwise its an old ship file
 	else if ( CFileIO(filename).CheckFileExtension("xsp") )
+	{
 		printf ( "* Converting XSP File, %s...\n", filename.c_str() );
 		pBaseFile = new CXspFile;
-		if ( !((CXspFile *)pBaseFile)->ConvertOld(filename.ToString()) )
+		if ( !((CXspFile *)pBaseFile)->ConvertOld(filename) )
+		{
 			delete pBaseFile;
 			pBaseFile = NULL;
 			printf ( "Failed to convert old xsp file, %s\n", filename.c_str() );
 			return;
+	}
 	if ( pBaseFile && read)
+	{
 		CPackages p;
-		p.Startup(".", ".", ".");
+		p.startup(".", ".", ".");
 		CSpkFile *pSpkFile = NULL;
 		CXspFile *pXspFile = NULL;
 		if ( check == SPKFILE_SINGLE )
 			pSpkFile = (CSpkFile *)pBaseFile;
 		if ( pBaseFile->gameChanging() != -1 ) printf ( "Game Changing Rating: %d\n", pBaseFile->gameChanging() );
 		if ( pBaseFile->recommended() != -1 ) printf ( "Recommendation Rating: %d\n", pBaseFile->recommended() );
 		if ( pBaseFile->GetIcon() )
+		{
 			C_File *icon = pBaseFile->GetIcon();
-			printf ( "Icon File Found, Type: %s, Size: %s\n", pBaseFile->GetIconExt().c_str(), icon->GetDataSizeString().c_str() );
+			printf ( "Icon File Found, Type: %s, Size: %s\n", pBaseFile->GetIconExt().c_str(), icon->dataSizeString().c_str() );
+		}
 		if ( pBaseFile->GetFileList()->size() )
+		{
-			printf ( "\nListing files in package:\n" );
+			printf("\nListing files in package:\n");
-			if ( pBaseFile->GetIcon() )
-				printf("\tIcon: %s (Size: %s)\n", pBaseFile->GetIconExt().c_str(), pBaseFile->GetIcon()->GetDataSizeString().c_str());
 			CLinkList<C_File> *list = pBaseFile->GetFileList();
+			for (unsigned int game = 0; game < 31; ++game)
+			{
+				bool heading = true;
-			for ( C_File *file = list->;First(); file; file = list->Next() )
+				for (C_File *file = list->First(); file; file = list->Next())
+				{
+					bool display = false;
+					if (game == 0 && (!file->game() || file->game() == GAME_ALLNEW))
+						display = true;
+					if (game > 0 && file->game() & (1 << game))
+						display = true;
+					if (display)
+					{
+						if (heading)
+						{
+							Utils::String sGame = p.GetGameExe()->GetGameNameFromType(game - 1);
+							printf("\tGame: %s\n", sGame.c_str());
+							heading = false;
+						}
-				printf ( "\t%s (%s) Size: %s\n";, file->;GetNameDirectory(pBaseFile).c_str(), file->GetFileTypeString().c_str(), file->GetDataSizeString().c_str() );
+						printf("\t\t%s (%s) Size: %s\n";, file->;GetNameDirectory(pBaseFile).c_str(), file->fileTypeString().c_str(), file->dataSizeString().c_str());
+					}
+				}
+			}
+		}
 		else
 			printf ( "\nThere are currently no files in the package\n" );
+	}
 	else if ( check == SPKFILE_MULTI )
 		CyString i = GetInput();
 		i = i.ToUpper();
 		if ( i == "Y" )
 			spkfile.SetSelection ( true );
 		if ( (i == "Y") || (i == "N") )
 			break;
 	}
 	while ( true )
+	{
 		printf ( "\nEnter Spk File to add (Enter \"0\" to finish): " );
 		sInput = GetInput();
 	else
+	{
 		printf ( "Writing MultiSpk file... " );
 		if ( spkfile.WriteFile ( filename ) )
 			printf ( "(Done)\n" );
 		else
 			printf ( "(Error)\n" );
+	}
+}
 	FILE *id = fopen ( filename.c_str(), "rb+" );
 	if ( id )
+	{
 		fclose ( id );
 		printf ( "* File already exists, unable to create\n" );
 		return;
+	}
 	id = fopen ( filename.c_str(), "wb" );
 	if ( !id )
+	{
 			printf ( "(Error)\nUnable to open the file, %s\n", sfile.c_str() );
 			return;
+		}
 		printf ( "(Done)\n" );
+		if(game == 0)
-		printf ( ";Extracting all files from archive..." );
+			printf(";Extracting all files from archive...\n\n");
+		else
+			printf("Extracting %s files from archive...\n\n", packages.GetGameExe()->GetGameNameFromType(game - 1).c_str());
+		CFileProgress info(&packages, pBaseFile, "Extracting");
-		if (packages.extractAll(pBaseFile, dir, game) )
+		if (packages.extractAll(pBaseFile, dir, game, true, &info) )
-			printf ( "(Done)\nFiles have been extracted successfully\n" );
+			printf ( "\n(Done)\nFiles have been extracted successfully\n" );
 		else
-			printf ( "(Error)\nThere was a problem extracting the files\n" );
+			printf ( "\n(Error)\nThere was a problem extracting the files\n" );
+	}
 	else
 		printf("Invalid package file, %s\n", sfile.c_str());
+}
 			String type		- the type of the file to find
 			String addfile	- The filename to extract
 			String dir		- The directory to extract to
 	Desc:	Finds and extracts a file from a Spk Package
 */
-void ExtractFile ( CyString sfile, CyString type, CyString addfile, CyString dir )
+void ExtractFile (const Utils::String &sfile, const Utils::String &type, const Utils::String &addfile, const Utils::String &dir)
+{
 	// First checks if the file exists by opening it
 	FILE *id = fopen ( sfile.c_str(), "rb+" );
 	if ( !id )
+	{
 			Utils::String file = (*itr)->str;
 			Utils::String data = (*itr)->data;
 			if (data == "file")
 				fileList.pushBack(file);
 			else if (data == "dir")
 			{
 				CDirIO dir(file);
 				Utils::CStringList d;
 				if (dir.dirList(d))
+				{
 					for (auto itr2 = d.begin(); itr2 != d.end(); itr2++)
 	if ( check == SPKFILE_MULTI )
+	{
 		printf("Error: Multi-Package files currently not supported\n");
 		return;
+	}
 	else if ( check == SPKFILE_OLD )
 	{
 		printf("Error: unable to read old format spk file, try spkconvert first\n");
 		return;
 	}
 	else if ( check == SPKFILE_INVALID )
 	{
 		printf("Error: %s doesn't appear to be a valid package file\n", spkfile.c_str());
 		return;
 	}
 	CPackages p;
 	int error;
 	CBaseFile *package = p.OpenPackage(spkfile, &error, 0, SPKREAD_NODATA);
 	if ( !package )
+	{
 		printf("Error: unable to open package file, %s, Error=%d\n", spkfile.c_str(), error);
 		return;
+	}
-	Utils::String file = package->CreateUpdateFile(CFileIO(spkfile).dir()).ToString();
+	Utils::String file = package->createUpdateFile(CFileIO(spkfile).dir());
 	if ( file.empty() )
 		printf("Error: unable to create update file for: %s, Directory=%s\n", spkfile.c_str(), CFileIO(spkfile).dir().c_str());
 	else
 		printf("Update file: %s has been created for package, %s\n", file.c_str(), spkfile.c_str());
 	delete package;
+}
 void GeneratePackagerScript(const Utils::String &spkfile, CyString toFile, int game)
 {
 	if (!CFileIO::Exists(spkfile))
+	{
 		printf("Error: The package file, %s, does not exist", spkfile.c_str());
 		return;
+	}
 #ifdef _WIN32
 	TCHAR pszPath[MAX_PATH];
 	if (SUCCEEDED(SHGetFolderPath(NULL, CSIDL_PERSONAL, NULL, SHGFP_TYPE_CURRENT, pszPath)))
+	{
 		myDoc = (char *)pszPath;
 	}
 #endif
 	if ( verify )
 		printf("Verifying Packager Script: %s\n", filename.c_str());
 	CPackages p;
 	p.startup(".", ".", myDoc);
 	Utils::CStringList malformed, unknown;
 	Utils::String curDir = CFileIO(filename).dir();
 	if ( curDir.empty() ) curDir = "./";
 	Utils::CStringList variables;
 	variables.pushBack("$PATH", curDir);
+	CFileProgress info(&p, NULL, "Adding File");
-	CBaseFile *package = p.LoadPackagerScript(filename, -1, (verify) ? NULL : &GetAsk, &malformed, &unknown, &variables);
+	CBaseFile *package = p.LoadPackagerScript(filename, -1, (verify) ? NULL : &GetAsk, &malformed, &unknown, &variables, &info);
+	printf("\n");
 	if ( verify )
+	{
 		if ( !malformed.empty() )
+		{
 			printf("Malformed Lines (%d):\n", malformed.size());
 			for(auto itr = malformed.begin(); itr != malformed.end(); itr++)
 				printf("\t(Line %3d) %s\n", (*itr)->data.toInt(), (*itr)->str.c_str());
 		}
 		if ( !unknown.empty() )
+		{
 			printf("Unknown Commands (%d):\n", unknown.size());
 			for (auto itr = unknown.begin(); itr != unknown.end(); itr++)
 				printf("\t* Command: %s = %s\n", (*itr)->str.c_str(), (*itr)->data.c_str());
+		{
 			// write script
 			if ( package->WriteFile(saveto) )
+			{
 				if ( package->AutoGenerateUpdateFile() )
-					package->CreateUpdateFile(CFileIO(saveto).dir());
+					package->createUpdateFile(CFileIO(saveto).dir());
 				printf("Package: %s was created\n", saveto.c_str());
+			}
 			else
 				printf("Error! There was a problem writing the package\n");
+		}
+			}
+		}
+	}
 	// get the command flag
-	CyString command(argv[1]);
+	Utils::String command(argv[1]);
 	// display the contents of the spk file
-	if ( command == "-v" || command == "--version" )
+	if ( command == "-v" || command == "--view" || command == "--version")
+	{
 		if ( argc < 3 )
 			printf ( "Syntax: %s -v <spkfile>\n\tWill open and display the contents of the spkfile\n", cmd.c_str() );
 		else
-			DisplayVersion ( argv[2] );
+			DisplayVersion(argv[2]);
+	}
 	// creates a new spk file
 	else if ( command == "-c" || command == "--create" )
+	{
+	{
 		if ( argc < 4 )
 			printf ( "Syntax:\n\t%s --extractspk <multispkfile> <filename> [destination]\n\tThis will extract a spk file from the Multi-Spk package and save it to the destination path\n", cmd.c_str() );
 		else
+		{
-			CyString arg4;
+			Utils::String arg4;
 			if ( argc > 4 )
 				arg4 = argv[3];
-			ExtractFile ( argv[2], argv[3], arg4, NullString );
+			ExtractFile(argv[2], argv[3], arg4, Utils::String::Null());
+		}
+	}
 	else if ( command == "-x" || command == "--extract")
+	{
 		if ( argc < 4 )
 			printf ( "Syntax:\n\t%s -x <spkfile> <type> <filename> [destination]\n\tThis will extract a file from the package and save it to the corect path in <directory>\n\t<type> = %s\n", cmd.c_str(), fileTypes.c_str() );
 			printf ( "\t%s -x <multispkfile> <filename> [destination]\n\tThis will extract a spk file from the Multi-Spk package and save it to the destination path\n", cmd.c_str() );
+		}
 		else
+		{
-			CyString arg5, arg4;
+			Utils::String arg5, arg4;
 			if ( argc > 5 )
 				arg5 = argv[5];
 			if ( argc > 4 )
 				arg4 = argv[4];
-			ExtractFile ( argv[2], argv[3], arg4, arg5 );
+			ExtractFile(argv[2], argv[3], arg4, arg5);
+		}
+	}
 	// extracts all the files from an archive
 	else if ( command == "-e" || command == "--extractall" )
 		else
+		{
 			Utils::String arg4;
 			if ( argc > 4 )
 				arg4 = argv[4];
-			ExtractFiles(argv[2], arg4, atoi(argv[3]) );
+			ExtractFiles(argv[2], arg4, CBaseFile::GetGameFromString(argv[3]));
+		}
+	}
 	// creates a multispk archive
 	else if ( command == "-n" || command == "--createmulti" )

Subversion Repositories spk

(root)/Tools/src/spktool.cpp – Rev 131 → 134