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

 		_display(display),
 		_packages(packages),
 		_package(package)
+	{
+	}
+	void UpdateDisplay(const Utils::WString& display) override
+	{
+		wprintf(L"%s\n", display.c_str());
+	}
 protected:
 	void ProgressUpdated(const long cur, const long max)
+	{
 		if ( !((CXspFile *)pBaseFile)->convertOld(filename) )
+		{
 			delete pBaseFile;
 			pBaseFile = NULL;
 			wprintf(L"Failed to convert old xsp file, %s\n", filename.c_str() );
 			return;
+		}
 		check = SPKFILE_SINGLESHIP;
 		read = true;
+	}
+		}
+	}
 	if ( spkfile.numFiles() < 1 )
 		wprintf(L"\nError: You have added no files, you must add at least one file to create a package\n");
 	else
 	{
 		wprintf(L"Writing MultiSpk file... ");
 		if ( spkfile.writeFile(filename))
 			wprintf(L"(Done)\n" );
 		else
 			wprintf(L"(Error)\n" );
 /*
 	Func:	LoadPackagerScript
 	Args:	String filename	-	The filename of the packager script to load
 	Desc:	Loads the packager scripts and creates a spk/xsp file from it
 */
-void LoadPackagerScript(const Utils::WString &filename, bool verify)
+void LoadPackagerScript(const Utils::CommandLine &cmd, bool verify)
+{
+	Utils::WString filename = cmd.arg(1);
+	// check if the file exists in the current directory
+	if (!filename.contains(L":"))
+		filename = CDirIO(g_dir).file(filename);
-	if ( !CFileIO::Exists(filename) )
+	if (!CFileIO::Exists(filename))
+	{
 		wprintf(L"Error: The packager script, %s, does not exist", filename.c_str());
 		return;
+	}
 	Utils::WString myDoc;
 #ifdef _WIN32
 	TCHAR pszPath[MAX_PATH];
 	if (SUCCEEDED(SHGetFolderPath(NULL, CSIDL_PERSONAL, NULL, SHGFP_TYPE_CURRENT, pszPath)))
+	{
-		myDoc = (char *)pszPath;
+		myDoc = pszPath;
+	}
 #endif
 	if ( verify )
 		wprintf(L"Verifying Packager Script: %s\n", filename.c_str());
 	if ( curDir.empty() ) curDir = L"./";
 	Utils::WStringList variables;
 	variables.pushBack(L"$PATH", curDir);
-	CFileProgress info(&p, NULL, "Adding File");
+	CFileProgress info(&p, NULL, "Added File");
 	CBaseFile *package = p.loadPackagerScript(filename, -1, (verify) ? NULL : &GetAsk, &malformed, &unknown, &variables, &info);
 	printf("\n");
 	if ( verify )
 				else
 					printf("Error! There was a problem exporting the package\n");
+			}
+		}
+	}
+}
+Utils::WString GetFileTypes()
+{
+	Utils::WString fileTypes;
+	for (int i = 0; i < FILETYPE_MAX; i++)
+	{
+		Utils::WString sT = GetFileTypeString(i);
+		if (!sT.empty())
+		{
+			if (fileTypes.empty())
+				fileTypes = sT;
+			else
+			{
+				fileTypes += L", ";
+				fileTypes += sT;
+			}
+		}
+	}
+	return fileTypes;
+}
 /*
 	Main entry point to program
 */
 int main ( int argc, char **argv )
