clix.lua

Mon, 16 Nov 2020 17:17:54 +0100

author
Kim Alvefur <zash@zash.se>
date
Mon, 16 Nov 2020 17:17:54 +0100
changeset 143
6b1fc3238318
parent 131
58d485001448
child 165
e4391832be1e
permissions
-rwxr-xr-x

clix.watch_pep: Use colors with --pretty

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 --
127
6a27edf256c3 clix: Initialize verse in modern way
Kim Alvefur <zash@zash.se>
parents: 122
diff changeset
8 local verse = require "verse".init "client"
0
ae83411a89c9 Initial commit
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
9
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
10 -- 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
11 short_opts = { v = "verbose", q = "quiet", t = "to", f = "from", e = "type",
102
f1166645a56c new sendfilecontent plugin
Marc Fauser
parents: 89
diff changeset
12 a = "account", p = "password", r = "resource", o = "presence", c = "chatroom", i = "interactive",
f1166645a56c new sendfilecontent plugin
Marc Fauser
parents: 89
diff changeset
13 f = "file" }
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
ae83411a89c9 Initial commit
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
16 print("Command Line XMPP, available commands:");
ae83411a89c9 Initial commit
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
17 for module in pairs(package.preload) do
ae83411a89c9 Initial commit
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
18 if module:match("^clix%.") then
ae83411a89c9 Initial commit
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
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
ae83411a89c9 Initial commit
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
22 end
ae83411a89c9 Initial commit
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
23 end
ae83411a89c9 Initial commit
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
24 return 0;
ae83411a89c9 Initial commit
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
25 end
ae83411a89c9 Initial commit
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
26
ae83411a89c9 Initial commit
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
27 local accounts = { default = {} };
ae83411a89c9 Initial commit
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
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
ae83411a89c9 Initial commit
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
40 line = line:match("^%s*(.-)%s*$");
ae83411a89c9 Initial commit
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
41 if line:match("^%[") then
ae83411a89c9 Initial commit
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
42 current_account = line:match("^%[(.-)%]");
ae83411a89c9 Initial commit
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
43 accounts[current_account] = {};
ae83411a89c9 Initial commit
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
44 if not current_account then -- This is the first defined account
ae83411a89c9 Initial commit
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
45 accounts.default = accounts[current_account];
ae83411a89c9 Initial commit
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
46 end
ae83411a89c9 Initial commit
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
47 elseif current_account then
ae83411a89c9 Initial commit
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
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
ae83411a89c9 Initial commit
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
52 end
ae83411a89c9 Initial commit
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
53 end
ae83411a89c9 Initial commit
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
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
ae83411a89c9 Initial commit
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
56 local account = accounts[opts.account or "default"];
ae83411a89c9 Initial commit
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
57 if not (account and account.jid) then
ae83411a89c9 Initial commit
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
58 io.stderr:write("The specified account (", opts.account or "default", ") wasn't found in the config file\n");
ae83411a89c9 Initial commit
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
59 return nil;
ae83411a89c9 Initial commit
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
60 end
105
82c21f1d6f46 clix.lua: Print logged warnings by default
Kim Alvefur <zash@zash.se>
parents: 89
diff changeset
61 verse.set_log_handler(io.stderr, opts.quiet and {} or not opts.verbose and {"info", "warn", "error"});
89
a8b63fbad807 clix.lua: Create the logger with the name "clix"
Kim Alvefur <zash@zash.se>
parents: 88
diff changeset
62 local conn = verse.new(verse.new_logger("clix"));
106
730fcde562ce clix.lua: Add --raw option for printing raw incoming and outgoing data
Kim Alvefur <zash@zash.se>
parents: 105
diff changeset
63 if opts.raw then
730fcde562ce clix.lua: Add --raw option for printing raw incoming and outgoing data
Kim Alvefur <zash@zash.se>
parents: 105
diff changeset
64 conn:hook("incoming-raw", print, 1000);
730fcde562ce clix.lua: Add --raw option for printing raw incoming and outgoing data
Kim Alvefur <zash@zash.se>
parents: 105
diff changeset
65 conn:hook("outgoing-raw", print, 1000);
730fcde562ce clix.lua: Add --raw option for printing raw incoming and outgoing data
Kim Alvefur <zash@zash.se>
parents: 105
diff changeset
66 end
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
67 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
68 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
69 end
0
ae83411a89c9 Initial commit
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
70 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
71 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
72 conn:close();
0
ae83411a89c9 Initial commit
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
73 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
74 conn:hook("ready", function ()
88
2c2e241e68df clix.lua: Log "connected as ..." instead of writing it directly to stderr
Kim Alvefur <zash@zash.se>
parents: 87
diff changeset
75 conn:info("Connected as %s", conn.jid);
21
cdeb02d9546d clix, clix.send: Support for chatrooms (-c/--chatroom with --nick=somenick)
Matthew Wild <mwild1@gmail.com>
parents: 20
diff changeset
76 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
77 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
78 end
17
fa9efbef8a0c Move presence sending into clix_connect(), and control with -o/--presence
Matthew Wild <mwild1@gmail.com>
parents: 15
diff changeset
79 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
80 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
81 end
fa9efbef8a0c Move presence sending into clix_connect(), and control with -o/--presence
Matthew Wild <mwild1@gmail.com>
parents: 15
diff changeset
82 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
83 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
84 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
85 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
86 conn:close();
0
ae83411a89c9 Initial commit
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
87 end);
ae83411a89c9 Initial commit
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
88 conn:hook("disconnected", function (info)
107
a074eaacefe7 clix.lua: Don't break if the disconnected event has no event data, and don't warn if the stream was closed cleanly
Kim Alvefur <zash@zash.se>
parents: 106
diff changeset
89 if info and info.reason and info.reason ~= "stream closed" then
2
fd77e75c4891 clix: Make more use of Verse's new logging controls
Matthew Wild <mwild1@gmail.com>
parents: 0
diff changeset
90 conn:warn("Disconnecting: %s", tostring(info.reason));
0
ae83411a89c9 Initial commit
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
91 end
ae83411a89c9 Initial commit
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
92 verse.quit();
ae83411a89c9 Initial commit
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
93 end);
ae83411a89c9 Initial commit
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
94 -- Optional config parameters
ae83411a89c9 Initial commit
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
95 conn.connect_host = account.address;
ae83411a89c9 Initial commit
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
96 conn.connect_port = account.port;
13
751db005032e clix: Allow specifying the resource with -r/--resource
Matthew Wild <mwild1@gmail.com>
parents: 11
diff changeset
97
0
ae83411a89c9 Initial commit
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
98 -- Connect!
15
54314164a2a3 clix: Allow -p/--password to specify the login password
Matthew Wild <mwild1@gmail.com>
parents: 14
diff changeset
99 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
100
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
101 -- 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
102 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
103 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
104 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
105 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
106 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
107 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
108 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
109 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
110 _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
111 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
112 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
113 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
114 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
115 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
116 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
117 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
118 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
119 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
120 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
121 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
122 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 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
124 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
125 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
126 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
127 -- /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
128
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
129
13
751db005032e clix: Allow specifying the resource with -r/--resource
Matthew Wild <mwild1@gmail.com>
parents: 11
diff changeset
130 if type(opts.resource) == "string" then
751db005032e clix: Allow specifying the resource with -r/--resource
Matthew Wild <mwild1@gmail.com>
parents: 11
diff changeset
131 conn.resource = opts.resource;
751db005032e clix: Allow specifying the resource with -r/--resource
Matthew Wild <mwild1@gmail.com>
parents: 11
diff changeset
132 end
751db005032e clix: Allow specifying the resource with -r/--resource
Matthew Wild <mwild1@gmail.com>
parents: 11
diff changeset
133
11
a502c905527c clix: Handle errors (including 'interrupted!') in verse.loop()
Matthew Wild <mwild1@gmail.com>
parents: 8
diff changeset
134 local ok, ret = pcall(verse.loop);
a502c905527c clix: Handle errors (including 'interrupted!') in verse.loop()
Matthew Wild <mwild1@gmail.com>
parents: 8
diff changeset
135 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
136 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
137 return 1;
a502c905527c clix: Handle errors (including 'interrupted!') in verse.loop()
Matthew Wild <mwild1@gmail.com>
parents: 8
diff changeset
138 end
a502c905527c clix: Handle errors (including 'interrupted!') in verse.loop()
Matthew Wild <mwild1@gmail.com>
parents: 8
diff changeset
139 return err or 0;
0
ae83411a89c9 Initial commit
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
140 end
ae83411a89c9 Initial commit
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
141
ae83411a89c9 Initial commit
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
142 local opts = {};
ae83411a89c9 Initial commit
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
143
37
bb7a51aca282 clix.lua: Fix argument handling (thanks uhoreg)
Matthew Wild <mwild1@gmail.com>
parents: 35
diff changeset
144 local command, args_handled_up_to;
0
ae83411a89c9 Initial commit
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
145 for i, opt in ipairs(arg) do
131
58d485001448 clix: Use tabs for indentation in command line parsing
Kim Alvefur <zash@zash.se>
parents: 127
diff changeset
146 if opt:match("^%-") and opt ~= "--" then
58d485001448 clix: Use tabs for indentation in command line parsing
Kim Alvefur <zash@zash.se>
parents: 127
diff changeset
147 local name = opt:match("^%-%-?([^%s=]+)()")
58d485001448 clix: Use tabs for indentation in command line parsing
Kim Alvefur <zash@zash.se>
parents: 127
diff changeset
148 name = (short_opts[name] or name):gsub("%-+", "_");
58d485001448 clix: Use tabs for indentation in command line parsing
Kim Alvefur <zash@zash.se>
parents: 127
diff changeset
149 if name:match("^no_") then
58d485001448 clix: Use tabs for indentation in command line parsing
Kim Alvefur <zash@zash.se>
parents: 127
diff changeset
150 name = name:sub(4, -1);
58d485001448 clix: Use tabs for indentation in command line parsing
Kim Alvefur <zash@zash.se>
parents: 127
diff changeset
151 opts[name] = false;
58d485001448 clix: Use tabs for indentation in command line parsing
Kim Alvefur <zash@zash.se>
parents: 127
diff changeset
152 else
58d485001448 clix: Use tabs for indentation in command line parsing
Kim Alvefur <zash@zash.se>
parents: 127
diff changeset
153 opts[name] = opt:match("=(.*)$") or true;
58d485001448 clix: Use tabs for indentation in command line parsing
Kim Alvefur <zash@zash.se>
parents: 127
diff changeset
154 end
58d485001448 clix: Use tabs for indentation in command line parsing
Kim Alvefur <zash@zash.se>
parents: 127
diff changeset
155 elseif not command then
58d485001448 clix: Use tabs for indentation in command line parsing
Kim Alvefur <zash@zash.se>
parents: 127
diff changeset
156 command = arg[i];
58d485001448 clix: Use tabs for indentation in command line parsing
Kim Alvefur <zash@zash.se>
parents: 127
diff changeset
157 args_handled_up_to = i-1;
58d485001448 clix: Use tabs for indentation in command line parsing
Kim Alvefur <zash@zash.se>
parents: 127
diff changeset
158 else
58d485001448 clix: Use tabs for indentation in command line parsing
Kim Alvefur <zash@zash.se>
parents: 127
diff changeset
159 args_handled_up_to = i-1;
58d485001448 clix: Use tabs for indentation in command line parsing
Kim Alvefur <zash@zash.se>
parents: 127
diff changeset
160 break;
58d485001448 clix: Use tabs for indentation in command line parsing
Kim Alvefur <zash@zash.se>
parents: 127
diff changeset
161 end
0
ae83411a89c9 Initial commit
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
162 end
ae83411a89c9 Initial commit
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
163
ae83411a89c9 Initial commit
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
164 -- 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
165 for n=((args_handled_up_to > 0) and args_handled_up_to or #arg),1,-1 do
0
ae83411a89c9 Initial commit
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
166 table.remove(arg, n);
ae83411a89c9 Initial commit
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
167 end
ae83411a89c9 Initial commit
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
168
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
169 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
170 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
171 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
172 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
173 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
174 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
175 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
176 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
177 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
178 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
179 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
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 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
182 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
183
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 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
185 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
186 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
187 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
188
0
ae83411a89c9 Initial commit
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
189 return m(opts, arg) or 0;
ae83411a89c9 Initial commit
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
190

mercurial