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

 	printf ( "\t--createscript <packagescript>\n\t\tCreates a spk file from a packager script\n\n");
 	printf ( "\t--verifyscript <packagescript>\n\t\tChecks a packager script is valid without creating the resulting file\n\n");
 	printf ( "\t--generatescript <package> [packagescript]\n\t\tCreates a packager script (.sps) from a spk file\n\n");
 	printf ( "\t--extractship <modfile> <xspfile> [shipid]\n\t\tCreates an XSP ship file from a mod package\n\n");
 	printf ( "\t--generateupdatefile <package>\n\t\tCreates an update file for the spk/xsp file\n\n");
+	printf ( "\t--packagelist <filenames>\n\t\tThis will generate the update file to allow downloading packages from a server.\n\n");
-//	printf ( "\t--convertxspwizard <oldxsp> [newxsp]\n\t\tConverts an old XSP file into the new format\n\n");
+	//	printf ( "\t--convertxspwizard <oldxsp> [newxsp]\n\t\tConverts an old XSP file into the new format\n\n");
+}
 void Settings(CyString filename, CyString settings, int argc, char **argv, CyString cmd)
+{
 	if ( settings.Compare("author") )
 			return "X3: Reunion";
 		case GAME_X3TC:
 			return "X3: Terran Conflict";
 		case GAME_X3AP:
 			return "X3: Albion Prelude";
+		case GAME_X3FL:
+			return "X3: Farnham's Legacy";
 		case GAME_XREBIRTH:
 			return "X: Rebirth";
+	}
 	return "Unknown";
+}
 CyString GetAsk(CyString command)
+{
 	printf("(ASK) Enter the value for, %s: ", command.c_str());
 	return GetInput();
+}
+void GenerateUpdateList(int argc, char **argv)
+{
+	Utils::String currentDir = CFileIO(argv[0]).dir();
+	CDirIO Dir(currentDir);
+	Utils::CStringList list;
+	for (int i = 2; i < argc; ++i)
+	{
+		Utils::String file(argv[i]);
+		if (CFileIO::Exists(file))
+			list.pushBack(file, "file");
+		else if (CFileIO::Exists(Dir.file(file)))
+			list.pushBack(Dir.file(file), "file");
+		else if (CDirIO::Exists(file))
+			list.pushBack(file, "dir");
+		else if (CDirIO::Exists(Dir.dir(file)))
+			list.pushBack(Dir.dir(file), "dir");
+		else
+			list.pushBack(file, "pattern");
+	}
+	if (list.empty())
+		printf("unable to find any packages");
+	else
+	{
+		Utils::CStringList fileList;
+		for (auto itr = list.begin(); itr != list.end(); itr++)
+		{
+			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++)
+					{
+						Utils::String ext = CFileIO((*itr2)->str).extension().lower();
+						if(ext == "xsp" || ext == "spk")
+							fileList.pushBack(dir.file((*itr2)->str));
+					}
+				}
+			}
+			else if (data == "pattern")
+			{
+				CFileIO f(file);
+				CDirIO dir(f.dir());
+				if (!dir.exists())
+					dir = CDirIO(Dir.dir(dir.dir()));
+				Utils::CStringList d;
+				if (dir.dirList(d, Utils::String::Null(), f.filename()))
+				{
+					for (auto itr2 = d.begin(); itr2 != d.end(); itr2++)
+					{
+						Utils::String ext = CFileIO((*itr2)->str).extension().lower();
+						if (ext == "xsp" || ext == "spk")
+							fileList.pushBack(dir.file((*itr2)->str));
+					}
+				}
+			}
+		}
+		if (fileList.empty())
+			printf("unable to find any packages");
+		else
+		{
+			CPackages packages;
+			Utils::CStringList filedata;
+			for (auto itr = fileList.begin(); itr != fileList.end(); itr++)
+			{
+				printf("Reading file: %s\n", (*itr)->str.c_str());
+				int error = 0;
+				CBaseFile *p = packages.OpenPackage((*itr)->str, &error, 0, SPKREAD_NODATA);
+				if (!p)
+				{
+					printf("\tERROR!\n");
+					continue;
+				}
+				printf("\tData extracted: %s %s by %s\n", p->name().c_str(), p->version().c_str(), p->author().c_str());
+				if (!p->creationDate().empty())
+					printf("\t\tCreated: %s\n", p->creationDate().c_str());
+				if(!p->description().empty())
+					printf("\t\t%s\n", p->description().c_str());
+				filedata.pushBack(CPackages::FormatAvailablePackageData(p));
+				delete p;
+			}
+			if (filedata.empty())
+				printf("unable to find any packages");
+			else
+			{
+				Utils::String dest = Dir.file("xpackagedata.dat");
+				if (CFileIO(dest).writeFile(&filedata))
+					printf("web update file, xpackagedata.dat, generated");
+				else
+					printf("unable to write update file");
+			}
+		}
+	}
+}
 void GenerateUpdateFile(CyString spkfile)