+{
 	// display program header to command prompt
-	printf ( "\nSPKTool V1.50 (SPK File Version %.2f) 14/02/2021 Created by Cycrow\n\n", (float)FILEVERSION );
+	printf ( "\nSPKTool V1.51 (SPK File Version %.2f) 17/05/2025 Created by Cycrow\n\n", (float)FILEVERSION );
 	Utils::CommandLine cmd(argc, argv);
 	g_dir = cmd.cmdDir();
 	g_read = false;
 	// not enough arguments, display the syntax and exit
-	if ( argc < 2 )
+	if (cmd.argCount() < 1)
+	{
 		PrintSyntax(cmd.cmdName());
 		exit ( 1 );
-	}
-	Utils::WString fileTypes;
-	for ( int i = 0; i < FILETYPE_MAX; i++ )
-	{
-		Utils::WString sT = GetFileTypeString(i);
-		if ( !sT.empty() )
-		{
-			if ( fileTypes.empty() )
-				fileTypes = sT;
-			else
-			{
-				fileTypes += L", ";
-				fileTypes += sT;
-			}
-		}
+	}
 	// get the command flag
-	Utils::WString command(argv[1]);
+	Utils::WString command(cmd.arg(0));
 	// display the contents of the spk file
 	if ( command == L"-v" || command == L"-view" || command == L"-version")
+	{
 		if ( argc < 3 )
 	// appends a file onto the spk archive
 	else if ( command == L"-a" || command == L"-append" )
+	{
 		if ( argc < 4 )
-			wprintf(L"Syntax:\n\t%s -a <spkfile> <type> <filename>\n\t%s -append <spkfile> <type> <filename>\n\t\tThis will append the file into the archive and compress it according to the files default compression\n\t<type> = %s\n", cmd.cmdName().c_str(), cmd.cmdName().c_str(), fileTypes.c_str() );
+			wprintf(L"Syntax:\n\t%s -a <spkfile> <type> <filename>\n\t%s -append <spkfile> <type> <filename>\n\t\tThis will append the file into the archive and compress it according to the files default compression\n\t<type> = %s\n", cmd.cmdName().c_str(), cmd.cmdName().c_str(), GetFileTypes().c_str() );
 		else
+		{
 			Utils::WString arg4;
 			if ( argc > 4 )
 				arg4 = argv[4];
 	// removes a file from the spk archive
 	else if ( command == L"-r" || command == L"-remove" || command == L"-removespk" )
+	{
 		if ( argc < 4 )
+		{
-			wprintf(L"Syntax:\n\t%s -r <spkfile> <type> <filename>\n\t%s -remove <spkfile> <type> <filename\n\t\tThis will remove a file from the archive\n\t<type> = %s\n", cmd.cmdName().c_str(), cmd.cmdName().c_str(), fileTypes.c_str() );
+			wprintf(L"Syntax:\n\t%s -r <spkfile> <type> <filename>\n\t%s -remove <spkfile> <type> <filename\n\t\tThis will remove a file from the archive\n\t<type> = %s\n", cmd.cmdName().c_str(), cmd.cmdName().c_str(), GetFileTypes().c_str() );
 			wprintf(L"\t%s -r <multispkfile> <filename>\n\t%s -removespk <multispkfile> <filename>\n\t\tThis will remove a spk file from the Multi-SPK package\n", cmd.cmdName().c_str(), cmd.cmdName().c_str() );
 		}
 		else
 		{
 			Utils::WString arg4;
 			if ( argc > 4 )
 				arg4 = argv[4];
 			RemoveFile ( argv[2], argv[3], arg4 );
 		}
+	}
 	// extracts a file from a spk file
 	else if ( command == L"-extractspk" )
 	{
 		if ( argc < 4 )
 			wprintf(L"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.cmdName().c_str() );
 		else
 		{
 			Utils::WString arg4;
 			if ( argc > 4 )
 				arg4 = argv[3];
 			ExtractFile(argv[2], argv[3], arg4, Utils::WString::Null());
+		}
+	}
 	else if ( command == L"-x" || command == L"-extract")
+	{
 		if ( argc < 4 )
+		{
-			wprintf(L"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.cmdName().c_str(), fileTypes.c_str() );
+			wprintf(L"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.cmdName().c_str(), GetFileTypes().c_str() );
 			wprintf(L"\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.cmdName().c_str() );
 		}
 		else
 		{
 			Utils::WString arg5, arg4;
 			if ( argc > 5 )
 				arg5 = argv[5];
 			if ( argc > 4 )
 				arg4 = argv[4];
 			ExtractFile(argv[2], argv[3], arg4, arg5);
 		}
 	}
 	// extracts all the files from an archive
 	else if ( command == L"-e" || command == L"-extractall" )
+	{
 		if ( argc < 3 )
 			wprintf(L"Syntax:\n\t%s -e <spkfile> [destination]\n\t-extractall <spkfile> <game> [destination]\n\t\tThis will extract all files of a set game into the destination directory\n\n\t\tGame = 0 will extract all files", cmd.cmdName().c_str() );
+		{
 			Utils::WString arg4;
 			if ( argc > 4 )
 				arg4 = argv[4];
 			ExtractFiles(argv[2], arg4, CBaseFile::GetGameFromString(argv[3]));
 		}
 	}
 	// creates a multispk archive
 	else if ( command == L"-n" || command == L"-createmulti" )
 	{
 		if ( argc < 3 )
 			wprintf(L"Syntax:\n\t%s -n <multispkfile>\n\t%s -createmulti <multispkfile>\n\t\tThis will create a multispk file and allow you to add spk files to it\n", cmd.cmdName().c_str(), cmd.cmdName().c_str() );
 		else
 			CreateMultiFile ( argv[2] );
+	}
 	// splits the multi-spk file, exracts all spk files
 	else if ( command == L"-s" || command == L"-splitmulti" )
+	{
 		if ( argc < 3 )
 			wprintf(L"Syntax: %s -s <multispkfile> [destination]\n\tSplits the Multi-SPK file and saves each spk file to the destiantion directory\n", cmd.cmdName().c_str() );
 		else
 		{
 			Utils::WString arg3;
 			if ( argc > 3 )
 				arg3 = argv[3];
 			SplitMulti ( argv[2], arg3 );
+		}
 			ConvertXsp(Utils::WString::FromString(argv[2]), arg3, (command == L"-convertxspwizard") ? true : false);
+		}
+	}
 	else if ( command == L"-createscript" )
+	{
-		if ( argc < 3 )
+		if (cmd.argCount() < 2)
 			wprintf(L"Syntax:\n\t%s -createscript <packagerscript>\n\t\tThis will create a spk/xsp file from a packager script\n", cmd.cmdName().c_str() );
 		else
-			LoadPackagerScript ( argv[2], false );
+			LoadPackagerScript(cmd, false);
+	}
 	else if ( command == L"-generatescript" )
+	{
-		if ( argc < 3 )
+		if (cmd.argCount() < 2)
 			wprintf(L"Syntax:\n\t%s -generatescript <package> [packagerscript]\n\t\tThis will generate a packager script file from a spk/xsp file.\n", cmd.cmdName().c_str() );
 		else
+		{
-			if ( argc < 4 )
+			if (cmd.argCount() < 3)
 				GeneratePackagerScript ( argv[2], "", 0);
 			else
 				GeneratePackagerScript ( argv[2], argv[3], 0);
+		}
+	}
 	else if ( command == L"-verifyscript" )
+	{
-		if ( argc < 3 )
+		if (cmd.argCount() < 2)
 			wprintf(L"Syntax:\n\t%s -verifyscript <packagerscript>\n\t\tThis will read a packager script and check its correct without creating the resulting spk/xsp file\n", cmd.cmdName().c_str() );
 		else
-			LoadPackagerScript ( argv[2], true );
+			LoadPackagerScript(cmd, true);
+	}
 	else if ( command == L"-extractship" )
+	{
 		if ( argc < 4 )
 			wprintf(L"Syntax:\n\t%s -extractship <modfile> <xspfile> [shipid]\n\t\tThis will create an xsp ship file by extracting from a mod file\n", cmd.cmdName().c_str() );

Subversion Repositories spk

(root)//Tools/src/spktool.cpp – Rev 307 → 311