X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fmisc%2Flua%2Fvlc.c;h=36fee88a0624d7a02119dda4aa80e2c475d84dc4;hb=588723d7c65ccdb0fa5cc39b3cae132176637300;hp=6299cea8bd9f8b7cd53c6960d0150f8cf78619a4;hpb=1b65354670ab8a6a1c831eae0d7b5c819d0edf2c;p=vlc

diff --git a/modules/misc/lua/vlc.c b/modules/misc/lua/vlc.c
index 6299cea8bd..36fee88a06 100644
--- a/modules/misc/lua/vlc.c
+++ b/modules/misc/lua/vlc.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
- * 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>
@@ -29,7 +29,14 @@
 #   define  _GNU_SOURCE
 #endif
 
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <assert.h>
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_meta.h>
 #include <vlc_charset.h>
 #include <vlc_aout.h>
@@ -47,28 +54,24 @@
 #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_shortcut( "luameta" );
-    set_shortname( N_( "Lua Meta" ) );
-    set_description( _("Fetch metadata using lua scripts") );
-    set_capability( "meta fetcher", 10 );
-    set_callbacks( E_(FindMeta), NULL );
-    add_submodule();
         set_shortname( N_( "Lua Art" ) );
-        set_description( _("Fetch artwork using lua scripts") );
+        set_description( N_("Fetch artwork using lua scripts") );
         set_capability( "art finder", 10 );
-        set_callbacks( E_(FindArt), NULL );
+        set_callbacks( 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( "demux2", 9 );
-        set_callbacks( E_(Import_LuaPlaylist), E_(Close_LuaPlaylist) );
+        set_shortname( N_("Lua Playlist") );
+        set_description( N_("Lua Playlist Parser Interface") );
+        set_capability( "demux", 2 );
+        set_callbacks( Import_LuaPlaylist, Close_LuaPlaylist );
+
     add_submodule();
         add_shortcut( "luaintf" );
         add_shortcut( "luarc" );
@@ -77,240 +80,17 @@ vlc_module_begin();
         /* add_shortcut( "hotkeys" ); */
         add_shortcut( "luatelnet" );
         /* add_shortcut( "telnet" ); */
-        set_description( _("Lua Interface Module") );
+        add_shortcut( "luahttp" );
+        /* add_shortcut( "http" ); */
+        set_description( N_("Lua Interface Module") );
         set_capability( "interface", 0 );
         add_string( "lua-intf", "dummy", NULL,
-                    INTF_TEXT, INTF_LONGTEXT, VLC_FALSE );
+                    INTF_TEXT, INTF_LONGTEXT, false );
         add_string( "lua-config", "", NULL,
-                    CONFIG_TEXT, CONFIG_LONGTEXT, VLC_FALSE );
-        set_callbacks( E_(Open_LuaIntf), E_(Close_LuaIntf) );
+                    CONFIG_TEXT, CONFIG_LONGTEXT, false );
+        set_callbacks( Open_LuaIntf, 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;
-}
-
-/*****************************************************************************
- * 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;
-}
-
-/*****************************************************************************
- * 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_pop( L, 1 );
-    lua_pushlightuserdata( L, p_stream );
-    return 1;
-}
-
-int vlclua_stream_read( lua_State *L )
-{
-    stream_t * p_stream;
-    int n;
-    byte_t *p_read;
-    int i_read;
-    if( lua_gettop( L ) != 2 ) return vlclua_error( L );
-    p_stream = (stream_t *)luaL_checklightuserdata( L, -2 );
-    n = luaL_checkint( L, -1 );
-    lua_pop( 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;
-    if( lua_gettop( L ) != 1 ) return vlclua_error( L );
-    p_stream = (stream_t *)luaL_checklightuserdata( L, -1 );
-    lua_pop( 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;
-    if( lua_gettop( L ) != 1 ) return vlclua_error( L );
-    p_stream = (stream_t *)luaL_checklightuserdata( L, -1 );
-    lua_pop( L, 1 );
-    stream_Delete( p_stream );
-    return 1;
-}
-
-/*****************************************************************************
- * String transformations
- *****************************************************************************/
-/* TODO: make it work for any number of arguments */
-int vlclua_decode_uri( lua_State *L )
-{
-    if( lua_gettop( L ) != 1 ) return vlclua_error( L );
-    const char *psz_cstring = luaL_checkstring( L, 1 );
-    if( !psz_cstring ) return vlclua_error( L );
-    char *psz_string = strdup( psz_cstring );
-    lua_pop( L, 1 );
-    decode_URI( psz_string );
-    lua_pushstring( L, psz_string );
-    free( psz_string );
-    return 1;
-}
-
-/* TODO: make it work for any number of arguments */
-int vlclua_resolve_xml_special_chars( lua_State *L )
-{
-    if( lua_gettop( L ) != 1 ) return vlclua_error( L );
-    const char *psz_cstring = luaL_checkstring( L, 1 );
-    if( !psz_cstring ) return vlclua_error( L );
-    char *psz_string = strdup( psz_cstring );
-    lua_pop( L, 1 );
-    resolve_xml_special_chars( psz_string );
-    lua_pushstring( L, psz_string );
-    free( psz_string );
-    return 1;
-}
-
-/*****************************************************************************
- * Messaging facilities
- *****************************************************************************/
-/* TODO: make it work for any number of arguments */
-int vlclua_msg_dbg( lua_State *L )
-{
-    vlc_object_t *p_this = vlclua_get_this( L );
-    if( lua_gettop( L ) != 1 ) return vlclua_error( L );
-    const char *psz_cstring = luaL_checkstring( L, 1 );
-    if( !psz_cstring ) return vlclua_error( L );
-    msg_Dbg( p_this, "%s", psz_cstring );
-    return 0;
-}
-/* TODO: make it work for any number of arguments */
-int vlclua_msg_warn( lua_State *L )
-{
-    vlc_object_t *p_this = vlclua_get_this( L );
-    if( lua_gettop( L ) != 1 ) return vlclua_error( L );
-    const char *psz_cstring = luaL_checkstring( L, 1 );
-    if( !psz_cstring ) return vlclua_error( L );
-    msg_Warn( p_this, "%s", psz_cstring );
-    return 0;
-}
-/* TODO: make it work for any number of arguments */
-int vlclua_msg_err( lua_State *L )
-{
-    vlc_object_t *p_this = vlclua_get_this( L );
-    if( lua_gettop( L ) != 1 ) return vlclua_error( L );
-    const char *psz_cstring = luaL_checkstring( L, 1 );
-    if( !psz_cstring ) return vlclua_error( L );
-    msg_Err( p_this, "%s", psz_cstring );
-    return 0;
-}
-/* TODO: make it work for any number of arguments */
-int vlclua_msg_info( lua_State *L )
-{
-    vlc_object_t *p_this = vlclua_get_this( L );
-    if( lua_gettop( L ) != 1 ) return vlclua_error( L );
-    const char *psz_cstring = luaL_checkstring( L, 1 );
-    if( !psz_cstring ) return vlclua_error( L );
-    msg_Info( p_this, "%s", psz_cstring );
-    return 0;
-}
-
 /*****************************************************************************
  *
  *****************************************************************************/
