X-Git-Url: http://git.harvie.cz/?p=mirrors%2Flibpurple-core-answerscripts.git;a=blobdiff_plain;f=answerscripts.c;h=df61a270cee9107fcddb17583591109780edbfb3;hp=7c7da4e1cf2de3c1ae8d4a9460183614c05355bf;hb=81749a99b121cd58a5a63185576e0820fcb1ebea;hpb=b44d7b66f2faa75e72c5bb5435bdb83c8bd5da2a;ds=sidebyside

diff --git a/answerscripts.c b/answerscripts.c
index 7c7da4e..df61a27 100755
--- a/answerscripts.c
+++ b/answerscripts.c
@@ -15,19 +15,50 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <errno.h>
 
-#define RESPONSE_LINE_LENGTH 4096
-#define HOOK_SCRIPT "answerscripts.exe"
+#define ANSWERSCRIPT "answerscripts.exe"
+#define ANSWERSCRIPTS_TIMEOUT_INTERVAL 250
+#define ANSWERSCRIPTS_LINE_LENGTH 4096
+
+//#define __WIN32__
+
+#ifndef __WIN32__
+	#include <fcntl.h>
+#endif
 
 char *buff = NULL;
 char *hook_script = NULL;
-char response[RESPONSE_LINE_LENGTH+1];
+char response[ANSWERSCRIPTS_LINE_LENGTH+1];
 int i;
 
+typedef struct {
+  FILE *pipe;
+  PurpleConversation *conv;
+} answerscripts_job;
+
+int answerscripts_process_message_cb(answerscripts_job *job) {
+	FILE *pipe = job->pipe;
+	PurpleConversation *conv = job->conv;
+
+	if (pipe && !feof(pipe)) {
+		if(!fgets(response, ANSWERSCRIPTS_LINE_LENGTH, pipe)
+			&& (errno == EWOULDBLOCK || errno == EAGAIN)
+		) return 1;
+
+		for(i=0;response[i];i++) if(response[i]=='\n') response[i]=0;
+		purple_conv_im_send(purple_conversation_get_im_data(conv), response);
+
+		if(!feof(pipe)) return 1;
+	}
+	pclose(pipe);
+	free(job);
+	return 0;
+}
+
 static void
-received_im_msg_cb(PurpleAccount * account, char *who, char *buffer,
-PurpleConversation * conv, PurpleMessageFlags flags,
-void *data) {
+received_im_msg_cb(PurpleAccount *account, char *who, char *buffer, PurpleConversation *conv, PurpleMessageFlags flags, void *data) {
+
 	/* A workaround to avoid skipping of the first message as a result on NULL-conv: */
 	if (conv == NULL) conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, who);
 
@@ -38,17 +69,23 @@ void *data) {
 	setenv("PURPLE_FROM", who, 1);
 	setenv("PURPLE_MSG", buff, 1);
 
-	FILE* pipe = popen(hook_script, "r"); //TODO: process scripts and send response asynchronously
-	while (pipe && fgets(response, RESPONSE_LINE_LENGTH, pipe)) {
-		for(i=0;response[i];i++) if(response[i]=='\n') response[i]=0;
-		purple_conv_im_send(purple_conversation_get_im_data(conv), response);
-	}
-	pclose(pipe);
+
+	answerscripts_job *job = (answerscripts_job*) malloc(sizeof(answerscripts_job));
+	job->pipe = popen(hook_script, "r");
+	job->conv = conv;
+
+	#ifndef __WIN32__
+		int fflags = fcntl(fileno(job->pipe), F_GETFL, 0);
+		fcntl(fileno(job->pipe), F_SETFL, fflags | O_NONBLOCK);
+	#endif
+
+	purple_timeout_add(ANSWERSCRIPTS_TIMEOUT_INTERVAL, (GSourceFunc) answerscripts_process_message_cb, (gpointer) job);
+
 }
 
 
 static gboolean plugin_load(PurplePlugin * plugin) {
-	asprintf(&hook_script,"%s/%s",purple_user_dir(),HOOK_SCRIPT);
+	asprintf(&hook_script,"%s/%s",purple_user_dir(),ANSWERSCRIPT);
 
 	void *conv_handle = purple_conversations_get_handle();
 
@@ -75,9 +112,9 @@ static PurplePluginInfo info = {
 
 	"core-answerscripts",
 	"AnswerScripts",
-	"0.1",
+	"0.1.1",
 	"Framework for hooking scripts to received messages for various libpurple clients",
-	"This plugin will call ~/.purple/" HOOK_SCRIPT " (or wherever purple_user_dir() points) "
+	"This plugin will call ~/.purple/" ANSWERSCRIPT " (or wherever purple_user_dir() points) "
 		"script (or any executable) for each single message called."
 		"Envinronment values PURPLE_MSG and PURPLE_FROM will be set to carry "
 		"informations about message text and sender so script can respond to that message. "