Software / code / clix
Annotate
clix.lua @ 17:fa9efbef8a0c
Move presence sending into clix_connect(), and control with -o/--presence
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 07 Jan 2010 20:56:18 +0000 |
| parent | 15:54314164a2a3 |
| child | 20:80cc61512f10 |
| 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 |
|
17
fa9efbef8a0c
Move presence sending into clix_connect(), and control with -o/--presence
Matthew Wild <mwild1@gmail.com>
parents:
15
diff
changeset
|
12 short_opts = { v = "verbose", t = "to", f = "from", e = "type", a = "account", p = "password", r = "resource", o = "presence" } |
|
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
|
13 |
| 0 | 14 local command = arg[1]; |
| 15 | |
| 16 if not command then | |
| 17 print("Command Line XMPP, available commands:"); | |
| 18 for module in pairs(package.preload) do | |
| 19 if module:match("^clix%.") then | |
| 20 local m = require(module); | |
| 21 m{ "--short-help" }; | |
| 22 end | |
| 23 end | |
| 24 return 0; | |
| 25 end | |
| 26 | |
| 27 local ok, m = pcall(require, "clix."..command); | |
| 28 if not ok then | |
| 29 print("Error running command '"..command.."' (run with --debug to see full error)"); | |
| 30 if arg[2] == "--debug" then | |
| 31 print(m); | |
| 32 end | |
| 33 return 1; | |
| 34 end | |
| 35 | |
| 36 if type(m) ~= "function" then | |
| 37 print(command.." is not a valid command"); | |
| 38 return 1; | |
| 39 end | |
| 40 | |
| 41 local accounts = { default = {} }; | |
| 42 local current_account; | |
| 43 for line in io.lines(os.getenv("HOME").."/.clix") do | |
| 44 line = line:match("^%s*(.-)%s*$"); | |
| 45 if line:match("^%[") then | |
| 46 current_account = line:match("^%[(.-)%]"); | |
| 47 accounts[current_account] = {}; | |
| 48 if not current_account then -- This is the first defined account | |
| 49 accounts.default = accounts[current_account]; | |
| 50 end | |
| 51 elseif current_account then | |
| 52 local k,v = line:match("^(%w+)%s*[:=]%s*(.+)$"); | |
| 53 accounts[current_account or "default"][k] = v; | |
| 54 end | |
| 55 end | |
| 56 | |
| 57 function clix_connect(opts, on_connect) | |
| 58 local account = accounts[opts.account or "default"]; | |
| 59 if not (account and account.jid) then | |
| 60 io.stderr:write("The specified account (", opts.account or "default", ") wasn't found in the config file\n"); | |
| 61 return nil; | |
| 62 end | |
|
7
6078e8d2b59d
clix: Enable global Verse logger when verbose is enabled
Matthew Wild <mwild1@gmail.com>
parents:
5
diff
changeset
|
63 verse.set_logger(opts.verbose and print or function () end); |
|
2
fd77e75c4891
clix: Make more use of Verse's new logging controls
Matthew Wild <mwild1@gmail.com>
parents:
0
diff
changeset
|
64 local conn = verse.new(verse.logger()); |
|
fd77e75c4891
clix: Make more use of Verse's new logging controls
Matthew Wild <mwild1@gmail.com>
parents:
0
diff
changeset
|
65 conn.log.debug = opts.verbose; |
| 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); |
|
17
fa9efbef8a0c
Move presence sending into clix_connect(), and control with -o/--presence
Matthew Wild <mwild1@gmail.com>
parents:
15
diff
changeset
|
70 conn:hook("binding-success", function () |
|
fa9efbef8a0c
Move presence sending into clix_connect(), and control with -o/--presence
Matthew Wild <mwild1@gmail.com>
parents:
15
diff
changeset
|
71 conn:debug("Connected: "..tostring(conn)); |
|
fa9efbef8a0c
Move presence sending into clix_connect(), and control with -o/--presence
Matthew Wild <mwild1@gmail.com>
parents:
15
diff
changeset
|
72 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
|
73 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
|
74 end |
|
fa9efbef8a0c
Move presence sending into clix_connect(), and control with -o/--presence
Matthew Wild <mwild1@gmail.com>
parents:
15
diff
changeset
|
75 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
|
76 end); |
| 0 | 77 conn:hook("binding-failure", function (err) |
|
2
fd77e75c4891
clix: Make more use of Verse's new logging controls
Matthew Wild <mwild1@gmail.com>
parents:
0
diff
changeset
|
78 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
|
79 conn:close(); |
| 0 | 80 end); |
| 81 conn:hook("disconnected", function (info) | |
| 82 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
|
83 conn:warn("Disconnecting: %s", tostring(info.reason)); |
| 0 | 84 end |
| 85 verse.quit(); | |
| 86 end); | |
| 87 -- Optional config parameters | |
| 88 conn.connect_host = account.address; | |
| 89 conn.connect_port = account.port; | |
|
13
751db005032e
clix: Allow specifying the resource with -r/--resource
Matthew Wild <mwild1@gmail.com>
parents:
11
diff
changeset
|
90 |
| 0 | 91 -- Connect! |
|
15
54314164a2a3
clix: Allow -p/--password to specify the login password
Matthew Wild <mwild1@gmail.com>
parents:
14
diff
changeset
|
92 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
|
93 |
|
13
751db005032e
clix: Allow specifying the resource with -r/--resource
Matthew Wild <mwild1@gmail.com>
parents:
11
diff
changeset
|
94 if type(opts.resource) == "string" then |
|
751db005032e
clix: Allow specifying the resource with -r/--resource
Matthew Wild <mwild1@gmail.com>
parents:
11
diff
changeset
|
95 conn.resource = opts.resource; |
|
751db005032e
clix: Allow specifying the resource with -r/--resource
Matthew Wild <mwild1@gmail.com>
parents:
11
diff
changeset
|
96 end |
|
751db005032e
clix: Allow specifying the resource with -r/--resource
Matthew Wild <mwild1@gmail.com>
parents:
11
diff
changeset
|
97 |
|
11
a502c905527c
clix: Handle errors (including 'interrupted!') in verse.loop()
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
98 local ok, ret = pcall(verse.loop); |
|
a502c905527c
clix: Handle errors (including 'interrupted!') in verse.loop()
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
99 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
|
100 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
|
101 return 1; |
|
a502c905527c
clix: Handle errors (including 'interrupted!') in verse.loop()
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
102 end |
|
a502c905527c
clix: Handle errors (including 'interrupted!') in verse.loop()
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
103 return err or 0; |
| 0 | 104 end |
| 105 | |
| 106 table.remove(arg,1); | |
| 107 | |
| 108 local opts = {}; | |
| 109 | |
| 110 local args_handled_up_to; | |
| 111 for i, opt in ipairs(arg) do | |
| 112 if opt:match("^%-") and opt ~= "--" then | |
| 113 local name = opt:match("^%-%-?([^%s=]+)()") | |
| 114 name = (short_opts[name] or name):gsub("%-+", "_"); | |
| 115 if name:match("^no_") then | |
| 116 name = name:sub(4, -1); | |
| 117 opts[name] = false; | |
| 118 else | |
| 119 opts[name] = opt:match("=(.*)$") or true; | |
| 120 end | |
| 121 else | |
| 122 args_handled_up_to = i-1; | |
| 123 break; | |
| 124 end | |
| 125 end | |
| 126 | |
| 127 -- Remove all the handled args from the arg array | |
| 128 for n=(args_handled_up_to or #arg),1,-1 do | |
| 129 table.remove(arg, n); | |
| 130 end | |
| 131 | |
| 132 return m(opts, arg) or 0; | |
| 133 |