@@ -325,46 +105,51 @@ static int file_compare( const char **a, const char **b )
     return strcmp( *a, *b );
 }
 
-int vlclua_dir_list( vlc_object_t *p_this, const char *luadirname,
-                     char **ppsz_dir_list )
+int vlclua_dir_list( const char *luadirname, char **ppsz_dir_list )
 {
-    if( asprintf( &ppsz_dir_list[0], "%s" DIR_SEP "%s",
-                   p_this->p_libvlc->psz_datadir, luadirname ) < 0 )
+    int i = 0;
+    char *datadir = config_GetUserDataDir();
+    if( datadir == NULL )
+        return VLC_ENOMEM;
+
+    if( asprintf( &ppsz_dir_list[i], "%s" DIR_SEP "lua" DIR_SEP "%s",
+                   datadir, luadirname ) < 0 )
+    {
+        free( datadir );
         return VLC_ENOMEM;
+    }
+    free( datadir );
+    i++;
 
 #   if defined(__APPLE__) || defined(SYS_BEOS) || defined(WIN32)
     {
         const char *psz_vlcpath = config_GetDataDir();
-        if( asprintf( &ppsz_dir_list[1], "%s" DIR_SEP "%s",
+        if( asprintf( &ppsz_dir_list[i], "%s" DIR_SEP "lua" DIR_SEP "%s",
                       psz_vlcpath, luadirname )  < 0 )
             return VLC_ENOMEM;
-
-        if( asprintf( &ppsz_dir_list[2], "%s" DIR_SEP "share" DIR_SEP "%s",
+        i++;
+        if( asprintf( &ppsz_dir_list[i], "%s" DIR_SEP "share" DIR_SEP "lua" DIR_SEP "%s",
                       psz_vlcpath, luadirname )  < 0 )
             return VLC_ENOMEM;
+        i++;
+
     }
 #   else
-    if( asprintf( &ppsz_dir_list[1],
-                  "share" DIR_SEP "%s", luadirname ) < 0 )
+    if( asprintf( &ppsz_dir_list[i], "%s" DIR_SEP "lua" DIR_SEP "%s",
+                  config_GetDataDir (), luadirname ) < 0 )
         return VLC_ENOMEM;
-
-#   ifdef HAVE_SYS_STAT_H
-    {
-        struct stat stat_info;
-        if( ( utf8_stat( ppsz_dir_list[1], &stat_info ) == -1 )
-            || !S_ISDIR( stat_info.st_mode ) )
-        {
-            free(ppsz_dir_list[1]);
-            if( asprintf( &ppsz_dir_list[1],
-                          DATA_PATH DIR_SEP "%s", luadirname ) < 0 )
-                return VLC_ENOMEM;
-        }
-    }
-#   endif
+    i++;
 #   endif
     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 );
+}
+
 /*****************************************************************************
  * Will execute func on all scripts in luadirname, and stop if func returns
  * success.
@@ -377,7 +162,6 @@ int vlclua_scripts_batch_execute( vlc_object_t *p_this,
 {
     int i_ret = VLC_EGENERIC;
 
-    DIR   *dir           = NULL;
     char **ppsz_filelist = NULL;
     char **ppsz_fileend  = NULL;
     char **ppsz_file;
@@ -385,7 +169,7 @@ int vlclua_scripts_batch_execute( vlc_object_t *p_this,
     char  *ppsz_dir_list[] = { NULL, NULL, NULL, NULL };
     char **ppsz_dir;
 
-    i_ret = vlclua_dir_list( p_this, luadirname, ppsz_dir_list );
+    i_ret = vlclua_dir_list( luadirname, ppsz_dir_list );
     if( i_ret != VLC_SUCCESS )
         return i_ret;
     i_ret = VLC_EGENERIC;
@@ -404,16 +188,8 @@ int vlclua_scripts_batch_execute( vlc_object_t *p_this,
             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 = utf8_scandir( *ppsz_dir, &ppsz_filelist, file_select,
                                 file_compare );
         if( i_files < 1 ) continue;
         ppsz_fileend = ppsz_filelist + i_files;
@@ -423,7 +199,10 @@ int vlclua_scripts_batch_execute( vlc_object_t *p_this,
             char  *psz_filename;
             if( asprintf( &psz_filename,
                           "%s" DIR_SEP "%s", *ppsz_dir, *ppsz_file ) < 0)
+            {
+                vlclua_dir_list_free( ppsz_dir_list );
                 return VLC_ENOMEM;
+            }
             msg_Dbg( p_this, "Trying Lua playlist script %s", psz_filename );
 
             i_ret = func( p_this, psz_filename, L, user_data );
@@ -442,10 +221,7 @@ int vlclua_scripts_batch_execute( vlc_object_t *p_this,
             free( *ppsz_file );
         free( ppsz_filelist );
     }
-    for( ppsz_dir = ppsz_dir_list; *ppsz_dir; ppsz_dir++ )
-        free( *ppsz_dir );
-
-    if( dir ) closedir( dir );
+    vlclua_dir_list_free( ppsz_dir_list );
 
     return i_ret;
 }
@@ -591,10 +367,12 @@ void __vlclua_read_options( vlc_object_t *p_this, lua_State *L,
 
 int __vlclua_playlist_add_internal( vlc_object_t *p_this, lua_State *L,
                                     playlist_t *p_playlist,
-                                    input_item_t *p_parent, vlc_bool_t b_play )
+                                    input_item_t *p_parent, bool b_play )
 {
     int i_count = 0;
 
+    assert( p_parent || p_playlist );
+
     /* playlist */
     if( lua_istable( L, -1 ) )
     {
@@ -671,16 +449,14 @@ int __vlclua_playlist_add_internal( vlc_object_t *p_this, lua_State *L,
                     /* Append item to playlist */
                     if( p_parent ) /* Add to node */
                         input_ItemAddSubItem( p_parent, p_input );
-                    else if( b_play ) /* Play */
-                        playlist_AddInput( p_playlist, p_input,
-                                           PLAYLIST_APPEND | PLAYLIST_GO,
-                                           PLAYLIST_END, VLC_TRUE, VLC_FALSE );
-                    else /* Enqueue */
+                    else /* Play or Enqueue (preparse) */
+                        /* FIXME: playlist_AddInput() can fail */
                         playlist_AddInput( p_playlist, p_input,
-                                           PLAYLIST_APPEND | PLAYLIST_PREPARSE,
-                                           PLAYLIST_END, VLC_TRUE, VLC_FALSE );
+                               PLAYLIST_APPEND | 
+                               ( b_play ? PLAYLIST_GO : PLAYLIST_PREPARSE ),
+                               PLAYLIST_END, true, false );
                     i_count ++; /* increment counter */
-
+                    vlc_gc_decref( p_input );
                     while( i_options > 0 )
                         free( ppsz_options[--i_options] );
                     free( ppsz_options );