/*****************************************************************************
- * vlc.c: Generic lua inteface functions
+ * vlc.c: Generic lua interface functions
*****************************************************************************
- * Copyright (C) 2007 the VideoLAN team
+ * Copyright (C) 2007-2008 the VideoLAN team
* $Id$
*
* Authors: Antoine Cellerier <dionoea at videolan tod org>
# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <assert.h>
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_meta.h>
#include <vlc_charset.h>
+#include <vlc_fs.h>
#include <vlc_aout.h>
+#include <vlc_services_discovery.h>
+#include <sys/stat.h>
#include <lua.h> /* Low level lua C API */
#include <lauxlib.h> /* Higher level C API */
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-
#define INTF_TEXT N_("Lua interface")
#define INTF_LONGTEXT N_("Lua interface module to load")
-#define CONFIG_TEXT N_("Lua inteface configuration")
+#define CONFIG_TEXT N_("Lua interface configuration")
#define CONFIG_LONGTEXT N_("Lua interface configuration string. Format is: '[\"<interface module name>\"] = { <option> = <value>, ...}, ...'.")
-vlc_module_begin();
- add_submodule();
- set_shortname( N_( "Lua Art" ) );
- set_description( _("Fetch artwork using lua scripts") );
- set_capability( "art finder", 10 );
- set_callbacks( E_(FindArt), NULL );
- add_submodule();
- add_shortcut( "luaplaylist" );
- set_category( CAT_INPUT );
- set_subcategory( SUBCAT_INPUT_DEMUX );
- set_shortname( _("Lua Playlist") );
- set_description( _("Lua Playlist Parser Interface") );
- set_capability( "demux", 2 );
- set_callbacks( E_(Import_LuaPlaylist), E_(Close_LuaPlaylist) );
- add_submodule();
- add_shortcut( "luaintf" );
- add_shortcut( "luarc" );
- /* add_shortcut( "rc" ); */
- add_shortcut( "luahotkeys" );
- /* add_shortcut( "hotkeys" ); */
- add_shortcut( "luatelnet" );
- /* add_shortcut( "telnet" ); */
- add_shortcut( "luahttp" );
- /* add_shortcut( "http" ); */
- set_description( _("Lua Interface Module") );
- set_capability( "interface", 0 );
+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 )
+
+ add_submodule ()
+ set_shortname( N_( "Lua Meta Fetcher" ) )
+ set_description( N_("Fetch meta data using lua scripts") )
+ set_capability( "meta fetcher", 10 )
+ set_callbacks( FetchMeta, NULL )
+
+ add_submodule ()
+ set_shortname( N_( "Lua Meta Reader" ) )
+ set_description( N_("Read meta data using lua scripts") )
+ set_capability( "meta reader", 10 )
+ set_callbacks( ReadMeta, NULL )
+
+ 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( Import_LuaPlaylist, Close_LuaPlaylist )
+
+ add_submodule ()
+ set_description( N_("Lua Interface Module (shortcuts)") )
+ add_shortcut( "luarc" )
+ add_shortcut( "rc" )
+ set_capability( "interface", 25 )
+ 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 );
+ INTF_TEXT, INTF_LONGTEXT, false )
add_string( "lua-config", "", NULL,
- CONFIG_TEXT, CONFIG_LONGTEXT, false );
- set_callbacks( E_(Open_LuaIntf), E_(Close_LuaIntf) );
-vlc_module_end();
-
-/*****************************************************************************
- * Internal lua<->vlc utils
- *****************************************************************************/
-vlc_object_t * vlclua_get_this( lua_State *L )
-{
- vlc_object_t * p_this;
- lua_getglobal( L, "vlc" );
- lua_getfield( L, -1, "private" );
- p_this = (vlc_object_t*)lua_topointer( L, lua_gettop( L ) );
- lua_pop( L, 2 );
- return p_this;
-}
-
-/*****************************************************************************
- * VLC error code translation
- *****************************************************************************/
-int vlclua_push_ret( lua_State *L, int i_error )
-{
- lua_pushnumber( L, i_error );
- lua_pushstring( L, vlc_error( i_error ) );
- return 2;
-}
-
-/*****************************************************************************
- * Get the VLC version string
- *****************************************************************************/
-int vlclua_version( lua_State *L )
-{
- lua_pushstring( L, VLC_Version() );
- return 1;
-}
-
-/*****************************************************************************
- * Get the VLC copyright
- *****************************************************************************/
-int vlclua_copyright( lua_State *L )
-{
- lua_pushstring( L, COPYRIGHT_MESSAGE );
- return 1;
-}
-
-/*****************************************************************************
- * Get the VLC license msg/disclaimer
- *****************************************************************************/
-int vlclua_license( lua_State *L )
-{
- lua_pushstring( L, LICENSE_MSG );
- return 1;
-}
-
-/*****************************************************************************
- * Quit VLC
- *****************************************************************************/
-int vlclua_quit( lua_State *L )
-{
- vlc_object_t *p_this = vlclua_get_this( L );
- /* The rc.c code also stops the playlist ... not sure if this is needed
- * though. */
- vlc_object_kill( p_this->p_libvlc );
- return 0;
-}
-
-/*****************************************************************************
- * Global properties getters
- *****************************************************************************/
-int vlclua_datadir( lua_State *L )
-{
- lua_pushstring( L, config_GetDataDir() );
- return 1;
-}
-int vlclua_homedir( lua_State *L )
-{
- lua_pushstring( L, vlclua_get_this( L )->p_libvlc->psz_homedir );
- return 1;
-}
-int vlclua_configdir( lua_State *L )
-{
- lua_pushstring( L, vlclua_get_this( L )->p_libvlc->psz_configdir );
- return 1;
-}
-int vlclua_cachedir( lua_State *L )
-{
- lua_pushstring( L, vlclua_get_this( L )->p_libvlc->psz_cachedir );
- return 1;
-}
-int vlclua_datadir_list( lua_State *L )
-{
- const char *psz_dirname = luaL_checkstring( L, 1 );
- vlc_object_t *p_this = vlclua_get_this( L );
- char *ppsz_dir_list[] = { NULL, NULL, NULL, NULL };
- char **ppsz_dir = ppsz_dir_list;
- int i = 1;
-
- if( vlclua_dir_list( p_this, psz_dirname, ppsz_dir_list ) != VLC_SUCCESS )
- return 0;
- lua_newtable( L );
- for( ; *ppsz_dir; ppsz_dir++ )
- {
- lua_pushstring( L, *ppsz_dir );
- lua_rawseti( L, -2, i );
- i ++;
- }
- return 1;
-}
-
-/*****************************************************************************
- * Volume related
- *****************************************************************************/
-int vlclua_volume_set( lua_State *L )
-{
- vlc_object_t *p_this = vlclua_get_this( L );
- int i_volume = luaL_checkint( L, 1 );
- /* Do we need to check that i_volume is in the AOUT_VOLUME_MIN->MAX range?*/
- return vlclua_push_ret( L, aout_VolumeSet( p_this, i_volume ) );
-}
-
-int vlclua_volume_get( lua_State *L )
-{
- vlc_object_t *p_this = vlclua_get_this( L );
- audio_volume_t i_volume;
- if( aout_VolumeGet( p_this, &i_volume ) == VLC_SUCCESS )
- lua_pushnumber( L, i_volume );
- else
- lua_pushnil( L );
- return 1;
-}
-
-int vlclua_volume_up( lua_State *L )
-{
- audio_volume_t i_volume;
- aout_VolumeUp( vlclua_get_this( L ),
- luaL_optint( L, 1, 1 ),
- &i_volume );
- lua_pushnumber( L, i_volume );
- return 1;
-}
-
-int vlclua_volume_down( lua_State *L )
-{
- audio_volume_t i_volume;
- aout_VolumeDown( vlclua_get_this( L ),
- luaL_optint( L, 1, 1 ),
- &i_volume );
- lua_pushnumber( L, i_volume );
- return 1;
-}
-
-/*****************************************************************************
- * Stream handling
- *****************************************************************************/
-int vlclua_stream_new( lua_State *L )
-{
- vlc_object_t * p_this = vlclua_get_this( L );
- stream_t * p_stream;
- const char * psz_url;
- psz_url = luaL_checkstring( L, -1 );
- p_stream = stream_UrlNew( p_this, psz_url );
- if( !p_stream )
- return luaL_error( L, "Error when opening url: `%s'", psz_url );
- lua_pushlightuserdata( L, p_stream );
- return 1;
-}
-
-int vlclua_stream_read( lua_State *L )
-{
- stream_t * p_stream;
- int n;
- uint8_t *p_read;
- int i_read;
- p_stream = (stream_t *)luaL_checklightuserdata( L, 1 );
- n = luaL_checkint( L, 2 );
- p_read = malloc( n );
- if( !p_read ) return vlclua_error( L );
- i_read = stream_Read( p_stream, p_read, n );
- lua_pushlstring( L, (const char *)p_read, i_read );
- free( p_read );
- return 1;
-}
-
-int vlclua_stream_readline( lua_State *L )
-{
- stream_t * p_stream;
- p_stream = (stream_t *)luaL_checklightuserdata( L, 1 );
- char *psz_line = stream_ReadLine( p_stream );
- if( psz_line )
- {
- lua_pushstring( L, psz_line );
- free( psz_line );
- }
- else
- lua_pushnil( L );
- return 1;
-}
-
-int vlclua_stream_delete( lua_State *L )
-{
- stream_t * p_stream;
- p_stream = (stream_t *)luaL_checklightuserdata( L, 1 );
- stream_Delete( p_stream );
- return 0;
-}
-
-/*****************************************************************************
- * String transformations
- *****************************************************************************/
-int vlclua_decode_uri( lua_State *L )
-{
- int i_top = lua_gettop( L );
- int i;
- for( i = 1; i <= i_top; i++ )
- {
- const char *psz_cstring = luaL_checkstring( L, 1 );
- char *psz_string = strdup( psz_cstring );
- lua_remove( L, 1 ); /* remove elements to prevent being limited by
- * the stack's size (this function will work with
- * up to (stack size - 1) arguments */
- decode_URI( psz_string );
- lua_pushstring( L, psz_string );
- free( psz_string );
- }
- return i_top;
-}
-
-int vlclua_resolve_xml_special_chars( lua_State *L )
-{
- int i_top = lua_gettop( L );
- int i;
- for( i = 1; i <= i_top; i++ )
- {
- const char *psz_cstring = luaL_checkstring( L, 1 );
- char *psz_string = strdup( psz_cstring );
- lua_remove( L, 1 ); /* remove elements to prevent being limited by
- * the stack's size (this function will work with
- * up to (stack size - 1) arguments */
- resolve_xml_special_chars( psz_string );
- lua_pushstring( L, psz_string );
- free( psz_string );
- }
- return i_top;
-}
-
-int vlclua_convert_xml_special_chars( lua_State *L )
-{
- int i_top = lua_gettop( L );
- int i;
- for( i = 1; i <= i_top; i++ )
- {
- char *psz_string = convert_xml_special_chars( luaL_checkstring(L,1) );
- lua_remove( L, 1 );
- lua_pushstring( L, psz_string );
- free( psz_string );
- }
- return i_top;
-}
-
-/*****************************************************************************
- * Messaging facilities
- *****************************************************************************/
-int vlclua_msg_dbg( lua_State *L )
-{
- int i_top = lua_gettop( L );
- vlc_object_t *p_this = vlclua_get_this( L );
- int i;
- for( i = 1; i <= i_top; i++ )
- msg_Dbg( p_this, "%s", luaL_checkstring( L, 1 ) );
- return 0;
-}
-int vlclua_msg_warn( lua_State *L )
-{
- int i_top = lua_gettop( L );
- vlc_object_t *p_this = vlclua_get_this( L );
- int i;
- for( i = 1; i <= i_top; i++ )
- msg_Warn( p_this, "%s", luaL_checkstring( L, i ) );
- return 0;
-}
-int vlclua_msg_err( lua_State *L )
-{
- int i_top = lua_gettop( L );
- vlc_object_t *p_this = vlclua_get_this( L );
- int i;
- for( i = 1; i <= i_top; i++ )
- msg_Err( p_this, "%s", luaL_checkstring( L, i ) );
- return 0;
-}
-int vlclua_msg_info( lua_State *L )
-{
- int i_top = lua_gettop( L );
- vlc_object_t *p_this = vlclua_get_this( L );
- int i;
- for( i = 1; i <= i_top; i++ )
- msg_Info( p_this, "%s", luaL_checkstring( L, i ) );
- return 0;
-}
+ CONFIG_TEXT, CONFIG_LONGTEXT, false )
+ set_callbacks( Open_LuaIntf, Close_LuaIntf )
+
+ add_submodule ()
+ set_shortname( N_("Lua Extension") )
+ add_shortcut( "luaextension" )
+ set_capability( "extension", 1 )
+ set_callbacks( Open_Extension, Close_Extension )
+
+ add_submodule ()
+ 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 )
+ set_callbacks( Open_LuaSD, Close_LuaSD )
+
+ add_submodule ()
+ set_description( N_("Freebox TV") )
+ add_shortcut( "freebox" )
+ set_capability( "services_discovery", 0 )
+ set_callbacks( Open_LuaSD, Close_LuaSD )
+
+ add_submodule ()
+ set_description( N_("French TV") )
+ add_shortcut( "frenchtv" )
+ set_capability( "services_discovery", 0 )
+ set_callbacks( Open_LuaSD, Close_LuaSD )
+
+ VLC_SD_PROBE_SUBMODULE
+
+vlc_module_end ()
/*****************************************************************************
*
*****************************************************************************/
+static const char *ppsz_lua_exts[] = { ".luac", ".lua", NULL };
static int file_select( const char *file )
{
int i = strlen( file );
- return i > 4 && !strcmp( file+i-4, ".lua" );
+ int j;
+ for( j = 0; ppsz_lua_exts[j]; j++ )
+ {
+ int l = strlen( ppsz_lua_exts[j] );
+ if( i >= l && !strcmp( file+i-l, ppsz_lua_exts[j] ) )
+ return 1;
+ }
+ return 0;
}
static int file_compare( const char **a, const char **b )
}
int vlclua_dir_list( vlc_object_t *p_this, const char *luadirname,
- char **ppsz_dir_list )
+ char ***pppsz_dir_list )
{
+#define MAX_DIR_LIST_SIZE 5
+ *pppsz_dir_list = malloc(MAX_DIR_LIST_SIZE*sizeof(char *));
+ if (!*pppsz_dir_list)
+ return VLC_EGENERIC;
+ char **ppsz_dir_list = *pppsz_dir_list;
+
int i = 0;
- if( asprintf( &ppsz_dir_list[i], "%s" DIR_SEP "lua" DIR_SEP "%s",
- p_this->p_libvlc->psz_datadir, luadirname ) < 0 )
- return VLC_ENOMEM;
- i++;
+ char *datadir = config_GetUserDir( VLC_DATA_DIR );
-# if defined(__APPLE__) || defined(SYS_BEOS) || defined(WIN32)
- {
- const char *psz_vlcpath = config_GetDataDir();
- if( asprintf( &ppsz_dir_list[i], "%s" DIR_SEP "lua" DIR_SEP "%s",
- psz_vlcpath, luadirname ) < 0 )
- return VLC_ENOMEM;
- i++;
-# ifdef WIN32
- if( asprintf( &ppsz_dir_list[i], "%s" DIR_SEP "scripts" DIR_SEP "%s",
- psz_vlcpath, luadirname ) < 0 )
- return VLC_ENOMEM;
- i++;
-# else
- if( asprintf( &ppsz_dir_list[i], "%s" DIR_SEP "share" DIR_SEP "lua" DIR_SEP "%s",
- psz_vlcpath, luadirname ) < 0 )
- return VLC_ENOMEM;
+ if( likely(datadir != NULL)
+ && likely(asprintf( &ppsz_dir_list[i], "%s"DIR_SEP"lua"DIR_SEP"%s",
+ datadir, luadirname ) != -1) )
i++;
-# endif
+ free( datadir );
- }
-# else
- if( asprintf( &ppsz_dir_list[i],
- "share" DIR_SEP "lua" DIR_SEP "%s", luadirname ) < 0 )
- return VLC_ENOMEM;
+#if !(defined(__APPLE__) || defined(SYS_BEOS) || defined(WIN32))
+ if( likely(asprintf( &ppsz_dir_list[i], "%s"DIR_SEP"lua"DIR_SEP"%s",
+ config_GetLibDir(), luadirname ) != -1) )
+ i++;
+#endif
-# ifdef HAVE_SYS_STAT_H
+ char *psz_datapath = config_GetDataDir( p_this );
+ if( likely(psz_datapath != NULL) )
{
- struct stat stat_info;
- if( ( utf8_stat( ppsz_dir_list[i], &stat_info ) == -1 )
- || !S_ISDIR( stat_info.st_mode ) )
- {
- free(ppsz_dir_list[i]);
- if( asprintf( &ppsz_dir_list[i], "%s" DIR_SEP "lua" DIR_SEP "%s",
- config_GetDataDir (), luadirname ) < 0 )
- return VLC_ENOMEM;
- }
+ if( likely(asprintf( &ppsz_dir_list[i], "%s"DIR_SEP"lua"DIR_SEP"%s",
+ psz_datapath, luadirname ) != -1) )
+ i++;
+
+#if defined(__APPLE__) || defined(SYS_BEOS) || defined(WIN32)
+ if( likely(asprintf( &ppsz_dir_list[i],
+ "%s"DIR_SEP"share"DIR_SEP"lua"DIR_SEP"%s",
+ psz_datapath, luadirname ) != -1) )
+ i++;
+#endif
+ free( psz_datapath );
}
-# endif
- i++;
-# endif
+
+ ppsz_dir_list[i] = NULL;
+
+ assert( i < MAX_DIR_LIST_SIZE);
+
return VLC_SUCCESS;
}
+void vlclua_dir_list_free( char **ppsz_dir_list )
+{
+ char **ppsz_dir;
+ for( ppsz_dir = ppsz_dir_list; *ppsz_dir; ppsz_dir++ )
+ free( *ppsz_dir );
+ free( ppsz_dir_list );
+}
+
/*****************************************************************************
* Will execute func on all scripts in luadirname, and stop if func returns
* success.
*****************************************************************************/
int vlclua_scripts_batch_execute( vlc_object_t *p_this,
const char * luadirname,
- int (*func)(vlc_object_t *, const char *, lua_State *, void *),
- lua_State * L,
+ int (*func)(vlc_object_t *, const char *, void *),
void * user_data)
{
- int i_ret = VLC_EGENERIC;
-
- DIR *dir = NULL;
- char **ppsz_filelist = NULL;
- char **ppsz_fileend = NULL;
- char **ppsz_file;
+ char **ppsz_dir_list = NULL;
- char *ppsz_dir_list[] = { NULL, NULL, NULL, NULL };
- char **ppsz_dir;
-
- i_ret = vlclua_dir_list( p_this, luadirname, ppsz_dir_list );
+ int i_ret = vlclua_dir_list( p_this, luadirname, &ppsz_dir_list );
if( i_ret != VLC_SUCCESS )
return i_ret;
i_ret = VLC_EGENERIC;
-
- for( ppsz_dir = ppsz_dir_list; *ppsz_dir; ppsz_dir++ )
+ for( char **ppsz_dir = ppsz_dir_list; *ppsz_dir; ppsz_dir++ )
{
+ char **ppsz_filelist;
int i_files;
- if( ppsz_filelist )
- {
- for( ppsz_file = ppsz_filelist; ppsz_file < ppsz_fileend;
- ppsz_file++ )
- free( *ppsz_file );
- free( ppsz_filelist );
- ppsz_filelist = NULL;
- }
-
- if( dir )
- {
- closedir( dir );
- }
-
msg_Dbg( p_this, "Trying Lua scripts in %s", *ppsz_dir );
- dir = utf8_opendir( *ppsz_dir );
-
- if( !dir ) continue;
- i_files = utf8_loaddir( dir, &ppsz_filelist, file_select,
+ i_files = vlc_scandir( *ppsz_dir, &ppsz_filelist, file_select,
file_compare );
- if( i_files < 1 ) continue;
- ppsz_fileend = ppsz_filelist + i_files;
+ if( i_files < 0 )
+ continue;
- for( ppsz_file = ppsz_filelist; ppsz_file < ppsz_fileend; ppsz_file++ )
- {
- char *psz_filename;
- if( asprintf( &psz_filename,
- "%s" DIR_SEP "%s", *ppsz_dir, *ppsz_file ) < 0)
- return VLC_ENOMEM;
- msg_Dbg( p_this, "Trying Lua playlist script %s", psz_filename );
+ char **ppsz_file = ppsz_filelist;
+ char **ppsz_fileend = ppsz_filelist + i_files;
- i_ret = func( p_this, psz_filename, L, user_data );
+ while( ppsz_file < ppsz_fileend )
+ {
+ char *psz_filename;
- free( psz_filename );
+ if( asprintf( &psz_filename,
+ "%s" DIR_SEP "%s", *ppsz_dir, *ppsz_file ) == -1 )
+ psz_filename = NULL;
+ free( *(ppsz_file++) );
- if( i_ret == VLC_SUCCESS ) break;
+ if( likely(psz_filename != NULL) )
+ {
+ msg_Dbg( p_this, "Trying Lua playlist script %s",
+ psz_filename );
+ i_ret = func( p_this, psz_filename, user_data );
+ free( psz_filename );
+ if( i_ret == VLC_SUCCESS )
+ break;
+ }
}
- if( i_ret == VLC_SUCCESS ) break;
- }
- if( ppsz_filelist )
- {
- for( ppsz_file = ppsz_filelist; ppsz_file < ppsz_fileend;
- ppsz_file++ )
- free( *ppsz_file );
+ while( ppsz_file < ppsz_fileend )
+ free( *(ppsz_file++) );
free( ppsz_filelist );
+
+ if( i_ret == VLC_SUCCESS )
+ break;
}
+ vlclua_dir_list_free( ppsz_dir_list );
+ return i_ret;
+}
+
+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++ )
- free( *ppsz_dir );
+ {
+ for( const char **ppsz_ext = ppsz_lua_exts; *ppsz_ext; ppsz_ext++ )
+ {
+ char *psz_filename;
+ struct stat st;
- if( dir ) closedir( dir );
+ if( asprintf( &psz_filename, "%s"DIR_SEP"%s%s", *ppsz_dir,
+ psz_name, *ppsz_ext ) < 0 )
+ {
+ vlclua_dir_list_free( ppsz_dir_list );
+ return NULL;
+ }
- return i_ret;
+ if( vlc_stat( psz_filename, &st ) == 0
+ && S_ISREG( st.st_mode ) )
+ {
+ vlclua_dir_list_free( ppsz_dir_list );
+ return psz_filename;
+ }
+ free( psz_filename );
+ }
+ }
+ vlclua_dir_list_free( ppsz_dir_list );
+ return NULL;
}
-
/*****************************************************************************
* Meta data setters utility.
* Playlist item table should be on top of the stack when these are called
msg_Dbg( p_this, "Custom meta %s, %s: %s",
psz_meta_category, psz_meta_name,
psz_meta_value );
- input_ItemAddInfo( p_input, psz_meta_category,
- psz_meta_name, psz_meta_value );
+ input_item_AddInfo( p_input, psz_meta_category,
+ psz_meta_name, "%s", psz_meta_value );
}
lua_pop( L, 1 ); /* pop item */
/* ... item meta key value key2 */
input_item_t *p_parent, bool b_play )
{
int i_count = 0;
+ input_item_node_t *p_parent_node = NULL;
+
+ assert( p_parent || p_playlist );
/* playlist */
if( lua_istable( L, -1 ) )
{
+ if( p_parent ) p_parent_node = input_item_node_Create( p_parent );
lua_pushnil( L );
/* playlist nil */
while( lua_next( L, -2 ) )
vlclua_read_options( p_this, L, &i_options, &ppsz_options );
/* Create input item */
- p_input = input_ItemNewExt( p_playlist, psz_path,
+ p_input = input_item_NewExt( p_playlist, psz_path,
psz_name, i_options,
(const char **)ppsz_options,
+ VLC_INPUT_OPTION_TRUSTED,
i_duration );
lua_pop( L, 3 ); /* pop "path name item" */
/* playlist key item */
/* Append item to playlist */
if( p_parent ) /* Add to node */
- input_ItemAddSubItem( p_parent, p_input );
+ {
+ input_item_node_AppendItem( p_parent_node, p_input );
+ }
else /* Play or Enqueue (preparse) */
/* FIXME: playlist_AddInput() can fail */
playlist_AddInput( p_playlist, p_input,
- PLAYLIST_APPEND |
+ PLAYLIST_APPEND |
( b_play ? PLAYLIST_GO : PLAYLIST_PREPARSE ),
PLAYLIST_END, true, false );
i_count ++; /* increment counter */
/* playlist key */
}
/* playlist */
+ if( p_parent )
+ {
+ if( i_count ) input_item_node_PostAndDelete( p_parent_node );
+ else input_item_node_Delete( p_parent_node );
+ }
}
else
{
}
return i_count;
}
+
+static int vlc_sd_probe_Open( vlc_object_t *obj )
+{
+ vlc_probe_t *probe = (vlc_probe_t *)obj;
+ char **ppsz_filelist = NULL;
+ char **ppsz_fileend = NULL;
+ char **ppsz_file;
+ char *psz_name;
+ char **ppsz_dir_list = NULL;
+ char **ppsz_dir;
+ lua_State *L = NULL;
+ vlclua_dir_list( obj, "sd", &ppsz_dir_list );
+ for( ppsz_dir = ppsz_dir_list; *ppsz_dir; ppsz_dir++ )
+ {
+ int i_files;
+ if( ppsz_filelist )
+ {
+ for( ppsz_file = ppsz_filelist; ppsz_file < ppsz_fileend;
+ ppsz_file++ )
+ free( *ppsz_file );
+ free( ppsz_filelist );
+ ppsz_filelist = NULL;
+ }
+ i_files = vlc_scandir( *ppsz_dir, &ppsz_filelist, file_select,
+ file_compare );
+ if( i_files < 1 ) continue;
+ ppsz_fileend = ppsz_filelist + i_files;
+ for( ppsz_file = ppsz_filelist; ppsz_file < ppsz_fileend; ppsz_file++ )
+ {
+ char *psz_filename;
+ if( asprintf( &psz_filename,
+ "%s" DIR_SEP "%s", *ppsz_dir, *ppsz_file ) < 0 )
+ {
+ goto error;
+ }
+ L = luaL_newstate();
+ if( !L )
+ {
+ msg_Err( probe, "Could not create new Lua State" );
+ free( psz_filename );
+ goto error;
+ }
+ luaL_openlibs( L );
+ if( vlclua_add_modules_path( probe, L, psz_filename ) )
+ {
+ msg_Err( probe, "Error while setting the module search path for %s",
+ psz_filename );
+ free( psz_filename );
+ goto error;
+ }
+ if( luaL_dofile( L, psz_filename ) )
+ {
+
+ msg_Err( probe, "Error loading script %s: %s", psz_filename,
+ lua_tostring( L, lua_gettop( L ) ) );
+ lua_pop( L, 1 );
+ free( psz_filename );
+ lua_close( L );
+ continue;
+ }
+ char *psz_longname;
+ char *temp = strchr( *ppsz_file, '.' );
+ if( temp )
+ *temp = '\0';
+ lua_getglobal( L, "descriptor" );
+ if( !lua_isfunction( L, lua_gettop( L ) ) || lua_pcall( L, 0, 1, 0 ) )
+ {
+ lua_pop( L, 1 );
+ if( !( psz_longname = strdup( *ppsz_file ) ) )
+ {
+ free( psz_filename );
+ goto error;
+ }
+ }
+ else
+ {
+ lua_getfield( L, -1, "title" );
+ if( !lua_isstring( L, -1 ) ||
+ !( psz_longname = strdup( lua_tostring( L, -1 ) ) ) )
+ {
+ free( psz_filename );
+ goto error;
+ }
+ }
+ if( asprintf( &psz_name, "lua{sd=%s,longname=%s}",
+ *ppsz_file, psz_longname ) < 0 )
+ {
+ free( psz_filename );
+ free( psz_longname );
+ goto error;
+ }
+ vlc_sd_probe_Add( probe, psz_name, psz_longname, SD_CAT_INTERNET );
+ free( psz_name );
+ free( psz_longname );
+ free( psz_filename );
+ lua_close( L );
+ }
+ }
+ if( ppsz_filelist )
+ {
+ for( ppsz_file = ppsz_filelist; ppsz_file < ppsz_fileend;
+ ppsz_file++ )
+ free( *ppsz_file );
+ free( ppsz_filelist );
+ }
+ vlclua_dir_list_free( ppsz_dir_list );
+ return VLC_PROBE_CONTINUE;
+error:
+ if( ppsz_filelist )
+ {
+ for( ppsz_file = ppsz_filelist; ppsz_file < ppsz_fileend;
+ ppsz_file++ )
+ free( *ppsz_file );
+ free( ppsz_filelist );
+ }
+ if( L )
+ lua_close( L );
+ vlclua_dir_list_free( ppsz_dir_list );
+ return VLC_ENOMEM;
+}
+
+static int vlclua_add_modules_path_inner( lua_State *L, const char *psz_path )
+{
+ int count = 0;
+ for( const char **ppsz_ext = ppsz_lua_exts; *ppsz_ext; ppsz_ext++ )
+ {
+ lua_pushfstring( L, "%s"DIR_SEP"modules"DIR_SEP"?%s;",
+ psz_path, *ppsz_ext );
+ count ++;
+ }
+
+ return count;
+}
+
+int __vlclua_add_modules_path( vlc_object_t *obj, lua_State *L, const char *psz_filename )
+{
+ /* Setup the module search path:
+ * * "The script's directory"/modules
+ * * "The script's parent directory"/modules
+ * * and so on for all the next directories in the directory list
+ */
+ char *psz_path = strdup( psz_filename );
+ if( !psz_path )
+ return 1;
+
+ char *psz_char = strrchr( psz_path, DIR_SEP_CHAR );
+ if( !psz_char )
+ {
+ free( psz_path );
+ return 1;
+ }
+ *psz_char = '\0';
+
+ /* psz_path now holds the file's directory */
+ psz_char = strrchr( psz_path, DIR_SEP_CHAR );
+ if( !psz_char )
+ {
+ free( psz_path );
+ return 1;
+ }
+ *psz_char = '\0';
+
+ /* Push package on stack */
+ int count = 0;
+ lua_getglobal( L, "package" );
+
+ /* psz_path now holds the file's parent directory */
+ count += vlclua_add_modules_path_inner( L, psz_path );
+ *psz_char = DIR_SEP_CHAR;
+
+ /* psz_path now holds the file's directory */
+ count += vlclua_add_modules_path_inner( L, psz_path );
+
+ char **ppsz_dir_list = NULL;
+ vlclua_dir_list( obj, psz_char+1/* gruik? */, &ppsz_dir_list );
+ char **ppsz_dir = ppsz_dir_list;
+
+ for( ; *ppsz_dir && strcmp( *ppsz_dir, psz_path ); ppsz_dir++ );
+ free( psz_path );
+
+ for( ; *ppsz_dir; ppsz_dir++ )
+ {
+ psz_path = *ppsz_dir;
+ /* FIXME: doesn't work well with meta/... modules due to the double
+ * directory depth */
+ psz_char = strrchr( psz_path, DIR_SEP_CHAR );
+ if( !psz_char )
+ {
+ vlclua_dir_list_free( ppsz_dir_list );
+ return 1;
+ }
+
+ *psz_char = '\0';
+ count += vlclua_add_modules_path_inner( L, psz_path );
+ *psz_char = DIR_SEP_CHAR;
+ count += vlclua_add_modules_path_inner( L, psz_path );
+ }
+
+ lua_getfield( L, -(count+1), "path" ); /* Get package.path */
+ lua_concat( L, count+1 ); /* Concat vlc module paths and package.path */
+ lua_setfield( L, -2, "path"); /* Set package.path */
+ lua_pop( L, 1 ); /* Pop the package module */
+
+ vlclua_dir_list_free( ppsz_dir_list );
+ return 0;
+}
+