Changeset d5107810595354bd93f6bf65713c039d1bc7cb8b

Timestamp:

11/05/07 22:52:26 (8 months ago)

Author:

Antoine Cellerier <dionoea@videolan.org>

git-committer:

Antoine Cellerier <dionoea@videolan.org> 1194299546 +0000

git-parent:

[94742be8ad29e8941d9eec6835f78633cf0f6142]

git-author:

Antoine Cellerier <dionoea@videolan.org> 1194299546 +0000

Message:

• modules/misc/lua:
  
  • Add vlc.license()
    
  • vlc.vlm.execute_command() now returns the VLC error code and the corresponding error message as 2nd and 3rd return values.
    
• share/luaintf: add help and module description related stuff to the telnet and rc modules.
  

Files:

• modules/misc/lua/intf.c (modified) (1 diff)
• modules/misc/lua/vlc.c (modified) (1 diff)
• modules/misc/lua/vlc.h (modified) (1 diff)
• modules/misc/lua/vlm.c (modified) (1 diff)
• share/luaintf/rc.lua (modified) (6 diffs)
• share/luaintf/telnet.lua (modified) (6 diffs)

modules/misc/lua/intf.c

@@ -558 +558 @@
-
-    { "version", vlclua_version },
+    { "license", vlclua_license },
-    { "should_die", vlclua_intf_should_die },
-    { "quit", vlclua_quit },

modules/misc/lua/vlc.c

@@ -116 +116 @@
-{
-    lua_pushstring( L, VLC_Version() );
+    return 1;
+}
+
+/*****************************************************************************
+ * Get the VLC license msg/disclaimer
+ *****************************************************************************/
+int vlclua_license( lua_State *L )
+{
+    lua_pushstring( L, LICENSE_MSG );
-    return 1;
-}

modules/misc/lua/vlc.h

@@ -145 +145 @@
-
-int vlclua_version( lua_State * );
+int vlclua_license( lua_State * );
-int vlclua_quit( lua_State * );
-

modules/misc/lua/vlm.c

@@ -88 +88 @@
-    const char *psz_command = luaL_checkstring( L, 2 );
-    vlm_message_t *message;
-
+
+
-    lua_settop( L, 0 );
-    push_message( L, message );
-    vlm_MessageDelete( message );
-
+ + vlclua_push_ret( L, i_ret )
-}

share/luaintf/rc.lua

@@ -22 +22 @@
---]==========================================================================]
-
-
+
+
+
+
- This is a modules/control/rc.c look alike (with a bunch of new features)
- 
@@ -34 +37 @@
- Note:
-    -I luarc is an alias for -I lua --lua-intf rc
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-require("common")
@@ -49 +66 @@
-        welcome = "Remote control interface initialized. Type `help' for help."
-      }
+
+--[[ Import custom environement variables from the command line config (if possible) ]]
+for k,v in pairs(env) do
+    if config[k] then
+        if type(env[k]) == type(config[k]) then
+            env[k] = config[k]
+            vlc.msg.dbg("set environement variable `"..k.."' to "..tonumber(env[k]))
+        else
+            vlc.msg.err("environement variable `"..k.."' should be of type "..type(env[k])..". config value will be discarded.")
+        end
+    end
+end
-
---[[ Command functions ]]
@@ -159 +188 @@
-    end
-    client:append("+----[ End of playlist ]")
+end
+
+function print_text(label,text)
+    return function(name,client)
+        client:append("+----[ "..label.." ]")
+        client:append "|"
+        for line in string.gmatch(text,".-\r?\n") do
+            client:append("| "..string.gsub(line,"\r?\n",""))
+        end
+        client:append "|"
+        client:append("+----[ End of "..string.lower(label).." ]")
+    end
-end
-
@@ -353 +394 @@
-    { "alias"; { func = skip(alias); args = "[cmd]"; help = "set/get command aliases"; adv = true } };
-    { "eval"; { func = skip(eval); help = "eval some lua (*debug*)"; adv =true } }; -- FIXME: comment out if you're not debugging
+    { "description"; { func = print_text("Description",description); help = "describe this module" } };
+    { "license"; { func = print_text("License message",vlc.license()); help = "print VLC's license message"; adv = true } };
-    { "help"; { func = help; args = "[pattern]"; help = "a help message"; aliases = { "?" } } };
-    { "longhelp"; { func = help; args = "[pattern]"; help = "a longer help message" } };
@@ -448 +491 @@
-end
--- Print prompt when switching a client's status to `read'
-
+
+
+
-
-h:listen( config.hosts or config.host or "*console" )

share/luaintf/telnet.lua

@@ -22 +22 @@
---]==========================================================================]
-
-
+
+
+
+
- Copy (features wise) of the original VLC modules/control/telnet.c module.
-
@@ -32 +35 @@
-        listen on stdin: vlc -I lua --lua-intf telnet --lua-config "telnet={host='*console'}"
-        listen on stdin + 2 ports on localhost: vlc -I lua --lua-intf telnet --lua-config "telnet={hosts={'localhost:4212','localhost:5678','*console'}}"
-
+
+
+
+
+
+
+
-
-require "host"
@@ -55 +64 @@
-end
-function on_read( client )
-
+config.prompt and tostring(config.prompt) or 
-end
-function on_write( client )
@@ -119 +128 @@
-    return false
-end
+function print_text(text)
+    return function(client)
+        client:append(string.gsub(text,"\r?\n","\r\n"))
+        return true
+    end
+end
-function help(client)
-    client:append("    Telnet Specific Commands:")
@@ -127 +142 @@
-end
-commands = {
-
-
-
-
-
+
+
+
+
+
+
+
-    }
-
@@ -139 +156 @@
-    if not commands[cmd] or not commands[cmd].func or commands[cmd].dovlm then
-        -- if it's not an interface specific command, it has to be a VLM command
-message
+local message, vlc_err
-        vlm_message_to_string( client, message )
-        if not commands[cmd] or not commands[cmd].func and not commands[cmd].dovlm then
+            if vlc_err ~= 0 then client:append( "Type `help' for help." ) end
-            return true
-        end