cvarlist_rd: add arguments for default/current values and CSV format print, and strip help text

Author: jhh8

src/game/client/swarm/rd_convar_hacks.cpp

@@ -193,6 +193,7 @@ static class CRD_Convar_Hacks final : public CAutoGameSystem
 
 
 
+
 static bool ConCommandBaseSortFunc( const ConCommandBase* const &hLeftCMD, const ConCommandBase* const &hRightCMD )
 { 
 	const char* szLeftCMDName = hLeftCMD->GetName();
@@ -206,9 +207,56 @@ static bool ConCommandBaseSortFunc( const ConCommandBase* const &hLeftCMD, const
 	return ( Q_stricmp( szLeftCMDName, szRightCMDName ) < 0 );
 }
 
-CON_COMMAND( cvarlist_rd, "Prints a list of all cvars, with correct values (unlike normal cvarlist)." )
+static char *StripTabsAndReturns( const char *inbuffer, char *outbuffer, int outbufferSize )
+{
+	char *out = outbuffer;
+	const char *i = inbuffer;
+	char *o = out;
+
+	out[ 0 ] = 0;
+
+	while ( *i && o - out < outbufferSize - 1 )
+	{
+		if ( *i == '\n' ||
+			*i == '\r' ||
+			*i == '\t' )
+		{
+			*o++ = ' ';
+			i++;
+			continue;
+		}
+		if ( *i == '\"' )
+		{
+			*o++ = '\'';
+			i++;
+			continue;
+		}
+
+		*o++ = *i++;
+	}
+
+	*o = '\0';
+
+	return out;
+}
+
+CON_COMMAND( cvarlist_rd, "Prints a list of all cvars, with correct values (unlike normal cvarlist). No argument - current values, arg being 1 - default values, arg being 2 - current values in csv format, arg being 3 - default values in csv format" )
 {
-	ConMsg( "cvar list\n--------------\n" );
+	bool bDefault = false;
+	bool bCSV = false;
+	int nArgs = args.ArgC();
+	if ( nArgs >= 2 )
+	{
+		int nArg1 = atoi( args[1] );
+		
+		bDefault = nArg1 == 1 || nArg1 == 3;
+		bCSV = nArg1 >= 2;
+	}
+
+	if ( !bCSV )
+		ConMsg( "cvar list\n--------------\n" );
+	else
+		ConMsg( "\"Name\",\"Value\",\"GAMEDLL\",\"CLIENTDLL\",\"PROTECTED\",\"SPONLY\",\"ARCHIVE\",\"NOTIFY\",\"USERINFO\",\"PRINTABLEONLY\",\"UNLOGGED\",\"NEVER_AS_STRING\",\"REPLICATED\",\"CHEAT\",\"SS\",\"DEMO\",\"DONTRECORD\",\"SS_ADDED\",,\"Help Text\"\n" );
 
 	const ConCommandBase* pCMD;
 	ICvar::Iterator cvariterator( g_pCVar );
@@ -229,50 +277,108 @@ CON_COMMAND( cvarlist_rd, "Prints a list of all cvars, with correct values (unli
         pCMD = cvarsorted[ i ];
         if ( pCMD->IsCommand() )
         {
-			char tempbuff[512]{};
-			ConMsg( "%-40s : %-8s : %-16s : %s\n", pCMD->GetName(), "cmd", "", pCMD->GetHelpText() );
+			if ( !bCSV )   // unchanged cvarlist console output format
+			{
+				char tempbuff[512]{};
+				ConMsg( "%-40s : %-8s : %-16s : %s\n", pCMD->GetName(), "cmd", "", StripTabsAndReturns( pCMD->GetHelpText(), tempbuff, sizeof( tempbuff ) ) );
+			}
+			else   // CSV format
+			{
+				char tempbuff[512]{};
+				ConMsg( "\"%s\",\"%s\",%s,\"%s\"\n", pCMD->GetName(), "cmd", ",,,,,,,,,,,,,,,,", StripTabsAndReturns( pCMD->GetHelpText(), tempbuff, sizeof( tempbuff ) ) );
+			}
         }
-        else
-        {
-			char szFullFlags[128]{};
+		else
+		{
+			char szFullFlags[256]{};
 
-			constexpr static const char* s_szFlagDesc[] =
+			if ( !bCSV )   // unchanged cvarlist console output format
 			{
-				"",
-				"",
-				"sv",
-				"cl",
-				"",
-				"prot",
-				"sp",
-				"a",
-				"nf",
-				"user",
-				"print",
-				"log",
-				"numeric",
-				"rep",
-				"cheat",
-				"",
-				"demo",
-				"norecord",
-			};
-
-			for ( int c = 2; c < ARRAYSIZE( s_szFlagDesc ); ++c )
-			{
-				char szFlag[32]{};
+				constexpr static const char* s_szFlagDesc[] =
+				{
+					"",
+					"",
+					"sv",
+					"cl",
+					"",
+					"prot",
+					"sp",
+					"a",
+					"nf",
+					"user",
+					"print",
+					"log",
+					"numeric",
+					"rep",
+					"cheat",
+					"",
+					"demo",
+					"norecord",
+				};
+				
+				for ( int c = 2; c < ARRAYSIZE( s_szFlagDesc ); ++c )
+				{
+					char szFlag[32]{};
 
-				if ( pCMD->IsFlagSet( 1<<c ) && sizeof( s_szFlagDesc[c] ) != sizeof( "" ) )
+					if ( pCMD->IsFlagSet( 1 << c ) && sizeof( s_szFlagDesc[c] ) != sizeof( "" ) )
+					{
+						Q_snprintf( szFlag, sizeof( szFlag ), ", %s", s_szFlagDesc[c] );
+						Q_strncat( szFullFlags, szFlag, sizeof( szFullFlags ), COPY_ALL_CHARACTERS );
+					}
+				}
+				char tempbuff[512]{};
+				ConMsg( "%-40s : %-8s : %-16s : %s\n", pCMD->GetName(), bDefault ? static_cast< const ConVar* >( pCMD )->GetDefault() : static_cast< const ConVar* >( pCMD )->GetString(), szFullFlags, StripTabsAndReturns( pCMD->GetHelpText(), tempbuff, sizeof(tempbuff) ) );
+			}
+			else   // CSV format
+			{
+				constexpr static const char* s_szFlagDesc[] =
 				{
-					Q_snprintf( szFlag, sizeof( szFlag ), ", %s", s_szFlagDesc[c] );
-					Q_strncat( szFullFlags, szFlag, sizeof( szFullFlags ), COPY_ALL_CHARACTERS );
+					"",
+					"",
+					"GAMEDLL",
+					"CLIENTDLL",
+					"",
+					"PROTECTED",
+					"SPONLY",
+					"ARCHIVE",
+					"NOTIFY",
+					"USERINFO",
+					"PRINTABLEONLY",
+					"UNLOGGED",
+					"NEVER_AS_STRING",
+					"REPLICATED",
+					"CHEAT",
+					"SS",
+					"DEMO",
+					"DONTRECORD",
+					"SS_ADDED",
+				};
+
+				for ( int c = 2; c < ARRAYSIZE( s_szFlagDesc ); ++c )
+				{
+					if ( c == 4 )	// FCVAR_HIDDEN, we filter those out anyway
+						continue;
+					
+					char szFlag[32]{};
+
+					if ( pCMD->IsFlagSet( 1 << c ) && sizeof( s_szFlagDesc[c] ) != sizeof( "" ) )
+					{
+						Q_snprintf( szFlag, sizeof( szFlag ), "\"%s\",", s_szFlagDesc[c] );
+						Q_strncat( szFullFlags, szFlag, sizeof( szFullFlags ), COPY_ALL_CHARACTERS );
+					}
+					else
+					{
+						Q_snprintf( szFlag, sizeof( szFlag ), "," );
+						Q_strncat( szFullFlags, szFlag, sizeof( szFullFlags ), COPY_ALL_CHARACTERS );
+					}
 				}
+
+				char tempbuff[512]{};
+				ConMsg( "\"%s\",\"%s\",%s,\"%s\"\n", pCMD->GetName(), bDefault ? static_cast< const ConVar* >( pCMD )->GetDefault() : static_cast< const ConVar* >( pCMD )->GetString(), szFullFlags, StripTabsAndReturns( pCMD->GetHelpText(), tempbuff, sizeof(tempbuff) ) );
 			}
-			
-			char tempbuff[512]{};
-			ConMsg( "%-40s : %-8s : %-16s : %s\n", pCMD->GetName(), static_cast< const ConVar* >( pCMD )->GetDefault(), szFullFlags, pCMD->GetHelpText() );
         }
     }
 
-	ConMsg("--------------\n%3i total convars/concommands\n", cvarsorted.Count() );
+	if ( !bCSV )
+		ConMsg("--------------\n%3i total convars/concommands\n", cvarsorted.Count() );
 }