X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fcommand%2Fgeneric.qc;h=b7b8da0e9f407f64da0bab06bc3dae90c7d4c528;hb=b47667e4835b470b10ac1875c5dddb766ddd16a3;hp=8cf7f5aa52b5777e4533396e25f9688070714b9c;hpb=b7ee5fd9f465455a5691abba80a7e83a1ab5b2d8;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/command/generic.qc b/qcsrc/common/command/generic.qc
index 8cf7f5aa5..b7b8da0e9 100644
--- a/qcsrc/common/command/generic.qc
+++ b/qcsrc/common/command/generic.qc
@@ -1,6 +1,6 @@
 // =========================================================
 //  Generic program common command code, written by Samual
-//  Last updated: December 28th, 2011
+//  Last updated: February 19th, 2012
 // =========================================================
 
 // used by generic commands for better help/usage information
@@ -17,6 +17,33 @@ string GetProgramCommandPrefix(void)
 	#endif
 }
 
+// used by curl command
+void Curl_URI_Get_Callback(float id, float status, string data)
+{
+	float i;
+	float do_exec;
+	string do_cvar;
+	i = id - URI_GET_CURL;
+	do_exec = curl_uri_get_exec[i];
+	do_cvar = curl_uri_get_cvar[i];
+	if(status != 0)
+	{
+		print(sprintf(_("error: status is %d\n"), status));
+		if(do_cvar)
+			strunzone(do_cvar);
+		return;
+	}
+	if(do_exec)
+		localcmd(data);
+	if(do_cvar)
+	{
+		cvar_set(do_cvar, data);
+		strunzone(do_cvar);
+	}
+	if(!do_exec && !do_cvar)
+		print(data);
+}
+
 
 // =======================
 //  Command Sub-Functions
@@ -65,6 +92,85 @@ void GenericCommand_addtolist(float request, float argc)
 	}
 }
 
+void GenericCommand_curl(float request, float argc)
+{
+	switch(request)
+	{
+		case CMD_REQUEST_COMMAND:
+		{
+			float do_exec;
+			string do_cvar;
+			float key;
+			float i, j;
+			string url;
+			float buf;
+			float r;
+
+			do_exec = FALSE;
+			do_cvar = string_null;
+			key = -1;
+
+			for(i = 1; i+1 < argc; ++i)
+			{
+				if(argv(i) == "--cvar" && i+2 < argc)
+				{
+					++i;
+					do_cvar = strzone(argv(i));
+					continue;
+				}
+				if(argv(i) == "--exec")
+				{
+					do_exec = TRUE;
+					continue;
+				}
+				if(argv(i) == "--key" && i+2 < argc)
+				{
+					++i;
+					key = stof(argv(i));
+					continue;
+				}
+				break;
+			}
+
+			// now, argv(i) is the URL
+			// following args may be POST parameters
+			url = argv(i);
+			++i;
+			buf = buf_create();
+			j = 0;
+			for(; i+1 < argc; i += 2)
+				bufstr_set(buf, ++j, sprintf("%s=%s", uri_escape(argv(i)), uri_escape(argv(i+1))));
+			if(i < argc)
+				bufstr_set(buf, ++j, sprintf("submit=%s", uri_escape(argv(i))));
+
+			if(j == 0) // no args: GET
+				r = crypto_uri_postbuf(url, URI_GET_CURL + curl_uri_get_pos, string_null, string_null, -1, key);
+			else // with args: POST
+				r = crypto_uri_postbuf(url, URI_GET_CURL + curl_uri_get_pos, "application/x-www-form-urlencoded", "&", buf, key);
+
+			if(r)
+			{
+				curl_uri_get_exec[curl_uri_get_pos] = do_exec;
+				curl_uri_get_cvar[curl_uri_get_pos] = do_cvar;
+				curl_uri_get_pos = mod(curl_uri_get_pos + 1, URI_GET_CURL_END - URI_GET_CURL + 1);
+			}
+			else
+				print(_("error creating curl handle\n"));
+
+			buf_del(buf);
+
+			return;
+		}
+			
+		default:
+		case CMD_REQUEST_USAGE:
+		{
+			print(strcat("\nUsage:^3 ", GetProgramCommandPrefix(), " curl [--key N] [--cvar] [--exec] URL [postargs...]"));
+			return;
+		}
+	}
+}
+
 void GenericCommand_dumpcommands(float request)
 {
 	switch(request)
@@ -157,6 +263,7 @@ void GenericCommand_maplist(float request, float argc)
 					MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), MapInfo_RequiredFlags(), MapInfo_ForbiddenFlags(), 0);
 					argc = tokenizebyseparator(cvar_string("g_maplist"), " ");
 					
+					tmp_string = "";
 					for(i = 0; i < argc; ++i)
 						if(MapInfo_CheckMap(argv(i)))
 							tmp_string = strcat(tmp_string, " ", argv(i));
@@ -173,6 +280,7 @@ void GenericCommand_maplist(float request, float argc)
 					{
 						argc = tokenizebyseparator(cvar_string("g_maplist"), " ");
 						
+						tmp_string = "";
 						for(i = 0; i < argc; ++i)
 							if(argv(i) != argv(2))
 								tmp_string = strcat(tmp_string, " ", argv(i));
@@ -208,6 +316,26 @@ void GenericCommand_maplist(float request, float argc)
 	}
 }
 
+void GenericCommand_nextframe(float request, float arguments, string command)
+{
+	switch(request)
+	{
+		case CMD_REQUEST_COMMAND:
+		{
+			queue_to_execute_next_frame(substring(command, argv_start_index(1), argv_end_index(-1) - argv_start_index(1)));
+			return;
+		}
+			
+		default:
+		case CMD_REQUEST_USAGE:
+		{
+			print(strcat("\nUsage:^3 ", GetProgramCommandPrefix(), " nextframe command..."));
+			print("  Where command will be executed next frame of this VM\n");
+			return;
+		}
+	}
+}
+
 void GenericCommand_removefromlist(float request, float argc)
 {
 	switch(request)
@@ -223,6 +351,7 @@ void GenericCommand_removefromlist(float request, float argc)
 				
 				argc = tokenizebyseparator(cvar_string(original_cvar), " ");
 				
+				tmp_string = "";
 				for(i = 0; i < argc; ++i)
 					if(argv(i) != removal)
 						tmp_string = strcat(tmp_string, " ", argv(i));
@@ -332,8 +461,10 @@ void GenericCommand_(float request)
 // Do not hard code aliases for these, instead create them in commands.cfg... also: keep in alphabetical order, please ;)
 #define GENERIC_COMMANDS(request,arguments,command) \
 	GENERIC_COMMAND("addtolist", GenericCommand_addtolist(request, arguments), "Add a string to a cvar") \
+	GENERIC_COMMAND("curl", GenericCommand_curl(request, arguments), "Queries an URL") \
 	GENERIC_COMMAND("dumpcommands", GenericCommand_dumpcommands(request), "Dump all commands on the program to *_cmd_dump.txt") \
 	GENERIC_COMMAND("maplist", GenericCommand_maplist(request, arguments), "Automatic control of maplist") \
+	GENERIC_COMMAND("nextframe", GenericCommand_nextframe(request, arguments, command), "Execute the given command next frame of this VM") \
 	GENERIC_COMMAND("removefromlist", GenericCommand_removefromlist(request, arguments), "Remove a string from a cvar") \
 	GENERIC_COMMAND("rpn", GenericCommand_rpn(request, arguments, command), "RPN calculator") \
 	GENERIC_COMMAND("settemp", GenericCommand_settemp(request, arguments), "Temporarily set a value to a cvar which is restored later") \