X-Git-Url: http://git.harvie.cz/?p=mirrors%2Flibpurple-core-answerscripts.git;a=blobdiff_plain;f=answerscripts.c;h=f33741a8da9a61128d07befac31c0c5bf603693a;hp=e3f070a2ea65d98c2807324f5bc2f596f86390d5;hb=73f7c2fffd59e46e1f1b47128e7133036f991099;hpb=d852a69454e41e5c4d354b509da04c7dfd5e80ad

diff --git a/answerscripts.c b/answerscripts.c
index e3f070a..f33741a 100755
--- a/answerscripts.c
+++ b/answerscripts.c
@@ -1,48 +1,59 @@
+//#define __WIN32__
 #define PURPLE_PLUGINS
 
 /* Purple headers */
 #include <libpurple/debug.h>
 #include <libpurple/version.h>
 #include <libpurple/conversation.h>
-#include <libpurple/debug.h>
-#include <libpurple/log.h>
+//#include <libpurple/log.h>
 #include <libpurple/plugin.h>
-#include <libpurple/pluginpref.h>
-#include <libpurple/prefs.h>
-#include <libpurple/signals.h>
+//#include <libpurple/signals.h>
 #include <libpurple/util.h>
 #include <libpurple/notify.h>
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <errno.h>
 
-#define RESPONSE_LINE_LENGTH 4096
-#define HOOK_SCRIPT "answerscripts.exe"
-
-#ifdef PTHREAD
-	#include <pthread.h>
+#ifndef __WIN32__
+	#include <fcntl.h>
 #endif
 
+#define ANSWERSCRIPT "answerscripts.exe"
+#define ANSWERSCRIPTS_TIMEOUT_INTERVAL 250
+#define ANSWERSCRIPTS_LINE_LENGTH 4096
+
 char *buff = NULL;
 char *hook_script = NULL;
-char response[RESPONSE_LINE_LENGTH+1];
+char response[ANSWERSCRIPTS_LINE_LENGTH+1];
 int i;
 
-void *answerscripts_process_message(void *conv) {
-	FILE* pipe = popen(hook_script, "r"); //TODO: process scripts and send response asynchronously
-	while (pipe && fgets(response, RESPONSE_LINE_LENGTH, pipe)) {
+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((PurpleConversation *)conv), response);
+		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) {
-	/* 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);
+static void received_im_msg_cb(PurpleAccount *account, char *who, char *buffer, PurpleConversation *conv, PurpleMessageFlags flags, void *data) {
+	if (conv == NULL) conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, who); //* A workaround to avoid skipping of the first message as a result on NULL-conv: */
 
 	buff = purple_markup_strip_html(buffer);
 	//printf("\nHarvie received: %s: %s\n", who, buff); //debug
@@ -51,31 +62,30 @@ void *data) {
 	setenv("PURPLE_FROM", who, 1);
 	setenv("PURPLE_MSG", buff, 1);
 
-	#ifndef PTHREAD
-		answerscripts_process_message((void *)conv);
-	#else
-		pthread_t t;
-		puts("new thread...");
-		pthread_create(&t, NULL, answerscripts_process_message, (void *)conv);
-		puts("new thread created!");
+
+	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();
-
-	purple_signal_connect(conv_handle, "received-im-msg",
-			      plugin, PURPLE_CALLBACK(received_im_msg_cb),
-			      NULL);
-	return TRUE;
+	purple_signal_connect(conv_handle, "received-im-msg", plugin, PURPLE_CALLBACK(received_im_msg_cb), NULL);
+	return 0;
 }
 
 static gboolean plugin_unload(PurplePlugin * plugin) {
 	free(hook_script);
-	return TRUE;
+	return 0;
 }
 
 static PurplePluginInfo info = {
@@ -90,9 +100,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. "