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

 	spkfile.writeFile(filename, NULL);
 	wprintf(L"SPK file has been written to disk: %s\n", filename.c_str() );
+}
-void ExtractFiles (const Utils::WString &sfile, const Utils::WString &dir, int game )
+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 *id = _wfopen(sfile.c_str(), L"rb+");
+		File.open(CDirIO(g_dir).file(sfile));
-	if ( !id )
+	if (!File.exists())
+	{
 		wprintf(L"Error: File, %s, doesn't exist\n", sfile.c_str() );
 		return;
+	}
-	fclose ( id );
 	CPackages packages;
 	packages.startup(L".", L".", L".");
-	int check = CSpkFile::CheckFile ( sfile );
+	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
 			pBaseFile = new CBaseFile();
 		wprintf(L"Opening File, %s... ", sfile.c_str());
 		// reads the file into memory
 		// the SPKREAD_NODATA flag causes it to just read the settings, and skips the file data
-		if ( !pBaseFile->readFile(sfile, SPKREAD_NODATA))
+		if ( !pBaseFile->readFile(File.fullFilename(), SPKREAD_NODATA))
+		{
 			wprintf(L"(Error)\nUnable to open the file, %s\n", sfile.c_str() );
 			return;
+		}
 		wprintf(L"(Done)\n");
 			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());
 		CFileProgress info(&packages, pBaseFile, "Extracting");
-		if (packages.extractAll(pBaseFile, dir, game, true, &info) )
+		if (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
 		// creates the directory so it can be extracted
 		CDirIO Dir(dir);
 		if ( !Dir.create(f->getDirectory(pBaseFile)) )
+		{
 			wprintf(L"Unable to create the directory \"%s\" to extract into\n", dir.c_str());
 			return;
+		}
 		// sets up the progress pointer
 		// if it uses 7zip, the progress will be displayed in the command prompt
 		MyProgress progress(0);
 				if(!p->description().empty())
 					wprintf(L"\t\t%s\n", p->description().c_str());
 				filedata.pushBack(CPackages::FormatAvailablePackageData(p));
 				delete p;
 			}
 			if (filedata.empty())
 				wprintf(L"unable to find any packages");
 			else
+			{
 				Utils::WString dest = Dir.file(L"xpackagedata.dat");
 					wprintf(L"web update file, xpackagedata.dat, generated");
 				else
 					wprintf(L"unable to write update file");
+			}
+		}
 	}
+}
 void GenerateUpdateFile(const Utils::WString &spkfile)
 {
 	if (!CFileIO::Exists(spkfile))
 	{
 		wprintf(L"Error: The package file, %s, does not exist", spkfile.c_str());
+		return;
+	}
+	int check = CSpkFile::CheckFile(spkfile);
+	if ( check == SPKFILE_MULTI )
+	{
+		wprintf(L"Error: Multi-Package files currently not supported\n");
+		return;
+	}
+	else if ( check == SPKFILE_OLD )
+	{
+		wprintf(L"Error: unable to read old format spk file, try spkconvert first\n");
 		return;
+	}
-	int check = CSpkFile::CheckFile(spkfile);
-	if ( check == SPKFILE_MULTI )
+	else if ( check == SPKFILE_INVALID )
+	{
-		wprintf(L"Error: Multi-Package files currently not supported\n");
+		wprintf(L"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);
-	else if ( check == SPKFILE_OLD )
+	if ( !package )
+	{
-		wprintf(L"Error: unable to read old format spk file, try spkconvert first\n");
-		return;
-	}
-	else if ( check == SPKFILE_INVALID )
-	{
-		wprintf(L"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 )
-	{
 		wprintf(L"Error: unable to open package file, %s, Error=%d\n", spkfile.c_str(), error);
 		return;
+	}
 	Utils::WString file = package->createUpdateFile(CFileIO(spkfile).dir());
 	if ( file.empty() )
 		return;
+	}
 	int check = CSpkFile::CheckFile(spkfile);
 	if ( check == SPKFILE_MULTI )
 	{
 		wprintf(L"Error: Cant generate a script from a multi-spk file\n");
 		return;
+	}
 	else if ( check == SPKFILE_OLD )
+	{
 	int error;
 	CBaseFile *package = p.openPackage(spkfile, &error, 0, SPKREAD_NODATA);
 	if ( !package )
+	{
 		wprintf(L"Error: unable to open package files, %s, Error=%d\n", spkfile.c_str(), error);
 		return;
+	}
 	Utils::WStringList list;
 	if ( !p.generatePackagerScript(package, true, &list, game) )
+	{
 	CBaseFile *package = p.loadPackagerScript(filename, -1, (verify) ? NULL : &GetAsk, &malformed, &unknown, &variables, &info);
 	printf("\n");
 	if ( verify )
 	{
 		if ( !malformed.empty() )
+		{
 			printf("Malformed Lines (%lu):\n", static_cast<unsigned long>(malformed.size()));
 			for(auto itr = malformed.begin(); itr != malformed.end(); itr++)
 				wprintf(L"\t(Line %3d) %s\n", (*itr)->data.toInt(), (*itr)->str.c_str());
 			printf("Error: There are errors in the packager script which prevents it from being created\n");
 		else
 			wprintf(L"Error: Unable to create package, from script: %s\n", filename.c_str());
+	}
 	else
 	{
 		Utils::WString saveto = package->filename();
 		saveto = saveto.findReplace(L"$DEFAULTDIR", curDir + L"/");
 		saveto = saveto.findReplace(L"$PATH", curDir);
 		saveto = saveto.findReplace(L"\\", L"/");
 		saveto = saveto.findReplace(L"//", L"/");
 	// 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 &lt;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() );
+			wprintf(L"Syntax:\n\t%s -e <spkfile> [destination]\n\t-extractall --game:<game&gt; <spkfile> [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() );
 		else
-		{
-			Utils::WString arg4;
-			if ( argc > 4 )
-				arg4 = argv[4];
+			ExtractFiles(cmd);
-			ExtractFiles(argv[2], arg4, CBaseFile::GetGameFromString(argv[3]));
-		}
+	}
 	// creates a multispk archive
 	else if ( command == L"-n" || command == L"-createmulti" )
+	{

Subversion Repositories spk

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