X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmiracle%2Fmiracle_local.c;h=c0917f3701cdcfceb5ec51b24891205325b46f42;hb=4580365ba2f57f530aa4bdeb57788822fab09e2f;hp=374d5fd479c052501b75c564cae9e9a5652ecaa3;hpb=a9f812df2a5071517dd3bb30cc80378f2e3cbe06;p=melted

diff --git a/src/miracle/miracle_local.c b/src/miracle/miracle_local.c
index 374d5fd..c0917f3 100644
--- a/src/miracle/miracle_local.c
+++ b/src/miracle/miracle_local.c
@@ -60,6 +60,8 @@ typedef struct
 
 static valerie_response miracle_local_connect( miracle_local );
 static valerie_response miracle_local_execute( miracle_local, char * );
+static valerie_response miracle_local_push( miracle_local, char *, mlt_service );
+static valerie_response miracle_local_receive( miracle_local, char *, char * );
 static void miracle_local_close( miracle_local );
 response_codes miracle_help( command_argument arg );
 response_codes miracle_run( command_argument arg );
@@ -79,6 +81,8 @@ valerie_parser miracle_parser_init_local( )
 
 		parser->connect = (parser_connect)miracle_local_connect;
 		parser->execute = (parser_execute)miracle_local_execute;
+		parser->push = (parser_push)miracle_local_push;
+		parser->received = (parser_received)miracle_local_receive;
 		parser->close = (parser_close)miracle_local_close;
 		parser->real = local;
 
@@ -497,6 +501,86 @@ static valerie_response miracle_local_execute( miracle_local local, char *comman
 	return cmd.response;
 }
 
+static valerie_response miracle_local_receive( miracle_local local, char *command, char *doc )
+{
+	command_argument_t cmd;
+	cmd.parser = local->parser;
+	cmd.response = valerie_response_init( );
+	cmd.tokeniser = valerie_tokeniser_init( );
+	cmd.command = command;
+	cmd.unit = -1;
+	cmd.argument = NULL;
+	cmd.root_dir = local->root_dir;
+
+	/* Set the default error */
+	miracle_command_set_error( &cmd, RESPONSE_SUCCESS );
+
+	/* Parse the command */
+	if ( valerie_tokeniser_parse_new( cmd.tokeniser, command, " " ) > 0 )
+	{
+		int index = 0;
+		int position = 1;
+
+		/* Strip quotes from all tokens */
+		for ( index = 0; index < valerie_tokeniser_count( cmd.tokeniser ); index ++ )
+			valerie_util_strip( valerie_tokeniser_get_string( cmd.tokeniser, index ), '\"' );
+
+		cmd.unit = miracle_command_parse_unit( &cmd, position );
+		if ( cmd.unit == -1 )
+			miracle_command_set_error( &cmd, RESPONSE_MISSING_ARG );
+		position ++;
+
+		miracle_receive( &cmd, doc );
+		miracle_command_set_error( &cmd, RESPONSE_SUCCESS );
+
+		free( cmd.argument );
+	}
+
+	valerie_tokeniser_close( cmd.tokeniser );
+
+	return cmd.response;
+}
+
+static valerie_response miracle_local_push( miracle_local local, char *command, mlt_service service )
+{
+	command_argument_t cmd;
+	cmd.parser = local->parser;
+	cmd.response = valerie_response_init( );
+	cmd.tokeniser = valerie_tokeniser_init( );
+	cmd.command = command;
+	cmd.unit = -1;
+	cmd.argument = NULL;
+	cmd.root_dir = local->root_dir;
+
+	/* Set the default error */
+	miracle_command_set_error( &cmd, RESPONSE_SUCCESS );
+
+	/* Parse the command */
+	if ( valerie_tokeniser_parse_new( cmd.tokeniser, command, " " ) > 0 )
+	{
+		int index = 0;
+		int position = 1;
+
+		/* Strip quotes from all tokens */
+		for ( index = 0; index < valerie_tokeniser_count( cmd.tokeniser ); index ++ )
+			valerie_util_strip( valerie_tokeniser_get_string( cmd.tokeniser, index ), '\"' );
+
+		cmd.unit = miracle_command_parse_unit( &cmd, position );
+		if ( cmd.unit == -1 )
+			miracle_command_set_error( &cmd, RESPONSE_MISSING_ARG );
+		position ++;
+
+		miracle_push( &cmd, service );
+		miracle_command_set_error( &cmd, RESPONSE_SUCCESS );
+
+		free( cmd.argument );
+	}
+
+	valerie_tokeniser_close( cmd.tokeniser );
+
+	return cmd.response;
+}
+
 /** Close the parser.
 */
 
@@ -506,7 +590,7 @@ static void miracle_local_close( miracle_local local )
 #ifdef linux
 	//pthread_kill_other_threads_np();
 	miracle_log( LOG_DEBUG, "Clean shutdown." );
-	free( local );
-	mlt_factory_close( );
+	//free( local );
+	//mlt_factory_close( );
 #endif
 }