+{
 	if ( !CFileIO(spkfile).ExistsOld() )
+	{
 		printf("Error: The package file, %s, does not exist", spkfile.c_str());
 		return;
+	}
 	int check = CSpkFile::CheckFile(spkfile);
 	if ( check == SPKFILE_MULTI )
+	{
 		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);
 	delete package;
+}
-void GeneratePackagerScript(CyString spkfile, CyString toFile)
+void GeneratePackagerScript(const Utils::String &spkfile, CyString toFile, int game)
+{
-	if ( !CFileIO(spkfile).ExistsOld() )
+	if (!CFileIO::Exists(spkfile))
+	{
 		printf("Error: The package file, %s, does not exist", spkfile.c_str());
 		return;
+	}
+	{
 		printf("Error: unable to open package files, %s, Error=%d\n", spkfile.c_str(), error);
 		return;
+	}
-	CyStringList list;
+	Utils::CStringList list;
-	if ( !package->GeneratePackagerScript(true, &list) )
+	if ( !package->GeneratePackagerScript(true, &list, game) )
+	{
 		printf("Error: Unable to generate packager script\n");
 		return;
+	}
 	if ( toFile.Empty() )
 		toFile = CFileIO(spkfile).GetDirIO().File(package->name() + "_" + package->author() + ".sps");
 	// save package file
-	if ( CFileIO(toFile).WriteFile(&list) )
+	if ( CFileIO(toFile).writeFile(&list) )
 		printf("Packager script, %s, has been geenrated\n", toFile.c_str());
 	else
 		printf("Error: unable to write packager script, %s\n", toFile.c_str());
 	delete package;
 			if ( verify )
 				printf("Package can be exported from this script\n");
 			else
+			{
 				// export
-				if ( package->SaveToArchive(saveto, 0) ) {
+				if ( package->SaveToArchive(saveto, 0, p.GetGameExe()) ) {
 					if ( package->IsAnyGameInPackage() ) {
 						for ( int i = 0; i < p.GetGameExe()->GetNumGames(); i++ ) {
 							if ( package->IsGameInPackage(i + 1) ) {
 								Utils::String exportFile = CFileIO(saveto).dir() + "/" + CFileIO(saveto).baseName() + "_" + CBaseFile::ConvertGameToString(i + 1) + "." + CFileIO(saveto).extension();
-								package->SaveToArchive(exportFile, i + 1);
+								package->SaveToArchive(exportFile, i + 1, p.GetGameExe());
+							}
+						}
+					}
 					printf("Package: %s was exported\n", saveto.c_str());
+				}
 	Main entry point to program
 */
 int main ( int argc, char **argv )
+{
 	// display program header to command prompt
-	printf ( "\nSPKTool V1.42 (SPK File Version %.2f) 03/01/2012 Created by Cycrow\n\n", (float)FILEVERSION );
+	printf ( "\nSPKTool V1.50 (SPK File Version %.2f) 14/02/2021 Created by Cycrow\n\n", (float)FILEVERSION );
-	//TEST: test new string library
-	CyString a = "a";
-	printf("Test: %s\n", a.c_str());
-	char pause2;
-	scanf ( "%s", &pause2 );
 	// parse the cmd name
 	CyString cmd (argv[0]);
 	cmd = cmd.FindReplace ( "\\", "/" );
 	g_dir = cmd.GetToken ( 0, cmd.NumToken('/') - 1, '/' );
 	// appends a file onto the spk archive
 	else if ( command == "-a" || command == "--append" )
+	{
 		if ( argc < 4 )
 			printf ( "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.c_str(), cmd.c_str(), fileTypes.c_str() );
 		else
+		{
 			CyString arg4;
 			if ( argc > 4 )
 				arg4 = argv[4];
 			AppendFile ( argv[2], argv[3], arg4 );
 		}
+	}
 	// removes a file from the spk archive
 	else if ( command == "-r" || command == "--remove" || command == "--removespk" )
 	{
 		if ( argc < 4 )
 		{
 			printf ( "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.c_str(), cmd.c_str(), fileTypes.c_str() );
 			printf ( "\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.c_str(), cmd.c_str() );
 		}
 		else
 		{
 			CyString arg4;
 			if ( argc > 4 )
 				arg4 = argv[4];
 			RemoveFile ( argv[2], argv[3], 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 == "-e" || command == "--extractall" )
+	{
 		if ( argc < 3 )
 			LoadPackagerScript ( argv[2], false );
+	}
 	else if ( command == "--generatescript" )
+	{
 		if ( argc < 3 )
-			printf ( "Syntax:\n\t%s --generatescript <package> [packagerscript]\n\t\tThis will create a spk/xsp file from a packager script\n", cmd.c_str() );
+			printf ( "Syntax:\n\t%s --generatescript <package> [packagerscript]\n\t\tThis will generate a packager script file from a spk/xsp file.\n", cmd.c_str() );
 		else
+		{
 			if ( argc < 4 )
-				GeneratePackagerScript ( argv[2], "" );
+				GeneratePackagerScript ( argv[2], "", 0);
 			else
-				GeneratePackagerScript ( argv[2], argv[3] );
+				GeneratePackagerScript ( argv[2], argv[3], 0);
+		}
+	}
 	else if ( command == "--verifyscript" )
+	{
 		if ( argc < 3 )
 				ExtractShip ( argv[2], argv[3], "" );
 			else
 				ExtractShip ( argv[2], argv[3], argv[4] );
+		}
+	}
-	else if ( command == "--generateupdatefile" )
+	else if (command == "--generateupdatefile")
+	{
-		if ( argc < 3 )
+	if (argc < 3)
-			printf ( "Syntax:\n\t%s --generateupdatefile <package>\n\t\tThis will generate the update file to allow auto updates for a package\n", cmd.c_str() );
+		printf("Syntax:\n\t%s --generateupdatefile <package>\n\t\tThis will generate the update file to allow auto updates for a package\n", cmd.c_str());
+	else
+		GenerateUpdateFile(argv[2]);
+	}
+	else if (command == "--packagelist")
+	{
+		if (argc < 3)
+			printf("Syntax:\n\t%s --packagelist <filenames>\n\t\tThis will generate the update file to allow downloading packages from a server.\n", cmd.c_str());
 		else
-			GenerateUpdateFile(argv[2]);
+			GenerateUpdateList(argc, argv);
+	}
 	// not a valid switch, display syntax
 	else
 		PrintSyntax ( cmd );

Subversion Repositories spk

(root)/Tools/src/spktool.cpp – Rev 116 → 126