annotate sat_bridge/DBus.py @ 22:bb72c29f3432

added action cb mechanism for buttons. Tested with a temporary new user registration button.
author Goffi <goffi@goffi.org>
date Tue, 01 Dec 2009 04:56:08 +0100
parents 6928e3cb73a8
children 53e921c8a357
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
goffi@necton2
parents:
diff changeset
1 #!/usr/bin/python
goffi@necton2
parents:
diff changeset
2 #-*- coding: utf-8 -*-
goffi@necton2
parents:
diff changeset
3
goffi@necton2
parents:
diff changeset
4 """
goffi@necton2
parents:
diff changeset
5 SAT: a jabber client
goffi@necton2
parents:
diff changeset
6 Copyright (C) 2009 Jérôme Poisson (goffi@goffi.org)
goffi@necton2
parents:
diff changeset
7
goffi@necton2
parents:
diff changeset
8 This program is free software: you can redistribute it and/or modify
goffi@necton2
parents:
diff changeset
9 it under the terms of the GNU General Public License as published by
goffi@necton2
parents:
diff changeset
10 the Free Software Foundation, either version 3 of the License, or
goffi@necton2
parents:
diff changeset
11 (at your option) any later version.
goffi@necton2
parents:
diff changeset
12
goffi@necton2
parents:
diff changeset
13 This program is distributed in the hope that it will be useful,
goffi@necton2
parents:
diff changeset
14 but WITHOUT ANY WARRANTY; without even the implied warranty of
goffi@necton2
parents:
diff changeset
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
goffi@necton2
parents:
diff changeset
16 GNU General Public License for more details.
goffi@necton2
parents:
diff changeset
17
goffi@necton2
parents:
diff changeset
18 You should have received a copy of the GNU General Public License
goffi@necton2
parents:
diff changeset
19 along with this program. If not, see <http://www.gnu.org/licenses/>.
goffi@necton2
parents:
diff changeset
20 """
goffi@necton2
parents:
diff changeset
21
goffi@necton2
parents:
diff changeset
22
goffi@necton2
parents:
diff changeset
23 from bridge import Bridge
goffi@necton2
parents:
diff changeset
24 import dbus
goffi@necton2
parents:
diff changeset
25 import dbus.service
goffi@necton2
parents:
diff changeset
26 import dbus.mainloop.glib
goffi@necton2
parents:
diff changeset
27 import pdb
goffi@necton2
parents:
diff changeset
28 from logging import debug, info, error
goffi@necton2
parents:
diff changeset
29
10
14d7861ca59e refactoring: CONST replaced by const
Goffi <goffi@goffi.org>
parents: 7
diff changeset
30 const_INT_PREFIX = "org.goffi.SAT" #Interface prefix
16
0a024d5e0cd0 New account creation (in-band registration)
Goffi <goffi@goffi.org>
parents: 10
diff changeset
31 const_COMM_SUFFIX = ".communication"
0a024d5e0cd0 New account creation (in-band registration)
Goffi <goffi@goffi.org>
parents: 10
diff changeset
32 const_REQ_SUFFIX = ".request"
7
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins)
Goffi <goffi@goffi.org>
parents: 1
diff changeset
33
0
goffi@necton2
parents:
diff changeset
34 class DbusObject(dbus.service.Object):
goffi@necton2
parents:
diff changeset
35
goffi@necton2
parents:
diff changeset
36 def __init__(self, bus, path):
goffi@necton2
parents:
diff changeset
37 dbus.service.Object.__init__(self, bus, path)
goffi@necton2
parents:
diff changeset
38 debug("Init DbusObject...")
goffi@necton2
parents:
diff changeset
39 self.cb={}
goffi@necton2
parents:
diff changeset
40
goffi@necton2
parents:
diff changeset
41 def register(self, name, cb):
goffi@necton2
parents:
diff changeset
42 self.cb[name]=cb
goffi@necton2
parents:
diff changeset
43
goffi@necton2
parents:
diff changeset
44 ### signals ###
goffi@necton2
parents:
diff changeset
45
16
0a024d5e0cd0 New account creation (in-band registration)
Goffi <goffi@goffi.org>
parents: 10
diff changeset
46 @dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX,
0
goffi@necton2
parents:
diff changeset
47 signature='sa{ss}as')
goffi@necton2
parents:
diff changeset
48 def newContact(self, contact, attributes, groups):
goffi@necton2
parents:
diff changeset
49 debug("new contact signal (%s) sended", contact)
goffi@necton2
parents:
diff changeset
50
16
0a024d5e0cd0 New account creation (in-band registration)
Goffi <goffi@goffi.org>
parents: 10
diff changeset
51 @dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX,
0
goffi@necton2
parents:
diff changeset
52 signature='ssss')
goffi@necton2
parents:
diff changeset
53 def newMessage(self, from_jid, msg, type='chat', to=''):
goffi@necton2
parents:
diff changeset
54 debug("new message signal (from:%s msg:%s type:%s to:%s) sended", from_jid, msg, type, to)
goffi@necton2
parents:
diff changeset
55
16
0a024d5e0cd0 New account creation (in-band registration)
Goffi <goffi@goffi.org>
parents: 10
diff changeset
56 @dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX,
0
goffi@necton2
parents:
diff changeset
57 signature='ssssi')
goffi@necton2
parents:
diff changeset
58 def presenceUpdate(self, jid, type, show, status, priority):
goffi@necton2
parents:
diff changeset
59 debug("presence update signal (from:%s type: %s show:%s status:\"%s\" priority:%d) sended" , jid, type, show, status, priority)
goffi@necton2
parents:
diff changeset
60
16
0a024d5e0cd0 New account creation (in-band registration)
Goffi <goffi@goffi.org>
parents: 10
diff changeset
61 @dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX,
0
goffi@necton2
parents:
diff changeset
62 signature='sss')
18
6928e3cb73a8 refactoring: using xml params part II
Goffi <goffi@goffi.org>
parents: 17
diff changeset
63 def paramUpdate(self, name, value, category):
6928e3cb73a8 refactoring: using xml params part II
Goffi <goffi@goffi.org>
parents: 17
diff changeset
64 debug("param update signal: %s=%s in category %s", name, value, category)
0
goffi@necton2
parents:
diff changeset
65
16
0a024d5e0cd0 New account creation (in-band registration)
Goffi <goffi@goffi.org>
parents: 10
diff changeset
66 @dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX,
0
goffi@necton2
parents:
diff changeset
67 signature='s')
goffi@necton2
parents:
diff changeset
68 def contactDeleted(self, jid):
goffi@necton2
parents:
diff changeset
69 debug("contact deleted signal: %s", jid)
goffi@necton2
parents:
diff changeset
70
16
0a024d5e0cd0 New account creation (in-band registration)
Goffi <goffi@goffi.org>
parents: 10
diff changeset
71 @dbus.service.signal(const_INT_PREFIX+const_REQ_SUFFIX,
0
goffi@necton2
parents:
diff changeset
72 signature='ssa{ss}')
goffi@necton2
parents:
diff changeset
73 def askConfirmation(self, type, id, data):
goffi@necton2
parents:
diff changeset
74 debug("asking for confirmation: id = [%s] type = %s data = %s", id, type, data)
goffi@necton2
parents:
diff changeset
75
22
bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button.
Goffi <goffi@goffi.org>
parents: 18
diff changeset
76 @dbus.service.signal(const_INT_PREFIX+const_REQ_SUFFIX,
16
0a024d5e0cd0 New account creation (in-band registration)
Goffi <goffi@goffi.org>
parents: 10
diff changeset
77 signature='ssa{ss}')
22
bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button.
Goffi <goffi@goffi.org>
parents: 18
diff changeset
78 def actionResult(self, type, id, data):
bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button.
Goffi <goffi@goffi.org>
parents: 18
diff changeset
79 debug("result of action: id = [%s] type = %s data = %s", id, type, data)
0
goffi@necton2
parents:
diff changeset
80
goffi@necton2
parents:
diff changeset
81 ### methods ###
goffi@necton2
parents:
diff changeset
82
16
0a024d5e0cd0 New account creation (in-band registration)
Goffi <goffi@goffi.org>
parents: 10
diff changeset
83 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
0a024d5e0cd0 New account creation (in-band registration)
Goffi <goffi@goffi.org>
parents: 10
diff changeset
84 in_signature='sssi', out_signature='s')
0a024d5e0cd0 New account creation (in-band registration)
Goffi <goffi@goffi.org>
parents: 10
diff changeset
85 def registerNewAccount(self, login, password, host, port=5222):
0a024d5e0cd0 New account creation (in-band registration)
Goffi <goffi@goffi.org>
parents: 10
diff changeset
86 info ("New account registration asked")
0a024d5e0cd0 New account creation (in-band registration)
Goffi <goffi@goffi.org>
parents: 10
diff changeset
87 return self.cb["registerNewAccount"](login, password, host, port)
0a024d5e0cd0 New account creation (in-band registration)
Goffi <goffi@goffi.org>
parents: 10
diff changeset
88
0a024d5e0cd0 New account creation (in-band registration)
Goffi <goffi@goffi.org>
parents: 10
diff changeset
89 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
0
goffi@necton2
parents:
diff changeset
90 in_signature='', out_signature='')
goffi@necton2
parents:
diff changeset
91 def connect(self):
goffi@necton2
parents:
diff changeset
92 info ("Connection asked")
goffi@necton2
parents:
diff changeset
93 return self.cb["connect"]()
goffi@necton2
parents:
diff changeset
94
16
0a024d5e0cd0 New account creation (in-band registration)
Goffi <goffi@goffi.org>
parents: 10
diff changeset
95 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
1
a06a151fc31f Disconnect first draft
Goffi <goffi@goffi.org>
parents: 0
diff changeset
96 in_signature='', out_signature='')
a06a151fc31f Disconnect first draft
Goffi <goffi@goffi.org>
parents: 0
diff changeset
97 def disconnect(self):
a06a151fc31f Disconnect first draft
Goffi <goffi@goffi.org>
parents: 0
diff changeset
98 info ("Disconnection asked")
a06a151fc31f Disconnect first draft
Goffi <goffi@goffi.org>
parents: 0
diff changeset
99 return self.cb["disconnect"]()
a06a151fc31f Disconnect first draft
Goffi <goffi@goffi.org>
parents: 0
diff changeset
100
16
0a024d5e0cd0 New account creation (in-band registration)
Goffi <goffi@goffi.org>
parents: 10
diff changeset
101 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
0
goffi@necton2
parents:
diff changeset
102 in_signature='', out_signature='a(sa{ss}as)')
goffi@necton2
parents:
diff changeset
103 def getContacts(self):
goffi@necton2
parents:
diff changeset
104 debug("getContacts...")
goffi@necton2
parents:
diff changeset
105 return self.cb["getContacts"]()
goffi@necton2
parents:
diff changeset
106
16
0a024d5e0cd0 New account creation (in-band registration)
Goffi <goffi@goffi.org>
parents: 10
diff changeset
107 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
0
goffi@necton2
parents:
diff changeset
108 in_signature='', out_signature='a(ssssi)')
goffi@necton2
parents:
diff changeset
109 def getPresenceStatus(self):
goffi@necton2
parents:
diff changeset
110 debug("getPresenceStatus...")
goffi@necton2
parents:
diff changeset
111 return self.cb["getPresenceStatus"]()
goffi@necton2
parents:
diff changeset
112
16
0a024d5e0cd0 New account creation (in-band registration)
Goffi <goffi@goffi.org>
parents: 10
diff changeset
113 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
0
goffi@necton2
parents:
diff changeset
114 in_signature='ss', out_signature='')
goffi@necton2
parents:
diff changeset
115 def sendMessage(self, to, message):
goffi@necton2
parents:
diff changeset
116 debug("sendMessage...")
goffi@necton2
parents:
diff changeset
117 self.cb["sendMessage"](to, message)
goffi@necton2
parents:
diff changeset
118
16
0a024d5e0cd0 New account creation (in-band registration)
Goffi <goffi@goffi.org>
parents: 10
diff changeset
119 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
0
goffi@necton2
parents:
diff changeset
120 in_signature='ssssi', out_signature='')
goffi@necton2
parents:
diff changeset
121 def setPresence(self, to="", type="", show="", status="", priority=0):
goffi@necton2
parents:
diff changeset
122 self.cb["setPresence"](to, type, show, status, priority)
goffi@necton2
parents:
diff changeset
123
16
0a024d5e0cd0 New account creation (in-band registration)
Goffi <goffi@goffi.org>
parents: 10
diff changeset
124 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
0
goffi@necton2
parents:
diff changeset
125 in_signature='sss', out_signature='')
17
74a39f40eb6d refactoring: using xml params (not finished yet)
Goffi <goffi@goffi.org>
parents: 16
diff changeset
126 def setParam(self, name, value, category):
74a39f40eb6d refactoring: using xml params (not finished yet)
Goffi <goffi@goffi.org>
parents: 16
diff changeset
127 self.cb["setParam"](name, str(value), category)
0
goffi@necton2
parents:
diff changeset
128
18
6928e3cb73a8 refactoring: using xml params part II
Goffi <goffi@goffi.org>
parents: 17
diff changeset
129 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
6928e3cb73a8 refactoring: using xml params part II
Goffi <goffi@goffi.org>
parents: 17
diff changeset
130 in_signature='ss', out_signature='s')
22
bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button.
Goffi <goffi@goffi.org>
parents: 18
diff changeset
131 def getParamA(self, name, category="default"):
bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button.
Goffi <goffi@goffi.org>
parents: 18
diff changeset
132 return self.cb["getParamA"](name, category)
0
goffi@necton2
parents:
diff changeset
133
16
0a024d5e0cd0 New account creation (in-band registration)
Goffi <goffi@goffi.org>
parents: 10
diff changeset
134 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
17
74a39f40eb6d refactoring: using xml params (not finished yet)
Goffi <goffi@goffi.org>
parents: 16
diff changeset
135 in_signature='', out_signature='s')
74a39f40eb6d refactoring: using xml params (not finished yet)
Goffi <goffi@goffi.org>
parents: 16
diff changeset
136 def getParams(self):
74a39f40eb6d refactoring: using xml params (not finished yet)
Goffi <goffi@goffi.org>
parents: 16
diff changeset
137 return self.cb["getParams"]()
0
goffi@necton2
parents:
diff changeset
138
16
0a024d5e0cd0 New account creation (in-band registration)
Goffi <goffi@goffi.org>
parents: 10
diff changeset
139 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
18
6928e3cb73a8 refactoring: using xml params part II
Goffi <goffi@goffi.org>
parents: 17
diff changeset
140 in_signature='s', out_signature='s')
6928e3cb73a8 refactoring: using xml params part II
Goffi <goffi@goffi.org>
parents: 17
diff changeset
141 def getParamsForCategory(self, category):
6928e3cb73a8 refactoring: using xml params part II
Goffi <goffi@goffi.org>
parents: 17
diff changeset
142 return self.cb["getParamsForCategory"](category)
6928e3cb73a8 refactoring: using xml params part II
Goffi <goffi@goffi.org>
parents: 17
diff changeset
143
6928e3cb73a8 refactoring: using xml params part II
Goffi <goffi@goffi.org>
parents: 17
diff changeset
144 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
0
goffi@necton2
parents:
diff changeset
145 in_signature='', out_signature='as')
goffi@necton2
parents:
diff changeset
146 def getParamsCategories(self):
goffi@necton2
parents:
diff changeset
147 return self.cb["getParamsCategories"]()
goffi@necton2
parents:
diff changeset
148
16
0a024d5e0cd0 New account creation (in-band registration)
Goffi <goffi@goffi.org>
parents: 10
diff changeset
149 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
0
goffi@necton2
parents:
diff changeset
150 in_signature='ssi', out_signature='a{i(ss)}')
goffi@necton2
parents:
diff changeset
151 def getHistory(self, from_jid, to_jid, size):
goffi@necton2
parents:
diff changeset
152 debug("History asked for %s", to_jid)
goffi@necton2
parents:
diff changeset
153 return self.cb["getHistory"](from_jid, to_jid, size)
goffi@necton2
parents:
diff changeset
154
16
0a024d5e0cd0 New account creation (in-band registration)
Goffi <goffi@goffi.org>
parents: 10
diff changeset
155 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
0
goffi@necton2
parents:
diff changeset
156 in_signature='s', out_signature='')
goffi@necton2
parents:
diff changeset
157 def addContact(self, jid):
goffi@necton2
parents:
diff changeset
158 debug("Subscription asked for %s", jid)
goffi@necton2
parents:
diff changeset
159 return self.cb["addContact"](jid)
goffi@necton2
parents:
diff changeset
160
16
0a024d5e0cd0 New account creation (in-band registration)
Goffi <goffi@goffi.org>
parents: 10
diff changeset
161 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
0
goffi@necton2
parents:
diff changeset
162 in_signature='s', out_signature='')
goffi@necton2
parents:
diff changeset
163 def delContact(self, jid):
goffi@necton2
parents:
diff changeset
164 debug("Unsubscription asked for %s", jid)
goffi@necton2
parents:
diff changeset
165 return self.cb["delContact"](jid)
goffi@necton2
parents:
diff changeset
166
16
0a024d5e0cd0 New account creation (in-band registration)
Goffi <goffi@goffi.org>
parents: 10
diff changeset
167 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
0
goffi@necton2
parents:
diff changeset
168 in_signature='', out_signature='b')
goffi@necton2
parents:
diff changeset
169 def isConnected(self):
goffi@necton2
parents:
diff changeset
170 debug("Connection status requested")
goffi@necton2
parents:
diff changeset
171 return self.cb["isConnected"]()
goffi@necton2
parents:
diff changeset
172
16
0a024d5e0cd0 New account creation (in-band registration)
Goffi <goffi@goffi.org>
parents: 10
diff changeset
173 @dbus.service.method(const_INT_PREFIX+const_REQ_SUFFIX,
22
bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button.
Goffi <goffi@goffi.org>
parents: 18
diff changeset
174 in_signature='sa{ss}', out_signature='s')
bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button.
Goffi <goffi@goffi.org>
parents: 18
diff changeset
175 def launchAction(self, type, data):
bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button.
Goffi <goffi@goffi.org>
parents: 18
diff changeset
176 return self.cb["launchAction"](type, data)
bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button.
Goffi <goffi@goffi.org>
parents: 18
diff changeset
177
bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button.
Goffi <goffi@goffi.org>
parents: 18
diff changeset
178 @dbus.service.method(const_INT_PREFIX+const_REQ_SUFFIX,
0
goffi@necton2
parents:
diff changeset
179 in_signature='sba{ss}', out_signature='')
goffi@necton2
parents:
diff changeset
180 def confirmationAnswer(self, id, accepted, data):
goffi@necton2
parents:
diff changeset
181 debug("Answer for confirmation [%s]: %s", id, "Accepted" if accepted else "Refused")
goffi@necton2
parents:
diff changeset
182 return self.cb["confirmationAnswer"](id, accepted, data)
goffi@necton2
parents:
diff changeset
183
16
0a024d5e0cd0 New account creation (in-band registration)
Goffi <goffi@goffi.org>
parents: 10
diff changeset
184 @dbus.service.method(const_INT_PREFIX+const_REQ_SUFFIX,
0
goffi@necton2
parents:
diff changeset
185 in_signature='s', out_signature='a{ss}')
goffi@necton2
parents:
diff changeset
186 def getProgress(self, id):
goffi@necton2
parents:
diff changeset
187 #debug("Progress asked for %s", id)
goffi@necton2
parents:
diff changeset
188 return self.cb["getProgress"](id)
goffi@necton2
parents:
diff changeset
189
16
0a024d5e0cd0 New account creation (in-band registration)
Goffi <goffi@goffi.org>
parents: 10
diff changeset
190 def __attribute_string(self, in_sign):
7
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins)
Goffi <goffi@goffi.org>
parents: 1
diff changeset
191 i=0
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins)
Goffi <goffi@goffi.org>
parents: 1
diff changeset
192 idx=0
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins)
Goffi <goffi@goffi.org>
parents: 1
diff changeset
193 attr_string=""
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins)
Goffi <goffi@goffi.org>
parents: 1
diff changeset
194 while i<len(in_sign):
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins)
Goffi <goffi@goffi.org>
parents: 1
diff changeset
195 if in_sign[i] not in ['b','y','n','i','x','q','u','t','d','s','a']:
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins)
Goffi <goffi@goffi.org>
parents: 1
diff changeset
196 raise Exception #FIXME: create an exception here (unmanaged attribute type)
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins)
Goffi <goffi@goffi.org>
parents: 1
diff changeset
197
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins)
Goffi <goffi@goffi.org>
parents: 1
diff changeset
198 attr_string += ("" if idx==0 else ",") + ("arg_%i" % idx)
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins)
Goffi <goffi@goffi.org>
parents: 1
diff changeset
199 idx+=1
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins)
Goffi <goffi@goffi.org>
parents: 1
diff changeset
200
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins)
Goffi <goffi@goffi.org>
parents: 1
diff changeset
201 if in_sign[i] == 'a':
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins)
Goffi <goffi@goffi.org>
parents: 1
diff changeset
202 while (True):
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins)
Goffi <goffi@goffi.org>
parents: 1
diff changeset
203 i+=1
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins)
Goffi <goffi@goffi.org>
parents: 1
diff changeset
204 if i>=len(in_sign):
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins)
Goffi <goffi@goffi.org>
parents: 1
diff changeset
205 raise Exception #FIXME: create an exception here (the '}' is not presend)
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins)
Goffi <goffi@goffi.org>
parents: 1
diff changeset
206 if in_sign[i] == '}':
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins)
Goffi <goffi@goffi.org>
parents: 1
diff changeset
207 break
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins)
Goffi <goffi@goffi.org>
parents: 1
diff changeset
208 i+=1
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins)
Goffi <goffi@goffi.org>
parents: 1
diff changeset
209 return attr_string
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins)
Goffi <goffi@goffi.org>
parents: 1
diff changeset
210
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins)
Goffi <goffi@goffi.org>
parents: 1
diff changeset
211
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins)
Goffi <goffi@goffi.org>
parents: 1
diff changeset
212
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins)
Goffi <goffi@goffi.org>
parents: 1
diff changeset
213 def addMethod(self, name, int_suffix, in_sign, out_sign):
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins)
Goffi <goffi@goffi.org>
parents: 1
diff changeset
214 """Dynamically add a method to Dbus Bridge"""
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins)
Goffi <goffi@goffi.org>
parents: 1
diff changeset
215 #FIXME: Better way ???
16
0a024d5e0cd0 New account creation (in-band registration)
Goffi <goffi@goffi.org>
parents: 10
diff changeset
216 attributes = self.__attribute_string(in_sign)
7
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins)
Goffi <goffi@goffi.org>
parents: 1
diff changeset
217
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins)
Goffi <goffi@goffi.org>
parents: 1
diff changeset
218 code = compile ('def '+name+' (self,'+attributes+'): return self.cb["'+name+'"]('+attributes+')', '<DBus bridge>','exec')
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins)
Goffi <goffi@goffi.org>
parents: 1
diff changeset
219 exec (code)
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins)
Goffi <goffi@goffi.org>
parents: 1
diff changeset
220 method = locals()[name]
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins)
Goffi <goffi@goffi.org>
parents: 1
diff changeset
221 setattr(DbusObject, name, dbus.service.method(
10
14d7861ca59e refactoring: CONST replaced by const
Goffi <goffi@goffi.org>
parents: 7
diff changeset
222 const_INT_PREFIX+int_suffix, in_signature=in_sign, out_signature=out_sign)(method))
7
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins)
Goffi <goffi@goffi.org>
parents: 1
diff changeset
223
0
goffi@necton2
parents:
diff changeset
224 class DBusBridge(Bridge):
goffi@necton2
parents:
diff changeset
225 def __init__(self):
goffi@necton2
parents:
diff changeset
226 dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
goffi@necton2
parents:
diff changeset
227 Bridge.__init__(self)
goffi@necton2
parents:
diff changeset
228 info ("Init DBus...")
goffi@necton2
parents:
diff changeset
229 self.session_bus = dbus.SessionBus()
10
14d7861ca59e refactoring: CONST replaced by const
Goffi <goffi@goffi.org>
parents: 7
diff changeset
230 self.dbus_name = dbus.service.BusName(const_INT_PREFIX, self.session_bus)
0
goffi@necton2
parents:
diff changeset
231 self.dbus_bridge = DbusObject(self.session_bus, '/org/goffi/SAT/bridge')
goffi@necton2
parents:
diff changeset
232
goffi@necton2
parents:
diff changeset
233 def newContact(self, contact, attributes, groups):
goffi@necton2
parents:
diff changeset
234 self.dbus_bridge.newContact(contact, attributes, groups)
goffi@necton2
parents:
diff changeset
235
goffi@necton2
parents:
diff changeset
236 def newMessage(self,from_jid,msg,type='chat', to=''):
goffi@necton2
parents:
diff changeset
237 debug("sending message...")
goffi@necton2
parents:
diff changeset
238 self.dbus_bridge.newMessage(from_jid, msg, type, to)
goffi@necton2
parents:
diff changeset
239
goffi@necton2
parents:
diff changeset
240 def presenceUpdate(self, jid, type, show, status, priority):
goffi@necton2
parents:
diff changeset
241 debug("updating presence for %s",jid)
goffi@necton2
parents:
diff changeset
242 self.dbus_bridge.presenceUpdate(jid, type, show, status, priority)
goffi@necton2
parents:
diff changeset
243
18
6928e3cb73a8 refactoring: using xml params part II
Goffi <goffi@goffi.org>
parents: 17
diff changeset
244 def paramUpdate(self, name, value, category):
6928e3cb73a8 refactoring: using xml params part II
Goffi <goffi@goffi.org>
parents: 17
diff changeset
245 debug("updating param [%s] %s ", category, name)
6928e3cb73a8 refactoring: using xml params part II
Goffi <goffi@goffi.org>
parents: 17
diff changeset
246 self.dbus_bridge.paramUpdate(name, value, category)
0
goffi@necton2
parents:
diff changeset
247
goffi@necton2
parents:
diff changeset
248 def contactDeleted(self, jid):
goffi@necton2
parents:
diff changeset
249 debug("sending contact deleted signal %s ", jid)
goffi@necton2
parents:
diff changeset
250 self.dbus_bridge.contactDeleted(jid)
goffi@necton2
parents:
diff changeset
251
goffi@necton2
parents:
diff changeset
252 def askConfirmation(self, type, id, data):
goffi@necton2
parents:
diff changeset
253 self.dbus_bridge.askConfirmation(type, id, data)
goffi@necton2
parents:
diff changeset
254
22
bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button.
Goffi <goffi@goffi.org>
parents: 18
diff changeset
255 def actionResult(self, type, id, data):
bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button.
Goffi <goffi@goffi.org>
parents: 18
diff changeset
256 self.dbus_bridge.actionResult(type, id, data)
16
0a024d5e0cd0 New account creation (in-band registration)
Goffi <goffi@goffi.org>
parents: 10
diff changeset
257
0
goffi@necton2
parents:
diff changeset
258 def register(self, name, callback):
7
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins)
Goffi <goffi@goffi.org>
parents: 1
diff changeset
259 debug("registering DBus bridge method [%s]",name)
0
goffi@necton2
parents:
diff changeset
260 self.dbus_bridge.register(name, callback)
goffi@necton2
parents:
diff changeset
261
7
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins)
Goffi <goffi@goffi.org>
parents: 1
diff changeset
262 def addMethod(self, name, int_suffix, in_sign, out_sign, method):
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins)
Goffi <goffi@goffi.org>
parents: 1
diff changeset
263 """Dynamically add a method to Dbus Bridge"""
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins)
Goffi <goffi@goffi.org>
parents: 1
diff changeset
264 print ("Adding method [%s] to DBus bridge" % name)
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins)
Goffi <goffi@goffi.org>
parents: 1
diff changeset
265 self.dbus_bridge.addMethod(name, int_suffix, in_sign, out_sign)
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins)
Goffi <goffi@goffi.org>
parents: 1
diff changeset
266 self.register(name, method)
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins)
Goffi <goffi@goffi.org>
parents: 1
diff changeset
267