Improved push capabilities

[melted] / src / modules / valerie / consumer_valerie.c

diff --git a/src/modules/valerie/consumer_valerie.c b/src/modules/valerie/consumer_valerie.c
index e473584..71a274c 100644 (file)
--- a/src/modules/valerie/consumer_valerie.c
+++ b/src/modules/valerie/consumer_valerie.c
@@ -42,15 +42,28 @@ mlt_consumer consumer_valerie_init( char *arg )
        // If no malloc'd and consumer init ok
        if ( this != NULL && mlt_consumer_init( this, NULL ) == 0 )
        {
-               // Allow thread to be started/stopped
-               this->start = consumer_start;
-               this->is_stopped = consumer_is_stopped;
+               if ( arg != NULL && strchr( arg, ':' ) )
+               {
+                       char *temp = NULL;
+                       int port = atoi( strchr( arg, ':' ) + 1 );
+                       mlt_properties_set( mlt_consumer_properties( this ), "server", arg );
+                       temp = mlt_properties_get( mlt_consumer_properties( this ), "server" );
+                       *( strchr( temp, ':' ) ) = '\0';
+                       mlt_properties_set_int( mlt_consumer_properties( this ), "port", port );
+               }
+               else
+               {
+                       mlt_properties_set( mlt_consumer_properties( this ), "server", arg == NULL ? "localhost" : arg );
+                       mlt_properties_set_int( mlt_consumer_properties( this ), "port", 5250 );
+               }
 
-               mlt_properties_set( mlt_consumer_properties( this ), "server", arg == NULL ? "localhost" : arg );
-               mlt_properties_set_int( mlt_consumer_properties( this ), "port", 5250 );
                mlt_properties_set_int( mlt_consumer_properties( this ), "unit", 0 );
                mlt_properties_set( mlt_consumer_properties( this ), "command", "append" );
 
+               // Allow thread to be started/stopped
+               this->start = consumer_start;
+               this->is_stopped = consumer_is_stopped;
+
                // Return the consumer produced
                return this;
        }
@@ -80,7 +93,10 @@ static int consumer_start( mlt_consumer this )
        // If this is a reuse, then a valerie object will exist
        valerie connection = mlt_properties_get_data( properties, "connection", NULL );
 
-       if ( service != NULL )
+       // Special case - we can get a doc too...
+       char *doc = mlt_properties_get( properties, "westley" );
+
+       if ( service != NULL || doc != NULL )
        {
                // Initiate the connection if required
                if ( connection == NULL )
@@ -104,20 +120,32 @@ static int consumer_start( mlt_consumer this )
                // If we have connection, push the service over
                if ( connection != NULL )
                {
-                       int error;
+                       if ( doc == NULL )
+                       {
+                               int error;
 
-                       // Set the title if provided
-                       if ( title != NULL )
-                               mlt_properties_set( mlt_service_properties( service ), "title", title );
-                       else if ( mlt_properties_get( mlt_service_properties( service ), "title" ) == NULL )
-                               mlt_properties_set( mlt_service_properties( service ), "title", "Anonymous Submission" );
+                               // Set the title if provided
+                               if ( title != NULL )
+                                       mlt_properties_set( mlt_service_properties( service ), "title", title );
+                               else if ( mlt_properties_get( mlt_service_properties( service ), "title" ) == NULL )
+                                       mlt_properties_set( mlt_service_properties( service ), "title", "Anonymous Submission" );
 
-                       // Push the service
-                       error = valerie_unit_push( connection, unit, command, service );
+                               // Push the service
+                               error = valerie_unit_push( connection, unit, command, service );
 
-                       // Report error
-                       if ( error != valerie_ok )
-                               fprintf( stderr, "Push failed on %s:%d %s u%d (%d)\n", server, port, command, unit, error );
+                               // Report error
+                               if ( error != valerie_ok )
+                                       fprintf( stderr, "Push failed on %s:%d %s u%d (%d)\n", server, port, command, unit, error );
+                       }
+                       else
+                       {
+                               // Push the service
+                               int error = valerie_unit_receive( connection, unit, command, doc );
+
+                               // Report error
+                               if ( error != valerie_ok )
+                                       fprintf( stderr, "Send failed on %s:%d %s u%d (%d)\n", server, port, command, unit, error );
+                       }
                }
        }