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

 #include "../spk/spkcmdprogress.h"
 #endif
 // Multi Spk File format, required if using Multi Spk files
 // Displays 7Zip compression progress to the command line
 #include <time.h>
-#ifdef _WIN32
-#include <windows.h>
-#include <direct.h>
-#include <shlobj.h>
-#endif
 #include "Utils/CommandLine.h"
 Utils::WString g_dir;
 bool g_read;
 class CFileProgress : public CProgressInfo
+{
 private:
 	Utils::WString _display;
 	CBaseFile *_package;
-	CPackages *_packages;
+	const CPackages *_packages;
 public:
-	CFileProgress(CPackages *packages, CBaseFile *package, const Utils::WString &display) :
+	CFileProgress(const CPackages *packages, CBaseFile *package, const Utils::WString &display) :
 		_display(display),
 		_packages(packages),
 		_package(package)
+	{
+		{
 			for (unsigned int i = 0; i < 31; ++i)
+			{
 				if (file->game() & (1 << i))
+				{
-					Utils::WString g = _packages->GetGameExe()->gameNameFromType(i - 1);
+					Utils::WString g = _packages->gameExe()->gameNameFromType(i - 1);
 					if (!g.empty())
+					{
 						if (game.empty())
 							game = g;
 						else
+		}
 		if ( i == 1 )
 			wprintf(L"[%3d][%30s]\n", id, ids[0].c_str());
 		printf("Enter ID to use > ");
 		shipid = GetInput();
 		if ( shipid.isNumber() )
 			tShipsLine = ships->get(shipid.toInt())->str;
 		else
 			tShipsLine = ships->findData(shipid, true);
+	}
 	else
 		ships->findData(shipid, true);
 	if ( tShipsLine.empty() )
+	{
 		wprintf(L"Error, %s is not a valid ship id to use\n", shipid.c_str());
 		delete pVfs;
 		return;
+	}
 	// now we have the tships to use, lets start to extract the ship
 	wprintf(L"Extracting ship from %s, Ship=%s\n", catfile.c_str(), tShipsLine.token(L";", -2).c_str());
 	CXspFile ship;
 	if ( ship.extractShip(pVfs, tShipsLine.token(L";", -2).toString(), 0))
+	{
 		printf ( "Ship has been successfully extracted\n" );
 		case GAME_X3FL:
 			return L"X3: Farnham's Legacy";
+	}
 	return L"Unknown";
+}
-void DisplayVersion(const Utils::WString &filename)
+void DisplayVersion(const Utils::CommandLine &cmd)
+{
+	const Utils::WString& filename = cmd.arg(1);
 	// first chekc if file even exists
 	FILE *id = _wfopen(filename.c_str(), L"rb+");
 	if ( !id )
+	{
 		wprintf(L"Error: File, %s, doesn't exist\n", filename.c_str());
+	}
 	else if ( check == SPKFILE_SINGLE )
+	{
 		pBaseFile = (CBaseFile *)new CSpkFile();
 		wprintf(L"* Opening SPK File, %s...\n", filename.c_str() );
 		if ( !pBaseFile->readFile(filename, SPKREAD_NODATA))
+		{
 			wprintf(L"Failed to open the spk files, %s\n", filename.c_str() );
 			return;
+		}
 		read = true;
 		read = true;
+	}
 	if ( pBaseFile && read)
+	{
-		CPackages p;
-		p.startup(L".", L".", L".");
 		CSpkFile *pSpkFile = NULL;
 		CXspFile *pXspFile = NULL;
 		if ( check == SPKFILE_SINGLE )
 			pSpkFile = (CSpkFile *)pBaseFile;
 		else
 		//for game
 		printf("For Games: ");
 		if ( !pBaseFile->AnyGameCompatability() )
 			printf("All");
 		else
-			wprintf(L"%s", p.getGameTypesString(pBaseFile, true).c_str());
+			wprintf(L"%s", cmd.packages().getGameTypesString(pBaseFile, true).c_str());
 		printf("\n");
 		if ( pXspFile )
+		{
 			wprintf(L"Ship Display Name: %s\n", pXspFile->shipName(44).c_str());
 					if (display)
+					{
 						if (heading)
+						{
-							Utils::WString sGame = p.GetGameExe()->gameNameFromType(game - 1);
+							Utils::WString sGame = cmd.packages().gameExe()->gameNameFromType(game - 1);
 							wprintf(L"\tGame: %s\n", sGame.c_str());
 							heading = false;
+						}
 						wprintf(L"\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" );
+	}
 		CMultiSpkFile spkfile;
 		wprintf(L"* Opening Multi-SPK file, %s...\n", filename.c_str() );
 		if ( !pBaseFile->readFile(filename, false))
+		{
 			wprintf(L"Error: Failed to open the Multi-SPK file, %s\n", filename.c_str() );
 			return;
 		}
 		wprintf(L"Multi Package Name: %s\n", spkfile.name().c_str() );
 		wprintf(L"Selection Mode: " );
 		if (spkfile.isSelection ())
 			wprintf(L"On\n" );
 		else
+{
 	int t = GetFileTypeFromString(type);
 	if ( t == -1 )
+	{
 		wprintf(L"The file type \"%s\" is invalid\n", type.c_str());
 		return;
 	}
 	int check = CSpkFile::CheckFile(sfile);
 	CBaseFile *pBaseFile = 0;
 	if ( check == SPKFILE_SINGLE )
 		pBaseFile = new CSpkFile();
 		progress.PrintDone();
 		wprintf(L"< (Done)\n");
 		pBaseFile->writeFile(sfile);
 		wprintf(L"\nFile has been written sucessfully\n");
 	}
 	else
 		wprintf(L"< (Error)\n");
+}
 void RemoveFile(const Utils::WString &sfile, const Utils::WString &type, const Utils::WString &addfile)
+{
 	FILE *id = _wfopen(sfile.c_str(), L"rb+");
 	if ( !id )
+	{
 		wprintf(L"Error: File, %s, doesn't exist\n", sfile.c_str() );
 		return;
 	}
 	if ( addfile.empty() )
+	{
 		wprintf(L"Error: Remove filename is invalid\n" );
 		return;
 	}
 	FileType t = GetFileTypeFromString(type);
 	if (t == FileType::FILETYPE_UNKNOWN)
+	{
 		wprintf(L"The file type \"%s\" is invalid\n", type.c_str() );
 		return;
+	}
 	int check = CSpkFile::CheckFile(sfile);
 	CBaseFile *pBaseFile = 0;
 	if ( check == SPKFILE_SINGLE )
 		pBaseFile = new CSpkFile();
 	else if ( check == SPKFILE_SINGLESHIP )
 		pBaseFile = new CXspFile();
 	else if ( check == SPKFILE_BASE )
 		pBaseFile = new CBaseFile();
 	if ( pBaseFile )
 	{
 		wprintf(L"Opening File, %s... ", sfile.c_str());
 		if ( !pBaseFile->readFile(sfile))
 		{
 			wprintf(L"(Error)\nUnable to open the file, %s\n", sfile.c_str());
 			return;
 		}
 		wprintf(L"(Done)\n");
 		wprintf(L"Removing file, %s, from Package\n", addfile.c_str());
 		if(pBaseFile->removeFile(addfile, t))
 		{
 			wprintf(L"File, %s, has been remove from package\n", addfile.c_str() );
 			pBaseFile->writeFile(sfile);
 			wprintf(L"File has been written to disk successfully\n" );
 		}
 		else
 			wprintf(L"Unable to remove the file, %s, from the package\n", addfile.c_str());
 	}
 	else if ( check == SPKFILE_MULTI )
 	{
 		CMultiSpkFile spkfile;
 		wprintf(L"Opening Multi-SPK file, %s...", sfile.c_str());
 		if ( !spkfile.readFile(sfile))
 		{
 			wprintf(L"(Error)\nUnable to open the Multi-SPK file, %s\n", sfile.c_str());
 			return;
 		}
 		wprintf(L"(Done)\n");
 		const SMultiSpkFile *ms = spkfile.findFile(type);
 		if ( !ms )
 		{
 			wprintf(L"Unable to find the file \"%s\" in the package\n", type.c_str());
 			return;
+		}
 		wprintf(L"Removing file, %s, from Package\n", addfile.c_str());
 		if (!spkfile.removeFile(ms))
+		{
 		else
 			wprintf(L"(Error)\n");
+	}
 	else
 		wprintf(L"Error: Invalid file format, unable to open\n");
 }
 void CreateMultiFile (const Utils::WString &filename)
+{
 	wprintf(L"* Creating new Multi-SPK File, %s\n\n", filename.c_str());
 	FILE *id = _wfopen(filename.c_str(), L"rb+");
 	if ( id )
 	{
 		fclose ( id );
 		wprintf(L"* File already exists, unable to create\n");
 		return;
 	}
 	id = _wfopen(filename.c_str(), L"wb");
 	if ( !id )
 	{
 		wprintf(L"* Unable to open file for writing\n");
 		return;
 	}
 	fclose(id);
 	_wremove(filename.c_str());
 	CMultiSpkFile spkfile;
 	Utils::WString sInput;
 	wprintf(L"Enter Multi-Spk Package Name: ");
 	spkfile.setName(GetInput());
 	while ( true )
 		Utils::WString i = GetInput();
 		i = i.upper();
 		if ( i == L"Y" )
 			spkfile.setSelection(true);
 		if ( (i == L"Y") || (i == L"N") )
 			break;
 	}
 	while ( true )
 	{
 		wprintf(L"\nEnter Spk File to add (Enter \"0\" to finish): " );
 		sInput = GetInput();
 		if ( sInput == L"0" )
 			break;
 			if ( !spkfile.addFile(sInput))
 				wprintf(L"Error: Unable to add SPK file to package\n");
 			else
 				wprintf(L"File Added to package (%s)\n", sInput.c_str());
+		}
 	}
 	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... ");
 		else
 			wprintf(L"(Error)\n" );
+	}
+}
 void CreateFile(const Utils::WString &filename)
+{
 	wprintf(L"* Creating new SPK File, %s\n\n", filename.c_str());
 	FILE *id = _wfopen(filename.c_str(), L"rb+");
 	if ( id )
 	{
 		fclose(id);
 		wprintf(L"* File already exists, unable to create\n");
 		return;
+	}
 	spkfile.setCreationDate(Utils::WString::FromString(dateString));
 	spkfile.writeFile(filename, NULL);
 	wprintf(L"SPK file has been written to disk: %s\n", filename.c_str() );
+}
 void ExtractFiles (const Utils::CommandLine &cmd)
+{
 	const Utils::WString& sfile = cmd.arg(1);
 	const Utils::WString & dir = cmd.arg(2);
 	int game = (cmd.hasSwitch(L"game")) ? CBaseFile::GetGameFromString(cmd.switchData(L"game")) : 0;
 	// First checks if the file exists by opening it
 	CFileIO File(sfile);
 	if (!File.exists())
 		File.open(CDirIO(g_dir).file(sfile));
 	if (!File.exists())
+	{
 		wprintf(L"Error: File, %s, doesn't exist\n", sfile.c_str() );
 		return;
 	}
-	CPackages packages;
-	packages.startup(L".", L".", L".");
 	int check = CSpkFile::CheckFile(File.fullFilename());
 	// extracts a file from single packages file
 	if ( check == SPKFILE_SINGLE || check == SPKFILE_BASE || check == SPKFILE_SINGLESHIP )
+	{
 		// creates the spkfile object
 		CBaseFile *pBaseFile = 0;
 		if ( check == SPKFILE_SINGLE )
 		wprintf(L"(Done)\n");
 		if(game == 0)
 			wprintf(L"Extracting all files from archive...\n\n");
 		else
-			wprintf(L"Extracting %s files from archive...\n\n", packages.GetGameExe()->gameNameFromType(game - 1).c_str());
+			wprintf(L"Extracting %s files from archive...\n\n", cmd.packages().gameExe()->gameNameFromType(game - 1).c_str());
-		CFileProgress info(&packages, pBaseFile, "Extracting");
+		CFileProgress info(&cmd.packages(), pBaseFile, "Extracting");
-		if (packages.extractAll(pBaseFile, File.dirIO().dir(dir), game, true, &info) )
+		if (cmd.packages().extractAll(pBaseFile, File.dirIO().dir(dir), game, true, &info))
 			wprintf(L"\n(Done)\nFiles have been extracted successfully\n");
 		else
 			wprintf(L"\n(Error)\nThere was a problem extracting the files\n");
+	}
 	else
+{
 	wprintf(L"(ASK) Enter the value for, %s: ", command.c_str());
 	return GetInput();
+}
-void GenerateUpdateList(int argc, char **argv)
+void GenerateUpdateList(const Utils::CommandLine &cmd)
+{
-	Utils::WString currentDir = CFileIO(Utils::WString::FromString(argv[0])).dir();
-	CDirIO Dir(currentDir);
 	Utils::WStringList list;
-	for (int i = 2; i < argc; ++i)
+	for (int i = 1; i < cmd.argCount(); ++i)
+	{
-		Utils::WString file(argv[i]);
+		Utils::WString file(cmd.arg(i));
 		if (CFileIO::Exists(file))
 			list.pushBack(file, L"file");
-		else if (CFileIO::Exists(Dir.file(file)))
+		else if (CFileIO::Exists(cmd.dirIO().file(file)))
-			list.pushBack(Dir.file(file), L"file");
+			list.pushBack(cmd.dirIO().file(file), L"file");
 		else if (CDirIO::Exists(file))
 			list.pushBack(file, L"dir");
-		else if (CDirIO::Exists(Dir.dir(file)))
+		else if (CDirIO::Exists(cmd.dirIO().dir(file)))
-			list.pushBack(Dir.dir(file), L"dir");
+			list.pushBack(cmd.dirIO().dir(file), L"dir");
 		else
 			list.pushBack(file, L"pattern");
+	}
 	if (list.empty())
 			else if (data == L"dir")
+			{
 				CDirIO dir(file);
 				Utils::WStringList d;
 				if (dir.dirList(d))
 				{
 					for (auto itr2 = d.begin(); itr2 != d.end(); itr2++)
 					{
 						Utils::WString ext = CFileIO((*itr2)->str).extension().lower();
 						if(ext == L"xsp" || ext == L"spk")
 							fileList.pushBack(dir.file((*itr2)->str));
+					}
+				}
+			}
+			{
 				CFileIO f(file);
 				CDirIO dir(f.dir());
 				if (!dir.exists())
-					dir = CDirIO(Dir.dir(dir.dir()));
+					dir = CDirIO(cmd.dirIO().dir(dir.dir()));
 				Utils::WStringList d;
 				if (dir.dirList(d, Utils::WString::Null(), f.filename()))
+				{
 					for (auto itr2 = d.begin(); itr2 != d.end(); itr2++)
 		if (fileList.empty())
 			wprintf(L"unable to find any packages");
 		else
+		{
-			CPackages packages;
 			Utils::WStringList filedata;
 			for (auto itr = fileList.begin(); itr != fileList.end(); itr++)
+			{
 				wprintf(L"Reading file: %s\n", (*itr)->str.c_str());
 				int error = 0;
-				CBaseFile *p = packages.openPackage((*itr)->str.toString(), &error, 0, SPKREAD_NODATA);
+				CBaseFile *p = cmd.packages().openPackage((*itr)->str.toString(), &error, 0, SPKREAD_NODATA);
 				if (!p)
+				{
 					printf("\tERROR!\n");
 					continue;
+				}
 			if (filedata.empty())
 				wprintf(L"unable to find any packages");
 			else
+			{
-				Utils::WString dest = Dir.file(L"xpackagedata.dat");
+				Utils::WString dest = cmd.dirIO().file(L"xpackagedata.dat");
 				if (CFileIO(dest).writeFile(&filedata))
 					wprintf(L"web update file, xpackagedata.dat, generated");
 				else
 					wprintf(L"unable to write update file");
+			}
 	if ( verify )
 		wprintf(L"Verifying Packager Script: %s\n", filename.c_str());
 	CPackages p;
-	p.startup(L".", L".", myDoc);
+	p.startup(L".", cmd.tempDir(), cmd.myDoc());
 	Utils::WStringList malformed, unknown;
 	Utils::WString curDir = CFileIO(filename).dir();
 	if ( curDir.empty() ) curDir = L"./";
 	if ( command == L"-v" || command == L"-view" || command == L"-version")
+	{
 		if ( argc < 3 )
 			wprintf(L"Syntax: %s -v <spkfile>\n\tWill open and display the contents of the spkfile\n", cmd.cmdName().c_str());
 		else
-			DisplayVersion(argv[2]);
+			DisplayVersion(cmd);
+	}
 	// creates a new spk file
 	else if ( command == L"-c" || command == L"-create" )
+	{
 	else if (command == L"-packagelist")
+	{
 		if (argc < 3)
 			wprintf(L"Syntax:\n\t%s -packagelist <filenames>\n\t\tThis will generate the update file to allow downloading packages from a server.\n", cmd.cmdName().c_str());
 		else
-			GenerateUpdateList(argc, argv);
+			GenerateUpdateList(cmd);
+	}
 	// not a valid switch, display syntax
 	else
 		PrintSyntax(cmd.cmdName());

Subversion Repositories spk

(root)/Tools/src/spktool.cpp – Rev 315 → 321