[vlc-commits] commit: luahttp: use the same options as the http interface. ( Rémi Duraffort )

[git at videolan.org]

vlc | branch: master | Rémi Duraffort <ivoire at videolan.org> | Wed Jun  2 21:49:35 2010 +0200| [f5a1049dc3bdb660e5bfc29983e23ac9a7688345] | committer: Rémi Duraffort 

luahttp: use the same options as the http interface.

Nnot every options are implemented right now, only the most wanted.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f5a1049dc3bdb660e5bfc29983e23ac9a7688345
---

 modules/misc/lua/intf.c |   48 ++++++++++++++++++++++++++++++++++++++++++++--
 modules/misc/lua/vlc.c  |   14 +++++++++++++
 2 files changed, 59 insertions(+), 3 deletions(-)

diff --git a/modules/misc/lua/intf.c b/modules/misc/lua/intf.c
index 86bec16..7e36113 100644
--- a/modules/misc/lua/intf.c
+++ b/modules/misc/lua/intf.c
@@ -212,8 +212,50 @@ int Open_LuaIntf( vlc_object_t *p_this )
         goto error;
     }
 
-    psz_config = var_CreateGetString( p_intf, "lua-config" );
-    if( psz_config && *psz_config )
+    /*
+     * Get the lua-config string.
+     * If the string is empty, try with the old http-* options and build the righr line
+     */
+    psz_config = var_CreateGetNonEmptyString( p_intf, "lua-config" );
+    if( !psz_config && !strcmp( psz_name, "http" ) )
+    {
+        char *psz_http_host = var_CreateGetNonEmptyString( p_intf, "http-host" );
+        char *psz_http_src = var_CreateGetNonEmptyString( p_intf, "http-src" );
+        bool b_http_index = var_CreateGetBool( p_intf, "http-index" );
+        if( psz_http_host )
+        {
+            char *psz_esc = config_StringEscape( psz_http_host );
+            asprintf( &psz_config, "http={host='%s'", psz_esc );
+            free( psz_esc );
+            free( psz_http_host );
+        }
+        if( psz_http_src )
+        {
+            char *psz_esc = config_StringEscape( psz_http_src );
+            if( psz_config )
+            {
+                char *psz_tmp;
+                asprintf( &psz_tmp, "%s,dir='%s'", psz_config, psz_esc );
+                free( psz_config );
+                psz_config = psz_tmp;
+            }
+            else
+                asprintf( &psz_config, "http={dir='%s'", psz_esc );
+            free( psz_esc );
+            free( psz_http_src );
+        }
+        if( psz_config )
+        {
+            char *psz_tmp;
+            asprintf( &psz_tmp, "%s,no_index=%s}", psz_config, b_http_index ? "true" : "false" );
+            free( psz_config );
+            psz_config = psz_tmp;
+        }
+        else
+            asprintf( &psz_config, "http={no_index=%s}", b_http_index ? "true" : "false" );
+    }
+
+    if( psz_config )
     {
         char *psz_buffer;
         if( asprintf( &psz_buffer, "config={%s}", psz_config ) != -1 )
@@ -233,8 +275,8 @@ int Open_LuaIntf( vlc_object_t *p_this )
                 }
             }
         }
+        free( psz_config );
     }
-    free( psz_config );
 
     if( b_config_set == false )
     {
diff --git a/modules/misc/lua/vlc.c b/modules/misc/lua/vlc.c
index f7fb5bd..2e7b8bd 100644
--- a/modules/misc/lua/vlc.c
+++ b/modules/misc/lua/vlc.c
@@ -58,6 +58,16 @@
 
 #define CONFIG_TEXT N_("Lua interface configuration")
 #define CONFIG_LONGTEXT N_("Lua interface configuration string. Format is: '[\"<interface module name>\"] = { <option> = <value>, ...}, ...'.")
+#define HOST_TEXT N_( "Host address" )
+#define HOST_LONGTEXT N_( \
+    "Address and port the HTTP interface will listen on. It defaults to " \
+    "all network interfaces (0.0.0.0)." \
+    " If you want the HTTP interface to be available only on the local " \
+    "machine, enter 127.0.0.1" )
+#define SRC_TEXT N_( "Source directory" )
+#define SRC_LONGTEXT N_( "Source directory" )
+#define INDEX_TEXT N_( "Directory index" )
+#define INDEX_LONGTEXT N_( "Allow to build directory index" )
 
 static int vlc_sd_probe_Open( vlc_object_t * );
 
@@ -78,6 +88,10 @@ vlc_module_begin ()
                     INTF_TEXT, INTF_LONGTEXT, false )
         add_string( "lua-config", "", NULL,
                     CONFIG_TEXT, CONFIG_LONGTEXT, false )
+        set_section( N_("Lua HTTP" ), 0 )
+            add_string ( "http-host", NULL, NULL, HOST_TEXT, HOST_LONGTEXT, true )
+            add_string ( "http-src",  NULL, NULL, SRC_TEXT,  SRC_LONGTEXT,  true )
+            add_bool   ( "http-index", false, NULL, INDEX_TEXT, INDEX_LONGTEXT, true )
         set_callbacks( Open_LuaIntf, Close_LuaIntf )
 
     add_submodule ()