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

 		c = getchar();
+	}
 	return line;
+}
+bool OpenDestination(Utils::CommandLine& cmd, const Utils::WString& destination)
+{
+	Utils::WString endMessage;
+	wprintf(L"                                   |0              100|\n\n");
+	wprintf(L"  - Reading game directory         ");
+	CProgressConsole progress;
+	auto& packages = cmd.packages();
+	if (packages.read(destination, &progress))
+	{
+		packages.UpdatePackages();
+		packages.ReadGameLanguage(false);
+		progress.Finish(false);
+		Utils::WString gameName = packages.getGameName();
+		if (packages.GetLanguage() || !gameName.empty())
+		{
+			wprintf(L"\n\t");
+			if (!gameName.empty())
+				wprintf(L"Game: %s ", gameName.c_str());
+			if (packages.GetLanguage())
+				wprintf(L"(Language: %d)", packages.GetLanguage());
+		}
+		wprintf(L"\n");
+		packages.AssignPackageNumbers();
+		return true;
+	}
+	else
+	{
+		wprintf(L"ERROR!\n");
+		wprintf(L"\nFailed to open destination directory: %s\n", destination.c_str());
+		exit(1);
+	}
+	return false;
+}
+bool CloseDestination(Utils::CommandLine& cmd, bool isPrepare)
+{
+	CProgressConsole progress;
+	Utils::WStringList lErrors;
+	if (isPrepare)
+		wprintf(L"  - Preparing game directory       ");
+	else
+		wprintf(L"  - Closing game directory         ");
+	if (cmd.packages().closeDir(&lErrors, &progress, true))
+		progress.Finish();
+	else
+	{
+		wprintf(L"ERROR!\n");
+		exit(1);
+	}
+	cmd.packages().RestoreFakePatch();
+	wprintf(L"\nDone!\n");
+	return true;
+}
 void PrintSyntax(const Utils::WString &cmd)
+{
 	wprintf(L"Syntax: %s %s <command> [arguments]\n", cmd.c_str(), FLAGS );
 	wprintf(L"\nCommands:\n" );
 		break;
+	}
+	}
 	wprintf(L"\n");
 }
 void DoAllChildren(CPackages *packages, CBaseFile *p, CLinkList<CBaseFile> *doneList, int indent)
+{
 	CLinkList<CBaseFile> children;
 	if ( packages->GetChildPackages(p, &children) )
 		if ( p->GetType() != TYPE_SPK )
 			continue;
 		DisplayPackage(p, 0, packages->GetLanguage());
 		doneList.push_back(p);
 		// find all children
 		DoAllChildren(packages, p, &doneList, 1);
+	}
 	wprintf(L"\n");
+}
+	}
 	return argList->size();
