lua_intf: also provide the --rc-host option for backward compatibility.

[vlc] / modules / misc / lua / intf.c

diff --git a/modules/misc/lua/intf.c b/modules/misc/lua/intf.c
index fd5583205a56394f5299f37793388ef1727ef00e..3fea2731d0108ffd1ef6307849cb9d640e4b5fec 100644 (file)
--- a/modules/misc/lua/intf.c
+++ b/modules/misc/lua/intf.c
@@ -36,7 +36,6 @@
 #include <vlc_meta.h>
 
 #include <vlc_interface.h>
-#include <vlc_playlist.h>
 #include <vlc_aout.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -78,20 +77,22 @@ static const struct
     { "luatelnet", "telnet" },
     { "telnet", "telnet" },
     { "luahttp", "http" },
-    { "http", "http" },
+    /* { "http", "http" }, */
     { NULL, NULL } };
 
 static const char *WordInList( const char *psz_list, const char *psz_word )
 {
-    size_t i_len = strlen( psz_word );
-
-    for( const char *s = psz_list; s; s = strchr( s, ',' ) )
+    for( ;; )
     {
-        if( !strncmp( s, psz_word, i_len )
-         && memchr( ",", s[i_len], 2 ) )
-            return s;
+        const char *end = strchr( psz_list, ',' );
+        if( end == NULL )
+            break;
+
+        if( !strncmp( psz_list, psz_word, end - psz_list ) )
+            return psz_list;
+        psz_list = end + 1;
     }
-    return NULL;
+    return !strcmp( psz_list, psz_word ) ? psz_list : NULL;
 }
 
 static char *GetModuleName( intf_thread_t *p_intf )
@@ -168,15 +169,14 @@ int Open_LuaIntf( vlc_object_t *p_this )
         goto error;
     }
 
+    vlclua_set_this( L, p_intf );
+    vlclua_set_intf( L, p_sys );
+
     luaL_openlibs( L );
 
     /* register our functions */
     luaL_register( L, "vlc", p_reg );
 
-    /* store a pointer to p_intf (FIXME: user could overwrite this) */
-    lua_pushlightuserdata( L, p_intf );
-    lua_setfield( L, -2, "private" );
-
     /* register submodules */
     luaopen_acl( L );
     luaopen_config( L );
@@ -197,40 +197,102 @@ int Open_LuaIntf( vlc_object_t *p_this )
     luaopen_vlm( L );
     luaopen_volume( L );
     luaopen_gettext( L );
+    luaopen_xml( L );
+    luaopen_md5( L );
 
     /* clean up */
     lua_pop( L, 1 );
 
-    /* <gruik> */
     /* Setup the module search path */
+    if( vlclua_add_modules_path( p_intf, L, p_sys->psz_filename ) )
     {
-    char *psz_command;
-    char *psz_char = strrchr(p_sys->psz_filename,DIR_SEP_CHAR);
-    *psz_char = '\0';
-    /* FIXME: don't use luaL_dostring */
-    if( asprintf( &psz_command,
-                  "package.path = [[%s"DIR_SEP"modules"DIR_SEP"?.lua;]]..package.path",
-                  p_sys->psz_filename ) < 0 )
-    {
+        msg_Warn( p_intf, "Error while setting the module search path for %s",
+                  p_sys->psz_filename );
+        lua_close( L );
         goto error;
     }
-    *psz_char = DIR_SEP_CHAR;
-    if( luaL_dostring( L, psz_command ) )
+
+    /*
+     * Get the lua-config string.
+     * If the string is empty, try with the old http-* or telnet-* options
+     * and build the right configuration line
+     */
+    psz_config = var_CreateGetNonEmptyString( p_intf, "lua-config" );
+    if( !psz_config )
     {
-        free( psz_command );
-        goto error;
-    }
-    free( psz_command );
+        if( !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" );
+        }
+        else if( !strcmp( psz_name, "telnet" ) )
+        {
+            char *psz_telnet_host = var_CreateGetString( p_intf, "telnet-host" );
+            int i_telnet_port = var_CreateGetInteger( p_intf, "telnet-port" );
+            char *psz_telnet_passwd = var_CreateGetString( p_intf, "telnet-password" );
+
+            char *psz_esc_host = config_StringEscape( psz_telnet_host );
+            char *psz_esc_passwd = config_StringEscape( psz_telnet_passwd );
+
+            asprintf( &psz_config, "telnet={host='%s:%d',password='%s'}", psz_esc_host ? psz_esc_host : "", i_telnet_port, psz_esc_passwd );
+
+            free( psz_esc_host );
+            free( psz_esc_passwd );
+            free( psz_telnet_passwd );
+            free( psz_telnet_host );
+        }
+        else if( !strcmp( psz_name, "rc" ) )
+        {
+            char *psz_rc_host = var_CreateGetNonEmptyString( p_intf, "rc-host" );
+            if( psz_rc_host )
+            {
+                char *psz_esc_host = config_StringEscape( psz_rc_host );
+                asprintf( &psz_config, "rc={host='%s'}", psz_esc_host );
+
+                free( psz_esc_host );
+                free( psz_rc_host );
+            }
+        }
     }
-    /* </gruik> */
 
-    psz_config = var_CreateGetString( p_intf, "lua-config" );
-    if( psz_config && *psz_config )
+    if( psz_config )
     {
         char *psz_buffer;
         if( asprintf( &psz_buffer, "config={%s}", psz_config ) != -1 )
         {
-            printf("%s\n", psz_buffer);
+            msg_Dbg( p_intf, "Setting config variable: %s", psz_buffer );
             if( luaL_dostring( L, psz_buffer ) == 1 )
                 msg_Err( p_intf, "Error while parsing \"lua-config\"." );
             free( psz_buffer );
@@ -245,8 +307,8 @@ int Open_LuaIntf( vlc_object_t *p_this )
                 }
             }
         }
+        free( psz_config );
     }
-    free( psz_config );
 
     if( b_config_set == false )
     {