#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" )
+
+#define TELNETHOST_TEXT N_( "Host" )
+#define TELNETHOST_LONGTEXT N_( "This is the host on which the " \
+ "interface will listen. It defaults to all network interfaces (0.0.0.0)." \
+ " If you want this interface to be available only on the local " \
+ "machine, enter \"127.0.0.1\"." )
+#define TELNETPORT_TEXT N_( "Port" )
+#define TELNETPORT_LONGTEXT N_( "This is the TCP port on which this " \
+ "interface will listen. It defaults to 4212." )
+#define TELNETPORT_DEFAULT 4212
+#define TELNETPWD_TEXT N_( "Password" )
+#define TELNETPWD_LONGTEXT N_( "A single administration password is used " \
+ "to protect this interface. The default value is \"admin\"." )
+#define TELNETPWD_DEFAULT "admin"
+#define RCHOST_TEXT N_("TCP command input")
+#define RCHOST_LONGTEXT N_("Accept commands over a socket rather than stdin. " \
+ "You can set the address and port the interface will bind to." )
static int vlc_sd_probe_Open( vlc_object_t * );
vlc_module_begin ()
- set_shortname( N_( "Lua Art" ) )
- set_description( N_("Fetch artwork using lua scripts") )
- set_capability( "art finder", 10 )
- set_callbacks( FindArt, NULL )
+ set_shortname( N_("Lua Interface Module") )
+ set_description( N_("Interfaces implemented using lua scripts") )
+ add_shortcut( "luaintf" )
+ add_shortcut( "luahttp" )
+ /* add_shortcut( "http" ) */
+ add_shortcut( "luatelnet" )
+ add_shortcut( "telnet" )
+ add_shortcut( "luahotkeys" )
+ /* add_shortcut( "hotkeys" ) */
+ set_capability( "interface", 0 )
+ set_category( CAT_INTERFACE )
+ set_subcategory( SUBCAT_INTERFACE_CONTROL )
+ add_string( "lua-intf", "dummy",
+ INTF_TEXT, INTF_LONGTEXT, false )
+ add_string( "lua-config", "",
+ CONFIG_TEXT, CONFIG_LONGTEXT, false )
+ set_section( N_("Lua HTTP"), 0 )
+ add_string ( "http-host", NULL, HOST_TEXT, HOST_LONGTEXT, true )
+ add_string ( "http-src", NULL, SRC_TEXT, SRC_LONGTEXT, true )
+ add_bool ( "http-index", false, INDEX_TEXT, INDEX_LONGTEXT, true )
+ set_section( N_("Lua RC"), 0 )
+ add_string( "rc-host", NULL, RCHOST_TEXT, RCHOST_LONGTEXT, true )
+ set_section( N_("Lua Telnet"), 0 )
+ add_string( "telnet-host", "localhost", TELNETHOST_TEXT,
+ TELNETHOST_LONGTEXT, true )
+ add_integer( "telnet-port", TELNETPORT_DEFAULT, TELNETPORT_TEXT,
+ TELNETPORT_LONGTEXT, true )
+ add_password( "telnet-password", TELNETPWD_DEFAULT, TELNETPWD_TEXT,
+ TELNETPWD_LONGTEXT, true )
+
+ set_callbacks( Open_LuaIntf, Close_LuaIntf )
add_submodule ()
set_shortname( N_( "Lua Meta Fetcher" ) )
add_submodule ()
add_shortcut( "luaplaylist" )
- set_category( CAT_INPUT )
- set_subcategory( SUBCAT_INPUT_DEMUX )
set_shortname( N_("Lua Playlist") )
set_description( N_("Lua Playlist Parser Interface") )
set_capability( "demux", 2 )
set_callbacks( Open_LuaIntf, Close_LuaIntf )
add_submodule ()
- set_description( N_("Lua Interface Module") )
- add_shortcut( "luaintf" )
- add_shortcut( "luahttp" )
- add_shortcut( "http" )
- add_shortcut( "luatelnet" )
- add_shortcut( "telnet" )
- add_shortcut( "luahotkeys" )
- /* add_shortcut( "hotkeys" ) */
- set_capability( "interface", 0 )
- add_string( "lua-intf", "dummy", NULL,
- INTF_TEXT, INTF_LONGTEXT, false )
- add_string( "lua-config", "", NULL,
- CONFIG_TEXT, CONFIG_LONGTEXT, false )
- set_callbacks( Open_LuaIntf, Close_LuaIntf )
+ set_shortname( N_( "Lua Art" ) )
+ set_description( N_("Fetch artwork using lua scripts") )
+ set_capability( "art finder", 10 )
+ set_callbacks( FindArt, NULL )
add_submodule ()
set_shortname( N_("Lua Extension") )
set_description( N_("Lua SD Module") )
add_shortcut( "luasd" )
set_capability( "services_discovery", 0 )
- add_string( "lua-sd", "", NULL, "", "", false )
- add_string( "lua-longname", "", NULL, "", "", false )
+ add_string( "lua-sd", "", NULL, NULL, false )
+ change_volatile()
+ add_string( "lua-longname", "", NULL, NULL, false )
+ change_volatile()
set_callbacks( Open_LuaSD, Close_LuaSD )
add_submodule ()
i++;
free( datadir );
-#if !(defined(__APPLE__) || defined(SYS_BEOS) || defined(WIN32))
+#if !(defined(__APPLE__) || defined(WIN32))
if( likely(asprintf( &ppsz_dir_list[i], "%s"DIR_SEP"lua"DIR_SEP"%s",
config_GetLibDir(), luadirname ) != -1) )
i++;
psz_datapath, luadirname ) != -1) )
i++;
-#if defined(__APPLE__) || defined(SYS_BEOS) || defined(WIN32)
+#if defined(__APPLE__)
if( likely(asprintf( &ppsz_dir_list[i],
"%s"DIR_SEP"share"DIR_SEP"lua"DIR_SEP"%s",
psz_datapath, luadirname ) != -1) )
void vlclua_dir_list_free( char **ppsz_dir_list )
{
- char **ppsz_dir;
- for( ppsz_dir = ppsz_dir_list; *ppsz_dir; ppsz_dir++ )
+ for( char **ppsz_dir = ppsz_dir_list; *ppsz_dir; ppsz_dir++ )
free( *ppsz_dir );
free( ppsz_dir_list );
}
void * user_data)
{
char **ppsz_dir_list = NULL;
+ int i_ret;
- int i_ret = vlclua_dir_list( p_this, luadirname, &ppsz_dir_list );
- if( i_ret != VLC_SUCCESS )
+ if((i_ret = vlclua_dir_list( p_this, luadirname, &ppsz_dir_list ) != VLC_SUCCESS))
return i_ret;
- i_ret = VLC_EGENERIC;
+ i_ret = VLC_EGENERIC;
for( char **ppsz_dir = ppsz_dir_list; *ppsz_dir; ppsz_dir++ )
{
char **ppsz_filelist;
- int i_files;
msg_Dbg( p_this, "Trying Lua scripts in %s", *ppsz_dir );
- i_files = vlc_scandir( *ppsz_dir, &ppsz_filelist, file_select,
- file_compare );
+ int i_files = vlc_scandir( *ppsz_dir, &ppsz_filelist, file_select,
+ file_compare );
if( i_files < 0 )
continue;
char *vlclua_find_file( vlc_object_t *p_this, const char *psz_luadirname, const char *psz_name )
{
char **ppsz_dir_list = NULL;
- char **ppsz_dir;
vlclua_dir_list( p_this, psz_luadirname, &ppsz_dir_list );
- for( ppsz_dir = ppsz_dir_list; *ppsz_dir; ppsz_dir++ )
+
+ for( char **ppsz_dir = ppsz_dir_list; *ppsz_dir; ppsz_dir++ )
{
for( const char **ppsz_ext = ppsz_lua_exts; *ppsz_ext; ppsz_ext++ )
{
{
#define TRY_META( a, b ) \
lua_getfield( L, -1, a ); \
- if( lua_isstring( L, -1 ) ) \
+ if( lua_isstring( L, -1 ) && \
+ strcmp( lua_tostring( L, -1 ), "" ) ) \
{ \
char *psz_value = strdup( lua_tostring( L, -1 ) ); \
EnsureUTF8( psz_value ); \
/* Append item to playlist */
if( p_parent ) /* Add to node */
{
+ input_item_CopyOptions( p_parent, p_input );
input_item_node_AppendItem( p_parent_node, p_input );
}
else /* Play or Enqueue (preparse) */
lua_getglobal( L, "descriptor" );
if( !lua_isfunction( L, lua_gettop( L ) ) || lua_pcall( L, 0, 1, 0 ) )
{
+ msg_Warn( probe, "No 'descriptor' function in '%s'", psz_filename );
lua_pop( L, 1 );
if( !( psz_longname = strdup( *ppsz_file ) ) )
{
goto error;
}
}
- if( asprintf( &psz_name, "lua{sd=%s,longname=%s}",
- *ppsz_file, psz_longname ) < 0 )
+
+ char *psz_file_esc = config_StringEscape( *ppsz_file );
+ char *psz_longname_esc = config_StringEscape( psz_longname );
+ if( asprintf( &psz_name, "lua{sd='%s',longname='%s'}",
+ psz_file_esc, psz_longname_esc ) < 0 )
{
+ free( psz_file_esc );
+ free( psz_longname_esc );
free( psz_filename );
free( psz_longname );
goto error;
}
+ free( psz_file_esc );
+ free( psz_longname_esc );
vlc_sd_probe_Add( probe, psz_name, psz_longname, SD_CAT_INTERNET );
free( psz_name );
free( psz_longname );