+}
-Utils::WString InstallPackage(const Utils::WStringList &lArguments, Utils::WStringList *errors, CPackages *packages, bool disabled)
+bool GetAllFiles(const Utils::CommandLine& cmd, int start, Utils::WStringList &files, const Utils::WString &ext, bool showError)
+{
+	for (int i = start; i < cmd.argCount(); i++)
+	{
+		if (cmd.arg(i).containsAny(L"?*"))
+		{
+			CFileIO File(cmd.fullFilename(cmd.arg(i)));
+			if (File.dirIO().exists())
+			{
+				Utils::WStringList fileList;
+				if (File.dirIO().dirList(fileList, Utils::WString::Null(), File.filename(), true))
+				{
+					for (auto itr = fileList.begin(); itr != fileList.end(); itr++)
+					{
+						// check if the file exists
+						if (CFileIO::Exists((*itr)->str))
+							files.pushBack((*itr)->str);
+					}
+				}
+			}
+		}
+		else
+		{
+			// check if the file exists
+			if (CFileIO::Exists(cmd.fullFilename(cmd.arg(i))))
+			{
+				files.pushBack(cmd.fullFilename(cmd.arg(i)));
+				continue;
+			}
+			// otherwise, try to append extension to the filename
+			if (!ext.empty())
+			{
+				if (CFileIO(cmd.fullFilename(cmd.arg(i))).extension().lower() != ext.lower())
+				{
+					Utils::WString filename = cmd.fullFilename(cmd.arg(i)) + L"." + ext;
+					if (CFileIO::Exists(filename))
+					{
+						files.pushBack(filename);
+						continue;
+					}
+				}
+			}
+			if (showError)
+				wprintf(L"Error: Unable to find package file %s\n", cmd.arg(i).c_str());
+		}
+	}
+	return !files.empty();
+}
+Utils::WString InstallPackage(Utils::CommandLine &cmd, const Utils::WString &destination, Utils::WStringList *errors, CPackages *packages, bool disabled)
+{
+	if (cmd.argCount() < 2)
+	{
+		wprintf(L"Syntax: %s [flags] install <file>\n\tInstalls a package to the destination\n", cmd.cmdName().c_str());
+		return Utils::WString::Null();
+	}
 	CProgressConsole progress;
 	int error;
-	if (lArguments.empty())
-		return Utils::WString::Null();
+	Utils::WStringList files;
-	// append spk on the end
-	for (auto itr = lArguments.begin(); itr != lArguments.end(); itr++)
+	if(!GetAllFiles(cmd, 1, files, L";spk", true))
+	{
-		if (!CFileIO::Exists((*itr)->str))
-		{
-			if (CFileIO((*itr)->str).extension().lower() != L"spk")
+		wprintf(L"Error: No package files specified to install\n");
-				(*itr)->str += L".spk";
+		return Utils::WString::Null();
-		}
+	}
+	if (!OpenDestination(cmd, destination))
+		return Utils::WString::Null();
 	CLinkList<CBaseFile> lPackages;
 	// open the package file
 	printf ( "  - Opening Package                \n" );
-	for (auto itr = lArguments.begin(); itr != lArguments.end(); itr++)
+	for (auto itr = files.begin(); itr != files.end(); itr++)
+	{
-		Utils::WString spkFilename = (*itr)->str;
+		CFileIO spkFile((*itr)->str);
-		if ( spkFilename.length() > 30 )
+		if(spkFile.filename().length() > 30 )
-			wprintf(L"    ..%28s ", spkFilename.right(28).c_str() );
+			wprintf(L"    %28s.. ", spkFile.filename().left(28).c_str() );
 		else
-			wprintf(L"    %30s ", spkFilename.right(30).c_str() );
+			wprintf(L"    %30s ", spkFile.filename().c_str() );
 		CLinkList<CBaseFile> lPackageList;
-		CBaseFile *package = packages->openPackage(spkFilename, &error, &progress);
+		CBaseFile *package = packages->openPackage(spkFile.fullFilename(), &error, &progress);
 		// multi packages
 		if ( !package && error == INSTALLERR_NOMULTI )
+		{
-			if ( !packages->openMultiPackage(spkFilename, &;lPackageList, &error, &progress) )
+			if ( !packages->openMultiPackage(spkFile.fullFilename(), &;lPackageList, &error, &progress))
+			{
 				printf ( "Error!\n");
 				continue;
 			}
 			progress.Finish();
 		}
 		else if ( package )
+		{
 			progress.Finish();
 			lPackageList.push_back(package);
+		}
 		else
+		{
 			printf ( "ERROR!  " );
 			switch ( error )
 			{
 				case INSTALLERR_OLD:
 					printf ( "File is in old format no longer supported" );
 					break;
 				case INSTALLERR_NOEXIST:
 					printf ( "file doesn't exist" );
 					break;
 				case INSTALLERR_INVALID:
 					printf ( "Invalid package file" );
 					break;
 				case INSTALLERR_NOSHIP:
 					printf ( "Ship Packages are currently not supported" );
 					break;
 				case INSTALLERR_VERSION:
 					printf ( "Package file was created in a newer version, unable to open" );
 					break;
+			}
 			printf ( "\n");
+		}
 		for ( CListNode<CBaseFile> *pNode = lPackageList.Front(); pNode; pNode = pNode->next() )
+		{
 			CBaseFile *package = pNode->Data();
 			// compare versions
 			Utils::WString packageName = package->getFullPackageName(packages->GetLanguage());
 			int checkFlags = IC_ALL;
 			int check = packages->PrepareInstallPackage(package, (disabled) ? true : !package->IsEnabled(), false, checkFlags);
 			switch (check)
+			{
 				case INSTALLCHECK_OLDVERSION:
 					wprintf(L"Newer version of \"%s\" already installed", packageName.c_str() );
 					if ( !g_force )
 					{
 						printf ( ", Unable to install older, use -o to force installation\n" );
 						continue;
+					}
 					else
+					{
+	{
 		printf ( "\nError! Some packages are missing dependacies:\n" );
 		for ( CListNode<CBaseFile> *pNode = lCheckPackages.Front(); pNode; pNode = pNode->next() )
+		{
 			CSpkFile *spk = (CSpkFile *)pNode->Data();
-			wprintf(L"\t%s V%s by %s (Requires: %s by %s)\n";, spk->;name(packages->GetLanguage()).c_str(), spk->version().c_str(), spk->author().c_str(), spk->otherName().c_str(), spk->otherAuthor().c_str());
+			wprintf(L"\t%s V%s by %s, Requires:\n";, spk->name(packages->;GetLanguage()).c_str(), spk->version().c_str(), spk->author().c_str());
+			if(!spk->otherName().empty())
+				wprintf(L"\t\t%s by %s\n", spk->otherName().c_str(), spk->otherAuthor().c_str());
+			for (auto lNode = spk->GetNeededLibraries()->Front(); lNode; lNode = lNode->next())
+				wprintf(L"\t\t%s by %s (Minimum Version: %s)\n", lNode->Data()->sName.c_str(), lNode->Data()->sAuthor.c_str(), lNode->Data()->sMinVersion.c_str());
+		}
+	}
 	// no packages will be installed
 	if ( packages->GetNumPackagesInQueue() < 1 )
 	if ( packages->installPreparedPackages(errors, &progress, &erroredPackages) )
 		progress.Finish();
 	else
+	{
 		printf ( "ERROR!\n" );
+		CloseDestination(cmd, false);
 		return Utils::WString::Null();
+	}
 	// delete any errored packages
 	for ( CListNode<CBaseFile> *pNode = erroredPackages.Front(); pNode; pNode = pNode->next() )
+	{
 		lPackages.remove(pNode->Data());
 		pNode->DeleteData();
+	}
+	CloseDestination(cmd, true);
 	// now display the packages
 	Utils::WString retStr = L"Packages Installed:\n";
 	for ( CListNode<CBaseFile> *pNode = lPackages.Front(); pNode; pNode = pNode->next() )
+	{
 		CBaseFile *package = pNode->Data();
 		retStr += L"  <> ";
 		retStr += package->getFullPackageName(packages->GetLanguage());
 		retStr += L"\n";
 		if ( !packages->getInstallAfterText(package).empty() )
+		{
 			Utils::WString afterText = packages->getInstallAfterText(package).stripHtml();
 			afterText = afterText.findReplace(L"\n", L"\n\t");
 			retStr += L"\t";
+	}
 	return retStr;
+}
-CBaseFile *FindPackage(int packageNum, CPackages *packages)
+CBaseFile *FindPackage(int packageNum, const CPackages *packages)
+{
-	for ( CBaseFile *p = packages->PackageList()->First(); p; p = packages->PackageList()->Next() )
+	for(auto node = packages->packageList()->Front(); node; node = node->next())
+	{
-		if ( p->GetNum() == (packageNum - 1) )
+		if (node->Data() && node->Data()->GetNum() == (packageNum - 1))
-			return p;
+			return node->Data();
+	}
-	return 0;
+	return nullptr;
+}
 bool UninstallPackage(int uninstallNum, Utils::WStringList *errors, CPackages *packages, Utils::WString &endMessage)
 {
 	CBaseFile *p = FindPackage(uninstallNum, packages);
 	if ( !p )
 		return false;
 	// lets check for the uninstall text
+			{
 				printf ( "\nUninstallation has been aborted!!\n" );
 				return false;
+			}
+		}
 	}
 	CProgressConsole progress;
 	endMessage = L"Uninstalled: " + p->getFullPackageName(packages->GetLanguage());
 	// add the uninstall after text
 	return true;
+}
 bool EnablePackage(int uninstallNum, Utils::WStringList *errors, CPackages *packages, Utils::WString &endMessage)
 {
 	CBaseFile *p = FindPackage(uninstallNum, packages);
 	if ( !p )
 		return false;
 	CProgressConsole progress;
 	endMessage = L"Enabled: " + p->getFullPackageName(packages->GetLanguage());
 	printf ( "  - Enabling                       " );
 	if ( packages->enablePackage(p, errors, &progress) )
 	{
 		progress.Finish();
 	}
 	else
+	{
 		int error = packages->GetError();
 		endMessage = "";
 		printf ( "ERROR! " );
 		if ( error == PKERR_NOPARENT )
 			printf ( "Parent package is disabled" );
 		printf ( "\n" );
 		return false;
 	}
 	return true;
 }
 bool DisablePackage(int uninstallNum, Utils::WStringList *errors, CPackages *packages, Utils::WString &endMessage)
+{
 	CBaseFile *p = FindPackage(uninstallNum, packages);
 	if ( !p )
 		endMessage = L"";
 		printf ( "ERROR!\n" );
 		return false;
+	}
 	return true;
 }
 void RemoveUninstallScripts(CPackages *packages, Utils::WStringList *errors)
+{
 	CProgressConsole progress;
 	printf ( "  - Removing uninstall scripts     " );
 void PrintDebug(Utils::WStringList *errors)
+{
 	if ( !g_debug )
 		return;
 	if (errors && errors->size())
 		printf ( "\n");
 	for(auto itr = errors->begin(); itr != errors->end(); itr++)
+	{
 		int errornum = (*itr)->data.toInt();
+		//Check this?
-		Utils::WString rest = (*itr)->str.tokens(L" ", 2);
+		//Utils::WString rest = (*itr)->str.tokens(L" ", 2);
+		Utils::WString rest = (*itr)->str;
 		Utils::WString err = FormatErrorString(errornum, rest);
 		wprintf(L"  * %s\n", err.c_str());
+	}
 	if (errors && errors->size())
 		printf ( "\n");
+}
+void ShowInfo(const Utils::CommandLine& cmd)
+{
+	int package = Utils::WString(cmd.arg(1)).toInt();
+	CBaseFile* p = FindPackage(package, &cmd.packages());
+	if (!p)
+	{
+		wprintf(L"Error: Unable to find package #%d\n", package);
+		return;
+	}
+	wprintf(L"\n============================\n");
+	wprintf(L"Package #%d: %s\n", package, p->name(cmd.packages().language()).c_str());
+	wprintf(L"\t%15s: %s\n", L"Author", p->author().c_str());
+	wprintf(L"\t%15s: %s\n", L"Version", p->version().c_str());
+	wprintf(L"\t%15s: %s\n", L"Description", p->description().c_str());
+	if (p->GetType() == TYPE_SPK)
+	{
+		CSpkFile* spk = dynamic_cast<CSpkFile*>(p);
+		wprintf(L"\t%15s: %s\n", L"Type", spk->scriptTypeString(cmd.packages().language()).c_str());
+	}
+	else if (p->GetType() == TYPE_XSP)
+		wprintf(L"\t%15s: %s\n", L"Type", L"Ship");
+	wprintf(L"\t%15s: %s\n", L"Status", p->isEnabled() ? L"Enabled" : L"Disabled");
+	if (p->anyDependacies())
+	{
+		wprintf(L"\t%15s:\n", L"Dependancies");
+		for (auto needed = p->GetNeededLibraries()->First(); needed; needed = p->GetNeededLibraries()->Next())
+			wprintf(L"\t\t%s by %s (Min Version: %s)", needed->sName.c_str(), needed->sAuthor.c_str(), needed->sMinVersion.c_str());
+	}
+	wprintf(L"\n============================\n\b");
+}
 void Pause()
+{
 #ifdef _DEBUG
 	char pause;
 	scanf ( "%s", &pause );
 #endif
 }
 int ParseCommandSwitchs(wchar_t c, Utils::WString &destination, CPackages *packages, int start, int *arg, char **argv)
 {
 	switch ( c )
+	{
 		case L'o':
 			g_force = true;
 			break;
 			g_debug = true;
 			break;
 		case L'd':
 			destination = argv[*arg];
 			destination = destination.findReplace("\\", "/");
 			++(*arg);
 			++start;
 			break;
 		case L't':
 			packages->SetRenameText(true);
 			break;
 		case L'l':
 			packages->SetLanguage(Utils::WString(argv[*arg]).toInt());
 			++(*arg);
 			++start;
 			break;
 		case L'c':
 			packages->SetAutoEnable(true);
 			break;
 		case L'm':
 			packages->SetForceModInstall(true);
 			break;
+	}
 	return start;
-}
-bool OpenDestination(Utils::CommandLine &cmd, const Utils::WString& destination)
-{
-	Utils::WString endMessage;
-	wprintf(L"                                   |0              100|\n\n");
-	wprintf(L"  - Reading game directory         ");
-	CProgressConsole progress;
-	auto& packages = cmd.packages();
-	if (packages.read(destination, &progress))
-	{
-		packages.UpdatePackages();
-		packages.ReadGameLanguage(false);
-		progress.Finish(false);
-		Utils::WString gameName = packages.getGameName();
-		if (packages.GetLanguage() || !gameName.empty())
-		{
-			wprintf(L"\n\t");
-			if (!gameName.empty())
-				wprintf(L"Game: %s ", gameName.c_str());
-			if (packages.GetLanguage())
-				wprintf(L"(Language: %d)", packages.GetLanguage());
-		}
-		wprintf(L"\n");
-		packages.AssignPackageNumbers();
-		return true;
-	}
-	else
-	{
-		wprintf(L"ERROR!\n");
-		wprintf(L"\nFailed to open destination directory: %s\n", destination.c_str());
-		exit(1);
-	}
-	return false;
 }
-bool CloseDestination(Utils::CommandLine& cmd, bool isPrepare)
-{
-	CProgressConsole progress;
-	Utils::WStringList lErrors;
-	if (isPrepare)
-		wprintf(L"  - Preparing game directory       ");
-	else
-		wprintf(L"  - Closing game directory         ");
-	if (cmd.packages().closeDir(&lErrors, &progress, true))
-		progress.Finish();
-	else
-	{
-		wprintf(L"ERROR!\n");
-		exit(1);
-	}
-	cmd.packages().RestoreFakePatch();
-	wprintf(L"\nDone!\n");
-	return true;
-}
 /*
 TODO:
 Additional Features
 	Patch Mods
 	Update Packages
 */
 /*
 	Main entry point to program
 */
 int main ( int argc, char **argv )
+{
 		packages.SetLanguage(cmd.switchData(L"lang").toInt());
 	else if (cmd.hasSwitch(L"language"))
 		packages.SetLanguage(cmd.switchData(L"language").toInt());
 	// check for verbose mode
+	g_debug = cmd.hasSwitch(L"verbose") || cmd.hasFlag('v');
+	g_force = cmd.hasSwitch(L"override") || cmd.hasFlag('o');
-	if (cmd.hasSwitch(L"verbose"))
+	if (cmd.hasSwitch(L"textrename";) || cmd.hasFlag('t&apos;))
-		g_debug = true;
+		packages.SetRenameText(true);
-	else if (cmd.hasFlag('v'))
+	if (cmd.hasSwitch(L"enablechild") || cmd.hasFlag('c'))
-		g_debug = true;
+		packages.SetAutoEnable(true);
+	if (cmd.hasSwitch(L"forcemod") || cmd.hasFlag('m'))
+		packages.SetForceModInstall(true);
 	int start = 2;
 	/*
 	// check for switchs
 	while ( command[0] == '-' )
 		else
+		{
 			// now parse arguments
 			for ( int i = 1; i < (int)command.length(); i++ )
 				start = ParseCommandSwitchs(command[i], destination, &packages, start, &arg, argv);
 		}
 		if ( argc < start )
+		{
 			PrintSyntax(cmd);
 			exit( 1 );
+	{
 		if (OpenDestination(cmd, destination))
+		{
 			ListPackages(&packages);
 			CloseDestination(cmd, false);
+		}
+	}
+	else if (command.Compare(L"info"))
+	{
+		if (cmd.argCount() < 2)
+		{
+			wprintf(L"Syntax: %s [flags] info <package#>\n\tDisplays info about an installed package\n", cmd.cmdName().c_str());
+			wprintf(L"\tUse the <list> command to get the package number to use");
+		}
+		else
+		{
+			if (OpenDestination(cmd, destination))
+			{
+				ShowInfo(cmd);
+				CloseDestination(cmd, false);
+			}
+		}
+	}
+	else if (command.Compare(L"install"))
+	{
+		Utils::WString aftertext = InstallPackage(cmd, destination, &lErrors, &packages, false);
+		PrintDebug(&lErrors);
+		if (!aftertext.empty())
+			wprintf(L"\n%s\n", aftertext.c_str());
+	}
+	else if (command.Compare(L"uninstall"))
+	{
+		if (cmd.argCount() < 2)
+		{
+			wprintf(L"Syntax: %s [flags] uninstall <package#>\n\tUninstalls a package, package# is from the /l list command\n", cmd.cmdName().c_str());
+			Pause();
+			exit(1);
+		}
+		else
+		{
+			if (OpenDestination(cmd, destination))
+			{
+				bool prepare = UninstallPackage(Utils::WString(cmd.arg(1)).toInt(), &lErrors, &packages, command);
+				PrintDebug(&lErrors);
+				if (prepare)
+					CloseDestination(cmd, true);
+				else
+					packages.RestoreFakePatch();
+			}
+		}
+	}
+	else if (command.Compare(L"enable"))
+	{
+		if (cmd.argCount() < 2)
+		{
+			wprintf(L"Syntax: %s [flags] enable <package#>\n\tEnables an installed package thats been disabled\n", cmd.cmdName().c_str());
+			Pause();
+			exit(1);
+		}
+		else
+		{
+			if (OpenDestination(cmd, destination))
+			{
+				bool prepare = EnablePackage(Utils::WString(cmd.arg(1)).toInt(), &lErrors, &packages, command);
+				PrintDebug(&lErrors);
+				if (prepare)
+					CloseDestination(cmd, true);
+				else
+					packages.RestoreFakePatch();
+			}
+		}
+	}
 	if ( command[0] == '/' )
+	{
 			c = L'l';
 		else if ( checkCmd == L"/removeshared" )
 			c = L's';
 		else if ( checkCmd == L"/removeunisntall" )
 			c = L'r';
 		if ( c == L'i' || c == L'l' || c == L'u' || c == L'e' || c == L'd' || c == L'r' || c == L's' )
+		{
 			Utils::WString endMessage;
 			wprintf(L"                                   |0              100|\n\n");
+			}
 			bool prepare = false;
 			packages.AssignPackageNumbers();
 			Utils::WStringList lArguments;
 			SplitArguments(argv, argc, start, &lArguments);
 			switch ( c )
+			{
-				case 'i':
-					if ( argc <= start )
-						wprintf(L"Syntax: %s [flags] /i <file>\n\tInstalls a package to the destination\n", cmd.cmdName().c_str() );
-					else
-					{
-						Utils::WString aftertext = InstallPackage(lArguments, &lErrors, &packages, disabled);
-						if(!aftertext.empty())
-						{
-							prepare = true;
-							endMessage = aftertext;
-						}
-						PrintDebug(&lErrors);
-					}
-					break;
 				case 'u':
 					if ( argc <= start )
 						wprintf(L"Syntax: %s [flags] /u <package#>\n\tUninstalls a package, package# is from the /l list command\n", cmd.cmdName().c_str() );
 					else

Subversion Repositories spk

(root)//Tools/src/spkinstall.cpp – Rev 329 → 331