Software / code / clix
Annotate
clix.lua @ 73:1032eddcf35b
squishy: see verse commit b5fd3292bdbd
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Mon, 25 Jun 2012 02:36:10 +0200 |
| parent | 70:5e93cfc73444 |
| child | 82:30f85754b1e0 |
| rev | line source |
|---|---|
|
4
ead275885948
clix.lua: Add shebang for people who don't use squish
Matthew Wild <mwild1@gmail.com>
parents:
2
diff
changeset
|
1 #!/usr/bin/env lua |
|
5
7209e1f8e66b
clix.lua, COPYING: Add COPYING file with MIT license, add copyright header to clix.lua
Matthew Wild <mwild1@gmail.com>
parents:
4
diff
changeset
|
2 -- Clix -- Command-line XMPP |
|
7209e1f8e66b
clix.lua, COPYING: Add COPYING file with MIT license, add copyright header to clix.lua
Matthew Wild <mwild1@gmail.com>
parents:
4
diff
changeset
|
3 -- Copyright (C) 2008-2010 Matthew Wild |
|
7209e1f8e66b
clix.lua, COPYING: Add COPYING file with MIT license, add copyright header to clix.lua
Matthew Wild <mwild1@gmail.com>
parents:
4
diff
changeset
|
4 -- |
|
7209e1f8e66b
clix.lua, COPYING: Add COPYING file with MIT license, add copyright header to clix.lua
Matthew Wild <mwild1@gmail.com>
parents:
4
diff
changeset
|
5 -- This project is MIT/X11 licensed. Please see the |
|
7209e1f8e66b
clix.lua, COPYING: Add COPYING file with MIT license, add copyright header to clix.lua
Matthew Wild <mwild1@gmail.com>
parents:
4
diff
changeset
|
6 -- COPYING file in the source package for more information. |
|
7209e1f8e66b
clix.lua, COPYING: Add COPYING file with MIT license, add copyright header to clix.lua
Matthew Wild <mwild1@gmail.com>
parents:
4
diff
changeset
|
7 -- |
| 0 | 8 require "verse" |
| 9 require "verse.client" | |
| 10 | |
|
8
df4cb4a73549
clix: Make short_opts table global, to allow commands to add their own short options
Matthew Wild <mwild1@gmail.com>
parents:
7
diff
changeset
|
11 -- Global to allow commands to add to it |
|
23
c5f04bdc7c64
clix, clix.raw: Move 'Connected as' to clix_connect(), and suppress on -q/--quiet
Matthew Wild <mwild1@gmail.com>
parents:
21
diff
changeset
|
12 short_opts = { v = "verbose", q = "quiet", t = "to", f = "from", e = "type", |
|
c5f04bdc7c64
clix, clix.raw: Move 'Connected as' to clix_connect(), and suppress on -q/--quiet
Matthew Wild <mwild1@gmail.com>
parents:
21
diff
changeset
|
13 a = "account", p = "password", r = "resource", o = "presence", c = "chatroom" } |
|
8
df4cb4a73549
clix: Make short_opts table global, to allow commands to add their own short options
Matthew Wild <mwild1@gmail.com>
parents:
7
diff
changeset
|
14 |
|
33
f1901c9de891
clix.lua: Improvements to argument handling and command detection. In particular options may now precede commands.
Matthew Wild <mwild1@gmail.com>
parents:
32
diff
changeset
|
15 if #arg < 1 then |
| 0 | 16 print("Command Line XMPP, available commands:"); |
| 17 for module in pairs(package.preload) do | |
| 18 if module:match("^clix%.") then | |
| 19 local m = require(module); | |
|
28
c2998f70dfd4
clix: Pass short_help option to modules correctly
Matthew Wild <mwild1@gmail.com>
parents:
23
diff
changeset
|
20 io.write("\t", module:gsub("^clix%.", ""), ": "); |
|
c2998f70dfd4
clix: Pass short_help option to modules correctly
Matthew Wild <mwild1@gmail.com>
parents:
23
diff
changeset
|
21 m({ short_help = true }, {}); |
| 0 | 22 end |
| 23 end | |
| 24 return 0; | |
| 25 end | |
| 26 | |
| 27 local accounts = { default = {} }; | |
| 28 local current_account; | |
|
32
cda6a004ff79
clix.lua: Report when config file couldn't be found, change name to .clixrc and comply with fd.o's base directory specifications (now usually ~/.config/.clixrc)
Matthew Wild
parents:
28
diff
changeset
|
29 |
|
33
f1901c9de891
clix.lua: Improvements to argument handling and command detection. In particular options may now precede commands.
Matthew Wild <mwild1@gmail.com>
parents:
32
diff
changeset
|
30 local config_path = (os.getenv("XDG_CONFIG_HOME") or (os.getenv("HOME").."/.config")); |
|
32
cda6a004ff79
clix.lua: Report when config file couldn't be found, change name to .clixrc and comply with fd.o's base directory specifications (now usually ~/.config/.clixrc)
Matthew Wild
parents:
28
diff
changeset
|
31 local config_file, err = io.open(config_path.."/.clixrc") or io.open(config_path.."/.clix"); |
|
cda6a004ff79
clix.lua: Report when config file couldn't be found, change name to .clixrc and comply with fd.o's base directory specifications (now usually ~/.config/.clixrc)
Matthew Wild
parents:
28
diff
changeset
|
32 |
|
cda6a004ff79
clix.lua: Report when config file couldn't be found, change name to .clixrc and comply with fd.o's base directory specifications (now usually ~/.config/.clixrc)
Matthew Wild
parents:
28
diff
changeset
|
33 if not config_file then |
|
cda6a004ff79
clix.lua: Report when config file couldn't be found, change name to .clixrc and comply with fd.o's base directory specifications (now usually ~/.config/.clixrc)
Matthew Wild
parents:
28
diff
changeset
|
34 print("Unable to open config file... looked for "..config_path.."/.clixrc"); |
|
cda6a004ff79
clix.lua: Report when config file couldn't be found, change name to .clixrc and comply with fd.o's base directory specifications (now usually ~/.config/.clixrc)
Matthew Wild
parents:
28
diff
changeset
|
35 if err then print(err); end |
|
cda6a004ff79
clix.lua: Report when config file couldn't be found, change name to .clixrc and comply with fd.o's base directory specifications (now usually ~/.config/.clixrc)
Matthew Wild
parents:
28
diff
changeset
|
36 os.exit(1); |
|
cda6a004ff79
clix.lua: Report when config file couldn't be found, change name to .clixrc and comply with fd.o's base directory specifications (now usually ~/.config/.clixrc)
Matthew Wild
parents:
28
diff
changeset
|
37 end |
|
cda6a004ff79
clix.lua: Report when config file couldn't be found, change name to .clixrc and comply with fd.o's base directory specifications (now usually ~/.config/.clixrc)
Matthew Wild
parents:
28
diff
changeset
|
38 |
|
cda6a004ff79
clix.lua: Report when config file couldn't be found, change name to .clixrc and comply with fd.o's base directory specifications (now usually ~/.config/.clixrc)
Matthew Wild
parents:
28
diff
changeset
|
39 for line in config_file:lines() do |
| 0 | 40 line = line:match("^%s*(.-)%s*$"); |
| 41 if line:match("^%[") then | |
| 42 current_account = line:match("^%[(.-)%]"); | |
| 43 accounts[current_account] = {}; | |
| 44 if not current_account then -- This is the first defined account | |
| 45 accounts.default = accounts[current_account]; | |
| 46 end | |
| 47 elseif current_account then | |
| 48 local k,v = line:match("^(%w+)%s*[:=]%s*(.+)$"); | |
|
34
d4f8fc71d936
clix.lua: Only set config key on valid lines
Matthew Wild <mwild1@gmail.com>
parents:
33
diff
changeset
|
49 if k then |
|
d4f8fc71d936
clix.lua: Only set config key on valid lines
Matthew Wild <mwild1@gmail.com>
parents:
33
diff
changeset
|
50 accounts[current_account or "default"][k] = v; |
|
d4f8fc71d936
clix.lua: Only set config key on valid lines
Matthew Wild <mwild1@gmail.com>
parents:
33
diff
changeset
|
51 end |
| 0 | 52 end |
| 53 end | |
| 54 | |
|
42
4f4fe532a889
clix.lua: clix_connect(): Accept a list of plugins to load for the Verse connection
Matthew Wild <mwild1@gmail.com>
parents:
41
diff
changeset
|
55 function clix_connect(opts, on_connect, plugins) |
| 0 | 56 local account = accounts[opts.account or "default"]; |
| 57 if not (account and account.jid) then | |
| 58 io.stderr:write("The specified account (", opts.account or "default", ") wasn't found in the config file\n"); | |
| 59 return nil; | |
| 60 end | |
|
70
5e93cfc73444
clix: Fix logging for new Verse
Matthew Wild <mwild1@gmail.com>
parents:
52
diff
changeset
|
61 verse.set_log_handler(io.stderr, not opts.verbose and {"error"}); |
|
5e93cfc73444
clix: Fix logging for new Verse
Matthew Wild <mwild1@gmail.com>
parents:
52
diff
changeset
|
62 local conn = verse.new(); |
|
42
4f4fe532a889
clix.lua: clix_connect(): Accept a list of plugins to load for the Verse connection
Matthew Wild <mwild1@gmail.com>
parents:
41
diff
changeset
|
63 for _, plugin in ipairs(plugins or {}) do |
|
4f4fe532a889
clix.lua: clix_connect(): Accept a list of plugins to load for the Verse connection
Matthew Wild <mwild1@gmail.com>
parents:
41
diff
changeset
|
64 conn:add_plugin(plugin); |
|
4f4fe532a889
clix.lua: clix_connect(): Accept a list of plugins to load for the Verse connection
Matthew Wild <mwild1@gmail.com>
parents:
41
diff
changeset
|
65 end |
| 0 | 66 conn:hook("authentication-failure", function (err) |
|
2
fd77e75c4891
clix: Make more use of Verse's new logging controls
Matthew Wild <mwild1@gmail.com>
parents:
0
diff
changeset
|
67 conn:error("Authentication failure ("..(err.condition or "unknown error")..")"..(err.text and (": "..err.text) or "")); |
|
14
1e927484c6ec
clix: Close connection after fatal error during login
Matthew Wild <mwild1@gmail.com>
parents:
13
diff
changeset
|
68 conn:close(); |
| 0 | 69 end); |
|
35
37540f89d4e2
clix.lua: Hook Verse's new 'ready' event instead of 'binding-success' and switch to 'bind-failure' for hooking resource bind failures
Matthew Wild <mwild1@gmail.com>
parents:
34
diff
changeset
|
70 conn:hook("ready", function () |
|
23
c5f04bdc7c64
clix, clix.raw: Move 'Connected as' to clix_connect(), and suppress on -q/--quiet
Matthew Wild <mwild1@gmail.com>
parents:
21
diff
changeset
|
71 if not opts.quiet then |
|
c5f04bdc7c64
clix, clix.raw: Move 'Connected as' to clix_connect(), and suppress on -q/--quiet
Matthew Wild <mwild1@gmail.com>
parents:
21
diff
changeset
|
72 io.stderr:write("clix: connected as ", conn.jid, "\n"); |
|
c5f04bdc7c64
clix, clix.raw: Move 'Connected as' to clix_connect(), and suppress on -q/--quiet
Matthew Wild <mwild1@gmail.com>
parents:
21
diff
changeset
|
73 end |
|
21
cdeb02d9546d
clix, clix.send: Support for chatrooms (-c/--chatroom with --nick=somenick)
Matthew Wild <mwild1@gmail.com>
parents:
20
diff
changeset
|
74 if opts.chatroom then |
|
cdeb02d9546d
clix, clix.send: Support for chatrooms (-c/--chatroom with --nick=somenick)
Matthew Wild <mwild1@gmail.com>
parents:
20
diff
changeset
|
75 conn:send(verse.presence{to=opts.to.."/"..(opts.nick or "clix")}); |
|
cdeb02d9546d
clix, clix.send: Support for chatrooms (-c/--chatroom with --nick=somenick)
Matthew Wild <mwild1@gmail.com>
parents:
20
diff
changeset
|
76 end |
|
17
fa9efbef8a0c
Move presence sending into clix_connect(), and control with -o/--presence
Matthew Wild <mwild1@gmail.com>
parents:
15
diff
changeset
|
77 if opts.presence then |
|
fa9efbef8a0c
Move presence sending into clix_connect(), and control with -o/--presence
Matthew Wild <mwild1@gmail.com>
parents:
15
diff
changeset
|
78 conn:send(verse.presence()); |
|
fa9efbef8a0c
Move presence sending into clix_connect(), and control with -o/--presence
Matthew Wild <mwild1@gmail.com>
parents:
15
diff
changeset
|
79 end |
|
fa9efbef8a0c
Move presence sending into clix_connect(), and control with -o/--presence
Matthew Wild <mwild1@gmail.com>
parents:
15
diff
changeset
|
80 return on_connect(conn); |
|
fa9efbef8a0c
Move presence sending into clix_connect(), and control with -o/--presence
Matthew Wild <mwild1@gmail.com>
parents:
15
diff
changeset
|
81 end); |
|
35
37540f89d4e2
clix.lua: Hook Verse's new 'ready' event instead of 'binding-success' and switch to 'bind-failure' for hooking resource bind failures
Matthew Wild <mwild1@gmail.com>
parents:
34
diff
changeset
|
82 conn:hook("bind-failure", function (err) |
|
2
fd77e75c4891
clix: Make more use of Verse's new logging controls
Matthew Wild <mwild1@gmail.com>
parents:
0
diff
changeset
|
83 conn:error("Resource binding failure ("..(err.condition or "unknown error")..")"..(err.text and (": "..err.text) or "")); |
|
14
1e927484c6ec
clix: Close connection after fatal error during login
Matthew Wild <mwild1@gmail.com>
parents:
13
diff
changeset
|
84 conn:close(); |
| 0 | 85 end); |
| 86 conn:hook("disconnected", function (info) | |
| 87 if info.reason then | |
|
2
fd77e75c4891
clix: Make more use of Verse's new logging controls
Matthew Wild <mwild1@gmail.com>
parents:
0
diff
changeset
|
88 conn:warn("Disconnecting: %s", tostring(info.reason)); |
| 0 | 89 end |
| 90 verse.quit(); | |
| 91 end); | |
| 92 -- Optional config parameters | |
| 93 conn.connect_host = account.address; | |
| 94 conn.connect_port = account.port; | |
|
13
751db005032e
clix: Allow specifying the resource with -r/--resource
Matthew Wild <mwild1@gmail.com>
parents:
11
diff
changeset
|
95 |
| 0 | 96 -- Connect! |
|
15
54314164a2a3
clix: Allow -p/--password to specify the login password
Matthew Wild <mwild1@gmail.com>
parents:
14
diff
changeset
|
97 conn:connect_client(account.jid, opts.password or account.password); |
|
11
a502c905527c
clix: Handle errors (including 'interrupted!') in verse.loop()
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
98 |
|
40
c74380af7075
clix.lua: Add workaround for Tigase bug which discards stanzas sent immediately before stream close, use --close-delay=X to delay close for some seconds
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
99 -- COMPAT: Tigase discards stanzas sent at the same time as </stream:stream> |
|
c74380af7075
clix.lua: Add workaround for Tigase bug which discards stanzas sent immediately before stream close, use --close-delay=X to delay close for some seconds
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
100 local _real_close = conn.close; |
|
c74380af7075
clix.lua: Add workaround for Tigase bug which discards stanzas sent immediately before stream close, use --close-delay=X to delay close for some seconds
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
101 function conn:close() |
|
c74380af7075
clix.lua: Add workaround for Tigase bug which discards stanzas sent immediately before stream close, use --close-delay=X to delay close for some seconds
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
102 conn:debug("Delaying close..."); |
|
45
36f5bf718d3c
clix.lua: Close connection immediately rather than delaying if send buffer is empty (thanks Florob)
Matthew Wild <mwild1@gmail.com>
parents:
43
diff
changeset
|
103 local function close_conn() |
|
40
c74380af7075
clix.lua: Add workaround for Tigase bug which discards stanzas sent immediately before stream close, use --close-delay=X to delay close for some seconds
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
104 local function do_close() |
|
c74380af7075
clix.lua: Add workaround for Tigase bug which discards stanzas sent immediately before stream close, use --close-delay=X to delay close for some seconds
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
105 if _real_close then |
|
c74380af7075
clix.lua: Add workaround for Tigase bug which discards stanzas sent immediately before stream close, use --close-delay=X to delay close for some seconds
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
106 conn:debug("Closing now..."); |
|
c74380af7075
clix.lua: Add workaround for Tigase bug which discards stanzas sent immediately before stream close, use --close-delay=X to delay close for some seconds
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
107 local close = _real_close; |
|
c74380af7075
clix.lua: Add workaround for Tigase bug which discards stanzas sent immediately before stream close, use --close-delay=X to delay close for some seconds
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
108 _real_close = nil; |
|
c74380af7075
clix.lua: Add workaround for Tigase bug which discards stanzas sent immediately before stream close, use --close-delay=X to delay close for some seconds
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
109 close(conn); |
|
c74380af7075
clix.lua: Add workaround for Tigase bug which discards stanzas sent immediately before stream close, use --close-delay=X to delay close for some seconds
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
110 end |
|
c74380af7075
clix.lua: Add workaround for Tigase bug which discards stanzas sent immediately before stream close, use --close-delay=X to delay close for some seconds
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
111 end |
|
c74380af7075
clix.lua: Add workaround for Tigase bug which discards stanzas sent immediately before stream close, use --close-delay=X to delay close for some seconds
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
112 local close_delay = tonumber(opts.close_delay) or 0; |
|
c74380af7075
clix.lua: Add workaround for Tigase bug which discards stanzas sent immediately before stream close, use --close-delay=X to delay close for some seconds
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
113 if close_delay > 0 then |
|
c74380af7075
clix.lua: Add workaround for Tigase bug which discards stanzas sent immediately before stream close, use --close-delay=X to delay close for some seconds
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
114 verse.add_task(close_delay, do_close); |
|
c74380af7075
clix.lua: Add workaround for Tigase bug which discards stanzas sent immediately before stream close, use --close-delay=X to delay close for some seconds
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
115 else |
|
c74380af7075
clix.lua: Add workaround for Tigase bug which discards stanzas sent immediately before stream close, use --close-delay=X to delay close for some seconds
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
116 do_close(); |
|
c74380af7075
clix.lua: Add workaround for Tigase bug which discards stanzas sent immediately before stream close, use --close-delay=X to delay close for some seconds
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
117 end |
|
45
36f5bf718d3c
clix.lua: Close connection immediately rather than delaying if send buffer is empty (thanks Florob)
Matthew Wild <mwild1@gmail.com>
parents:
43
diff
changeset
|
118 end |
|
36f5bf718d3c
clix.lua: Close connection immediately rather than delaying if send buffer is empty (thanks Florob)
Matthew Wild <mwild1@gmail.com>
parents:
43
diff
changeset
|
119 if conn.conn:bufferlen() == 0 then |
|
36f5bf718d3c
clix.lua: Close connection immediately rather than delaying if send buffer is empty (thanks Florob)
Matthew Wild <mwild1@gmail.com>
parents:
43
diff
changeset
|
120 close_conn(); |
|
36f5bf718d3c
clix.lua: Close connection immediately rather than delaying if send buffer is empty (thanks Florob)
Matthew Wild <mwild1@gmail.com>
parents:
43
diff
changeset
|
121 else |
|
36f5bf718d3c
clix.lua: Close connection immediately rather than delaying if send buffer is empty (thanks Florob)
Matthew Wild <mwild1@gmail.com>
parents:
43
diff
changeset
|
122 conn:hook("drained", close_conn); |
|
36f5bf718d3c
clix.lua: Close connection immediately rather than delaying if send buffer is empty (thanks Florob)
Matthew Wild <mwild1@gmail.com>
parents:
43
diff
changeset
|
123 end |
|
40
c74380af7075
clix.lua: Add workaround for Tigase bug which discards stanzas sent immediately before stream close, use --close-delay=X to delay close for some seconds
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
124 end |
|
c74380af7075
clix.lua: Add workaround for Tigase bug which discards stanzas sent immediately before stream close, use --close-delay=X to delay close for some seconds
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
125 -- /COMPAT |
|
c74380af7075
clix.lua: Add workaround for Tigase bug which discards stanzas sent immediately before stream close, use --close-delay=X to delay close for some seconds
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
126 |
|
c74380af7075
clix.lua: Add workaround for Tigase bug which discards stanzas sent immediately before stream close, use --close-delay=X to delay close for some seconds
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
127 |
|
13
751db005032e
clix: Allow specifying the resource with -r/--resource
Matthew Wild <mwild1@gmail.com>
parents:
11
diff
changeset
|
128 if type(opts.resource) == "string" then |
|
751db005032e
clix: Allow specifying the resource with -r/--resource
Matthew Wild <mwild1@gmail.com>
parents:
11
diff
changeset
|
129 conn.resource = opts.resource; |
|
751db005032e
clix: Allow specifying the resource with -r/--resource
Matthew Wild <mwild1@gmail.com>
parents:
11
diff
changeset
|
130 end |
|
751db005032e
clix: Allow specifying the resource with -r/--resource
Matthew Wild <mwild1@gmail.com>
parents:
11
diff
changeset
|
131 |
|
11
a502c905527c
clix: Handle errors (including 'interrupted!') in verse.loop()
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
132 local ok, ret = pcall(verse.loop); |
|
a502c905527c
clix: Handle errors (including 'interrupted!') in verse.loop()
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
133 if not ok and not ret:match("interrupted!$") then |
|
a502c905527c
clix: Handle errors (including 'interrupted!') in verse.loop()
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
134 io.stderr:write("Fatal error: ", ret, "\n"); |
|
a502c905527c
clix: Handle errors (including 'interrupted!') in verse.loop()
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
135 return 1; |
|
a502c905527c
clix: Handle errors (including 'interrupted!') in verse.loop()
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
136 end |
|
a502c905527c
clix: Handle errors (including 'interrupted!') in verse.loop()
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
137 return err or 0; |
| 0 | 138 end |
| 139 | |
| 140 local opts = {}; | |
| 141 | |
|
37
bb7a51aca282
clix.lua: Fix argument handling (thanks uhoreg)
Matthew Wild <mwild1@gmail.com>
parents:
35
diff
changeset
|
142 local command, args_handled_up_to; |
| 0 | 143 for i, opt in ipairs(arg) do |
| 144 if opt:match("^%-") and opt ~= "--" then | |
| 145 local name = opt:match("^%-%-?([^%s=]+)()") | |
| 146 name = (short_opts[name] or name):gsub("%-+", "_"); | |
| 147 if name:match("^no_") then | |
| 148 name = name:sub(4, -1); | |
| 149 opts[name] = false; | |
| 150 else | |
| 151 opts[name] = opt:match("=(.*)$") or true; | |
| 152 end | |
|
37
bb7a51aca282
clix.lua: Fix argument handling (thanks uhoreg)
Matthew Wild <mwild1@gmail.com>
parents:
35
diff
changeset
|
153 elseif not command then |
|
bb7a51aca282
clix.lua: Fix argument handling (thanks uhoreg)
Matthew Wild <mwild1@gmail.com>
parents:
35
diff
changeset
|
154 command = arg[i]; |
|
bb7a51aca282
clix.lua: Fix argument handling (thanks uhoreg)
Matthew Wild <mwild1@gmail.com>
parents:
35
diff
changeset
|
155 args_handled_up_to = i-1; |
| 0 | 156 else |
|
37
bb7a51aca282
clix.lua: Fix argument handling (thanks uhoreg)
Matthew Wild <mwild1@gmail.com>
parents:
35
diff
changeset
|
157 args_handled_up_to = i-1; |
|
bb7a51aca282
clix.lua: Fix argument handling (thanks uhoreg)
Matthew Wild <mwild1@gmail.com>
parents:
35
diff
changeset
|
158 break; |
|
bb7a51aca282
clix.lua: Fix argument handling (thanks uhoreg)
Matthew Wild <mwild1@gmail.com>
parents:
35
diff
changeset
|
159 end |
| 0 | 160 end |
| 161 | |
| 162 -- Remove all the handled args from the arg array | |
|
38
eb9f706324c7
clix.lua: Correctly remove handled args
Florian Zeitz <florob@babelmonkeys.de>
parents:
37
diff
changeset
|
163 for n=((args_handled_up_to > 0) and args_handled_up_to or #arg),1,-1 do |
| 0 | 164 table.remove(arg, n); |
| 165 end | |
| 166 | |
|
33
f1901c9de891
clix.lua: Improvements to argument handling and command detection. In particular options may now precede commands.
Matthew Wild <mwild1@gmail.com>
parents:
32
diff
changeset
|
167 local ok, m = pcall(require, "clix."..command); |
|
f1901c9de891
clix.lua: Improvements to argument handling and command detection. In particular options may now precede commands.
Matthew Wild <mwild1@gmail.com>
parents:
32
diff
changeset
|
168 if not ok then |
|
f1901c9de891
clix.lua: Improvements to argument handling and command detection. In particular options may now precede commands.
Matthew Wild <mwild1@gmail.com>
parents:
32
diff
changeset
|
169 local is_debug; |
|
f1901c9de891
clix.lua: Improvements to argument handling and command detection. In particular options may now precede commands.
Matthew Wild <mwild1@gmail.com>
parents:
32
diff
changeset
|
170 for i=1,#arg do |
|
f1901c9de891
clix.lua: Improvements to argument handling and command detection. In particular options may now precede commands.
Matthew Wild <mwild1@gmail.com>
parents:
32
diff
changeset
|
171 if arg[i] == "--debug" then |
|
f1901c9de891
clix.lua: Improvements to argument handling and command detection. In particular options may now precede commands.
Matthew Wild <mwild1@gmail.com>
parents:
32
diff
changeset
|
172 is_debug = true; break; |
|
f1901c9de891
clix.lua: Improvements to argument handling and command detection. In particular options may now precede commands.
Matthew Wild <mwild1@gmail.com>
parents:
32
diff
changeset
|
173 end |
|
f1901c9de891
clix.lua: Improvements to argument handling and command detection. In particular options may now precede commands.
Matthew Wild <mwild1@gmail.com>
parents:
32
diff
changeset
|
174 end |
|
f1901c9de891
clix.lua: Improvements to argument handling and command detection. In particular options may now precede commands.
Matthew Wild <mwild1@gmail.com>
parents:
32
diff
changeset
|
175 print("Error running command '"..command..(is_debug and "" or "' (run with --debug to see full error)")); |
|
f1901c9de891
clix.lua: Improvements to argument handling and command detection. In particular options may now precede commands.
Matthew Wild <mwild1@gmail.com>
parents:
32
diff
changeset
|
176 if is_debug then |
|
f1901c9de891
clix.lua: Improvements to argument handling and command detection. In particular options may now precede commands.
Matthew Wild <mwild1@gmail.com>
parents:
32
diff
changeset
|
177 print(m); |
|
f1901c9de891
clix.lua: Improvements to argument handling and command detection. In particular options may now precede commands.
Matthew Wild <mwild1@gmail.com>
parents:
32
diff
changeset
|
178 end |
|
f1901c9de891
clix.lua: Improvements to argument handling and command detection. In particular options may now precede commands.
Matthew Wild <mwild1@gmail.com>
parents:
32
diff
changeset
|
179 return 1; |
|
f1901c9de891
clix.lua: Improvements to argument handling and command detection. In particular options may now precede commands.
Matthew Wild <mwild1@gmail.com>
parents:
32
diff
changeset
|
180 end |
|
f1901c9de891
clix.lua: Improvements to argument handling and command detection. In particular options may now precede commands.
Matthew Wild <mwild1@gmail.com>
parents:
32
diff
changeset
|
181 |
|
f1901c9de891
clix.lua: Improvements to argument handling and command detection. In particular options may now precede commands.
Matthew Wild <mwild1@gmail.com>
parents:
32
diff
changeset
|
182 if type(m) ~= "function" then |
|
f1901c9de891
clix.lua: Improvements to argument handling and command detection. In particular options may now precede commands.
Matthew Wild <mwild1@gmail.com>
parents:
32
diff
changeset
|
183 print(command.." is not a valid command"); |
|
f1901c9de891
clix.lua: Improvements to argument handling and command detection. In particular options may now precede commands.
Matthew Wild <mwild1@gmail.com>
parents:
32
diff
changeset
|
184 return 1; |
|
f1901c9de891
clix.lua: Improvements to argument handling and command detection. In particular options may now precede commands.
Matthew Wild <mwild1@gmail.com>
parents:
32
diff
changeset
|
185 end |
|
f1901c9de891
clix.lua: Improvements to argument handling and command detection. In particular options may now precede commands.
Matthew Wild <mwild1@gmail.com>
parents:
32
diff
changeset
|
186 |
| 0 | 187 return m(opts, arg) or 0; |
| 188 |
