Mercurial > libervia-backend
annotate src/bridge/DBus.py @ 331:0a8eb0461f31
core: main SAT class now moved in its own module core.sat_main
| author | Goffi <goffi@goffi.org> |
|---|---|
| date | Mon, 23 May 2011 21:32:28 +0200 |
| parents | 233e6fce0b49 |
| children | 953536246d9d |
| rev | line source |
|---|---|
| 0 | 1 #!/usr/bin/python |
| 2 #-*- coding: utf-8 -*- | |
| 3 | |
| 4 """ | |
| 5 SAT: a jabber client | |
| 228 | 6 Copyright (C) 2009, 2010, 2011 Jérôme Poisson (goffi@goffi.org) |
| 0 | 7 |
| 8 This program is free software: you can redistribute it and/or modify | |
| 9 it under the terms of the GNU General Public License as published by | |
| 10 the Free Software Foundation, either version 3 of the License, or | |
| 11 (at your option) any later version. | |
| 12 | |
| 13 This program is distributed in the hope that it will be useful, | |
| 14 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 16 GNU General Public License for more details. | |
| 17 | |
| 18 You should have received a copy of the GNU General Public License | |
| 19 along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| 20 """ | |
| 21 | |
| 22 | |
| 23 from bridge import Bridge | |
| 24 import dbus | |
| 25 import dbus.service | |
| 26 import dbus.mainloop.glib | |
|
272
1d2e0dfe7114
bridge: core & frontend sides of bridge are now generated
Goffi <goffi@goffi.org>
parents:
267
diff
changeset
|
27 from logging import debug, info |
| 0 | 28 |
| 10 | 29 const_INT_PREFIX = "org.goffi.SAT" #Interface prefix |
|
16
0a024d5e0cd0
New account creation (in-band registration)
Goffi <goffi@goffi.org>
parents:
10
diff
changeset
|
30 const_COMM_SUFFIX = ".communication" |
|
0a024d5e0cd0
New account creation (in-band registration)
Goffi <goffi@goffi.org>
parents:
10
diff
changeset
|
31 const_REQ_SUFFIX = ".request" |
|
7
c14a3a7018a5
added dynamic exportation of Dbus bridge method (usefull for plugins)
Goffi <goffi@goffi.org>
parents:
1
diff
changeset
|
32 |
| 0 | 33 class DbusObject(dbus.service.Object): |
| 34 | |
| 35 def __init__(self, bus, path): | |
| 36 dbus.service.Object.__init__(self, bus, path) | |
| 37 debug("Init DbusObject...") | |
| 38 self.cb={} | |
| 39 | |
| 40 def register(self, name, cb): | |
| 41 self.cb[name]=cb | |
| 42 | |
| 43 ### signals ### | |
| 44 | |
| 267 | 45 @dbus.service.signal(const_INT_PREFIX+const_REQ_SUFFIX, |
| 46 signature='ssa{ss}') | |
| 47 def actionResult(self, answer_type, id, data): | |
|
272
1d2e0dfe7114
bridge: core & frontend sides of bridge are now generated
Goffi <goffi@goffi.org>
parents:
267
diff
changeset
|
48 debug ("actionResult") |
| 267 | 49 |
| 50 @dbus.service.signal(const_INT_PREFIX+const_REQ_SUFFIX, | |
| 51 signature='ssa{sa{ss}}') | |
| 52 def actionResultExt(self, answer_type, id, data): | |
|
272
1d2e0dfe7114
bridge: core & frontend sides of bridge are now generated
Goffi <goffi@goffi.org>
parents:
267
diff
changeset
|
53 debug ("actionResultExt") |
| 267 | 54 |
| 55 @dbus.service.signal(const_INT_PREFIX+const_REQ_SUFFIX, | |
| 56 signature='ssa{ss}') | |
| 57 def askConfirmation(self, conf_type, id, data): | |
|
272
1d2e0dfe7114
bridge: core & frontend sides of bridge are now generated
Goffi <goffi@goffi.org>
parents:
267
diff
changeset
|
58 debug ("askConfirmation") |
| 267 | 59 |
|
16
0a024d5e0cd0
New account creation (in-band registration)
Goffi <goffi@goffi.org>
parents:
10
diff
changeset
|
60 @dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX, |
|
66
8147b4f40809
SàT: multi-profile: DBus signals and frontend adaptation (first draft)
Goffi <goffi@goffi.org>
parents:
65
diff
changeset
|
61 signature='s') |
|
8147b4f40809
SàT: multi-profile: DBus signals and frontend adaptation (first draft)
Goffi <goffi@goffi.org>
parents:
65
diff
changeset
|
62 def connected(self, profile): |
|
272
1d2e0dfe7114
bridge: core & frontend sides of bridge are now generated
Goffi <goffi@goffi.org>
parents:
267
diff
changeset
|
63 debug ("connected") |
| 267 | 64 |
| 52 | 65 @dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX, |
|
262
af3d4f11fe43
Added management of connection error
Goffi <goffi@goffi.org>
parents:
260
diff
changeset
|
66 signature='ss') |
|
274
c1ad04586edf
Bridge: rename connection_error to connectionError for function name consistency
Goffi <goffi@goffi.org>
parents:
272
diff
changeset
|
67 def connectionError(self, error_type, profile): |
|
c1ad04586edf
Bridge: rename connection_error to connectionError for function name consistency
Goffi <goffi@goffi.org>
parents:
272
diff
changeset
|
68 debug ("connectionError") |
| 0 | 69 |
|
16
0a024d5e0cd0
New account creation (in-band registration)
Goffi <goffi@goffi.org>
parents:
10
diff
changeset
|
70 @dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX, |
| 49 | 71 signature='ss') |
|
66
8147b4f40809
SàT: multi-profile: DBus signals and frontend adaptation (first draft)
Goffi <goffi@goffi.org>
parents:
65
diff
changeset
|
72 def contactDeleted(self, entity, profile): |
|
272
1d2e0dfe7114
bridge: core & frontend sides of bridge are now generated
Goffi <goffi@goffi.org>
parents:
267
diff
changeset
|
73 debug ("contactDeleted") |
| 267 | 74 |
| 75 @dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX, | |
| 76 signature='s') | |
| 77 def disconnected(self, profile): | |
|
272
1d2e0dfe7114
bridge: core & frontend sides of bridge are now generated
Goffi <goffi@goffi.org>
parents:
267
diff
changeset
|
78 debug ("disconnected") |
| 267 | 79 |
| 80 @dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX, | |
| 81 signature='ssss') | |
| 82 def newAlert(self, message, title, alert_type, profile): | |
|
272
1d2e0dfe7114
bridge: core & frontend sides of bridge are now generated
Goffi <goffi@goffi.org>
parents:
267
diff
changeset
|
83 debug ("newAlert") |
| 267 | 84 |
| 85 @dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX, | |
| 86 signature='sa{ss}ass') | |
| 87 def newContact(self, contact, attributes, groups, profile): | |
|
272
1d2e0dfe7114
bridge: core & frontend sides of bridge are now generated
Goffi <goffi@goffi.org>
parents:
267
diff
changeset
|
88 debug ("newContact") |
| 0 | 89 |
| 267 | 90 @dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX, |
| 91 signature='sssss') | |
| 92 def newMessage(self, from_jid, message, mess_type, to_jid, profile): | |
|
272
1d2e0dfe7114
bridge: core & frontend sides of bridge are now generated
Goffi <goffi@goffi.org>
parents:
267
diff
changeset
|
93 debug ("newMessage") |
| 267 | 94 |
| 95 @dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX, | |
| 96 signature='ssss') | |
| 97 def paramUpdate(self, name, value, category, profile): | |
|
272
1d2e0dfe7114
bridge: core & frontend sides of bridge are now generated
Goffi <goffi@goffi.org>
parents:
267
diff
changeset
|
98 debug ("paramUpdate") |
| 0 | 99 |
| 267 | 100 @dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX, |
| 101 signature='ssia{ss}s') | |
| 102 def presenceUpdate(self, entity, show, priority, statuses, profile): | |
|
272
1d2e0dfe7114
bridge: core & frontend sides of bridge are now generated
Goffi <goffi@goffi.org>
parents:
267
diff
changeset
|
103 debug ("presenceUpdate") |
| 267 | 104 |
| 105 @dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX, | |
| 106 signature='sss') | |
| 107 def subscribe(self, sub_type, entity, profile): | |
|
272
1d2e0dfe7114
bridge: core & frontend sides of bridge are now generated
Goffi <goffi@goffi.org>
parents:
267
diff
changeset
|
108 debug ("subscribe") |
| 267 | 109 |
| 49 | 110 @dbus.service.signal(const_INT_PREFIX+const_REQ_SUFFIX, |
| 111 signature='sa{ss}') | |
| 112 def updatedValue(self, name, value): | |
|
272
1d2e0dfe7114
bridge: core & frontend sides of bridge are now generated
Goffi <goffi@goffi.org>
parents:
267
diff
changeset
|
113 debug ("updatedValue") |
| 267 | 114 |
| 49 | 115 |
| 0 | 116 ### methods ### |
| 267 | 117 |
| 118 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX, | |
| 119 in_signature='ss', out_signature='') | |
| 120 def addContact(self, entity, profile_key="@DEFAULT@"): | |
|
272
1d2e0dfe7114
bridge: core & frontend sides of bridge are now generated
Goffi <goffi@goffi.org>
parents:
267
diff
changeset
|
121 debug ("addContact") |
| 267 | 122 return self.cb["addContact"](unicode(entity), unicode(profile_key)) |
| 0 | 123 |
| 267 | 124 @dbus.service.method(const_INT_PREFIX+const_REQ_SUFFIX, |
| 125 in_signature='ssss', out_signature='s') | |
| 126 def callMenu(self, category, name, menu_type, profile_key): | |
|
272
1d2e0dfe7114
bridge: core & frontend sides of bridge are now generated
Goffi <goffi@goffi.org>
parents:
267
diff
changeset
|
127 debug ("callMenu") |
| 267 | 128 return self.cb["callMenu"](unicode(category), unicode(name), unicode(menu_type), unicode(profile_key)) |
| 129 | |
| 130 @dbus.service.method(const_INT_PREFIX+const_REQ_SUFFIX, | |
| 131 in_signature='sba{ss}', out_signature='') | |
| 132 def confirmationAnswer(self, id, accepted, data): | |
|
272
1d2e0dfe7114
bridge: core & frontend sides of bridge are now generated
Goffi <goffi@goffi.org>
parents:
267
diff
changeset
|
133 debug ("confirmationAnswer") |
| 267 | 134 return self.cb["confirmationAnswer"](unicode(id), accepted, data) |
| 135 | |
| 136 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX, | |
| 137 in_signature='s', out_signature='') | |
| 138 def connect(self, profile_key="@DEFAULT@"): | |
|
272
1d2e0dfe7114
bridge: core & frontend sides of bridge are now generated
Goffi <goffi@goffi.org>
parents:
267
diff
changeset
|
139 debug ("connect") |
| 267 | 140 return self.cb["connect"](unicode(profile_key)) |
| 141 | |
| 142 @dbus.service.method(const_INT_PREFIX+const_REQ_SUFFIX, | |
| 143 in_signature='s', out_signature='i') | |
| 144 def createProfile(self, profile): | |
|
272
1d2e0dfe7114
bridge: core & frontend sides of bridge are now generated
Goffi <goffi@goffi.org>
parents:
267
diff
changeset
|
145 debug ("createProfile") |
| 267 | 146 return self.cb["createProfile"](unicode(profile)) |
| 147 | |
| 148 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX, | |
| 149 in_signature='ss', out_signature='') | |
| 150 def delContact(self, entity, profile_key="@DEFAULT@"): | |
|
272
1d2e0dfe7114
bridge: core & frontend sides of bridge are now generated
Goffi <goffi@goffi.org>
parents:
267
diff
changeset
|
151 debug ("delContact") |
| 267 | 152 return self.cb["delContact"](unicode(entity), unicode(profile_key)) |
| 153 | |
|
119
ded2431cea5a
Primitivus: chat window / text sending.
Goffi <goffi@goffi.org>
parents:
105
diff
changeset
|
154 @dbus.service.method(const_INT_PREFIX+const_REQ_SUFFIX, |
| 267 | 155 in_signature='s', out_signature='i') |
| 156 def deleteProfile(self, profile): | |
|
272
1d2e0dfe7114
bridge: core & frontend sides of bridge are now generated
Goffi <goffi@goffi.org>
parents:
267
diff
changeset
|
157 debug ("deleteProfile") |
| 267 | 158 return self.cb["deleteProfile"](unicode(profile)) |
| 159 | |
| 160 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX, | |
| 161 in_signature='s', out_signature='') | |
| 162 def disconnect(self, profile_key="@DEFAULT@"): | |
|
272
1d2e0dfe7114
bridge: core & frontend sides of bridge are now generated
Goffi <goffi@goffi.org>
parents:
267
diff
changeset
|
163 debug ("disconnect") |
| 267 | 164 return self.cb["disconnect"](unicode(profile_key)) |
| 165 | |
| 166 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX, | |
| 167 in_signature='s', out_signature='a(sa{ss}as)') | |
| 168 def getContacts(self, profile_key="@DEFAULT@"): | |
|
272
1d2e0dfe7114
bridge: core & frontend sides of bridge are now generated
Goffi <goffi@goffi.org>
parents:
267
diff
changeset
|
169 debug ("getContacts") |
| 267 | 170 return self.cb["getContacts"](unicode(profile_key)) |
| 171 | |
| 172 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX, | |
| 173 in_signature='ssi', out_signature='a{i(ss)}') | |
| 174 def getHistory(self, from_jid, to_jid, size): | |
|
272
1d2e0dfe7114
bridge: core & frontend sides of bridge are now generated
Goffi <goffi@goffi.org>
parents:
267
diff
changeset
|
175 debug ("getHistory") |
| 267 | 176 return self.cb["getHistory"](unicode(from_jid), unicode(to_jid), size) |
| 177 | |
| 178 @dbus.service.method(const_INT_PREFIX+const_REQ_SUFFIX, | |
| 179 in_signature='sss', out_signature='s') | |
| 180 def getMenuHelp(self, category, name, menu_type): | |
|
272
1d2e0dfe7114
bridge: core & frontend sides of bridge are now generated
Goffi <goffi@goffi.org>
parents:
267
diff
changeset
|
181 debug ("getMenuHelp") |
| 267 | 182 return self.cb["getMenuHelp"](unicode(category), unicode(name), unicode(menu_type)) |
| 183 | |
| 184 @dbus.service.method(const_INT_PREFIX+const_REQ_SUFFIX, | |
| 185 in_signature='', out_signature='a(sss)') | |
| 186 def getMenus(self, ): | |
|
272
1d2e0dfe7114
bridge: core & frontend sides of bridge are now generated
Goffi <goffi@goffi.org>
parents:
267
diff
changeset
|
187 debug ("getMenus") |
| 267 | 188 return self.cb["getMenus"]() |
| 189 | |
| 190 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX, | |
|
272
1d2e0dfe7114
bridge: core & frontend sides of bridge are now generated
Goffi <goffi@goffi.org>
parents:
267
diff
changeset
|
191 in_signature='ssss', out_signature='s') |
|
1d2e0dfe7114
bridge: core & frontend sides of bridge are now generated
Goffi <goffi@goffi.org>
parents:
267
diff
changeset
|
192 def getParamA(self, name, category, attribute="value", profile_key="@DEFAULT@"): |
|
1d2e0dfe7114
bridge: core & frontend sides of bridge are now generated
Goffi <goffi@goffi.org>
parents:
267
diff
changeset
|
193 debug ("getParamA") |
|
1d2e0dfe7114
bridge: core & frontend sides of bridge are now generated
Goffi <goffi@goffi.org>
parents:
267
diff
changeset
|
194 return self.cb["getParamA"](unicode(name), unicode(category), unicode(attribute), unicode(profile_key)) |
| 267 | 195 |
| 196 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX, | |
| 197 in_signature='s', out_signature='s') | |
| 198 def getParams(self, profile_key="@DEFAULT@"): | |
|
272
1d2e0dfe7114
bridge: core & frontend sides of bridge are now generated
Goffi <goffi@goffi.org>
parents:
267
diff
changeset
|
199 debug ("getParams") |
| 267 | 200 return self.cb["getParams"](unicode(profile_key)) |
| 201 | |
| 202 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX, | |
| 203 in_signature='', out_signature='as') | |
| 204 def getParamsCategories(self, ): | |
|
272
1d2e0dfe7114
bridge: core & frontend sides of bridge are now generated
Goffi <goffi@goffi.org>
parents:
267
diff
changeset
|
205 debug ("getParamsCategories") |
| 267 | 206 return self.cb["getParamsCategories"]() |
| 207 | |
| 208 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX, | |
| 209 in_signature='ss', out_signature='s') | |
| 210 def getParamsForCategory(self, category, profile_key="@DEFAULT@"): | |
|
272
1d2e0dfe7114
bridge: core & frontend sides of bridge are now generated
Goffi <goffi@goffi.org>
parents:
267
diff
changeset
|
211 debug ("getParamsForCategory") |
| 267 | 212 return self.cb["getParamsForCategory"](unicode(category), unicode(profile_key)) |
| 213 | |
| 214 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX, | |
| 215 in_signature='s', out_signature='s') | |
| 216 def getParamsUI(self, profile_key="@DEFAULT@"): | |
|
272
1d2e0dfe7114
bridge: core & frontend sides of bridge are now generated
Goffi <goffi@goffi.org>
parents:
267
diff
changeset
|
217 debug ("getParamsUI") |
| 267 | 218 return self.cb["getParamsUI"](unicode(profile_key)) |
| 219 | |
| 220 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX, | |
| 221 in_signature='s', out_signature='a{sa{s(sia{ss})}}') | |
| 222 def getPresenceStatus(self, profile_key="@DEFAULT@"): | |
|
272
1d2e0dfe7114
bridge: core & frontend sides of bridge are now generated
Goffi <goffi@goffi.org>
parents:
267
diff
changeset
|
223 debug ("getPresenceStatus") |
| 267 | 224 return self.cb["getPresenceStatus"](unicode(profile_key)) |
| 225 | |
|
60
9764e027ecc0
SàT: multi-profile parameters, first draft
Goffi <goffi@goffi.org>
parents:
57
diff
changeset
|
226 @dbus.service.method(const_INT_PREFIX+const_REQ_SUFFIX, |
|
66
8147b4f40809
SàT: multi-profile: DBus signals and frontend adaptation (first draft)
Goffi <goffi@goffi.org>
parents:
65
diff
changeset
|
227 in_signature='s', out_signature='s') |
| 267 | 228 def getProfileName(self, profile_key="@DEFAULT@"): |
|
272
1d2e0dfe7114
bridge: core & frontend sides of bridge are now generated
Goffi <goffi@goffi.org>
parents:
267
diff
changeset
|
229 debug ("getProfileName") |
| 267 | 230 return self.cb["getProfileName"](unicode(profile_key)) |
| 231 | |
|
66
8147b4f40809
SàT: multi-profile: DBus signals and frontend adaptation (first draft)
Goffi <goffi@goffi.org>
parents:
65
diff
changeset
|
232 @dbus.service.method(const_INT_PREFIX+const_REQ_SUFFIX, |
|
60
9764e027ecc0
SàT: multi-profile parameters, first draft
Goffi <goffi@goffi.org>
parents:
57
diff
changeset
|
233 in_signature='', out_signature='as') |
| 267 | 234 def getProfilesList(self, ): |
|
272
1d2e0dfe7114
bridge: core & frontend sides of bridge are now generated
Goffi <goffi@goffi.org>
parents:
267
diff
changeset
|
235 debug ("getProfilesList") |
|
60
9764e027ecc0
SàT: multi-profile parameters, first draft
Goffi <goffi@goffi.org>
parents:
57
diff
changeset
|
236 return self.cb["getProfilesList"]() |
|
9764e027ecc0
SàT: multi-profile parameters, first draft
Goffi <goffi@goffi.org>
parents:
57
diff
changeset
|
237 |
|
9764e027ecc0
SàT: multi-profile parameters, first draft
Goffi <goffi@goffi.org>
parents:
57
diff
changeset
|
238 @dbus.service.method(const_INT_PREFIX+const_REQ_SUFFIX, |
| 267 | 239 in_signature='s', out_signature='a{ss}') |
| 240 def getProgress(self, id): | |
|
272
1d2e0dfe7114
bridge: core & frontend sides of bridge are now generated
Goffi <goffi@goffi.org>
parents:
267
diff
changeset
|
241 debug ("getProgress") |
| 267 | 242 return self.cb["getProgress"](unicode(id)) |
| 68 | 243 |
| 244 @dbus.service.method(const_INT_PREFIX+const_REQ_SUFFIX, | |
| 267 | 245 in_signature='', out_signature='s') |
| 246 def getVersion(self, ): | |
|
272
1d2e0dfe7114
bridge: core & frontend sides of bridge are now generated
Goffi <goffi@goffi.org>
parents:
267
diff
changeset
|
247 debug ("getVersion") |
| 267 | 248 return self.cb["getVersion"]() |
| 249 | |
| 250 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX, | |
| 251 in_signature='s', out_signature='a{ss}') | |
| 252 def getWaitingSub(self, profile_key="@DEFAULT@"): | |
|
272
1d2e0dfe7114
bridge: core & frontend sides of bridge are now generated
Goffi <goffi@goffi.org>
parents:
267
diff
changeset
|
253 debug ("getWaitingSub") |
| 267 | 254 return self.cb["getWaitingSub"](unicode(profile_key)) |
| 255 | |
| 256 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX, | |
| 257 in_signature='s', out_signature='b') | |
| 258 def isConnected(self, profile_key="@DEFAULT@"): | |
|
272
1d2e0dfe7114
bridge: core & frontend sides of bridge are now generated
Goffi <goffi@goffi.org>
parents:
267
diff
changeset
|
259 debug ("isConnected") |
| 267 | 260 return self.cb["isConnected"](unicode(profile_key)) |
| 261 | |
| 262 @dbus.service.method(const_INT_PREFIX+const_REQ_SUFFIX, | |
| 263 in_signature='sa{ss}s', out_signature='s') | |
| 264 def launchAction(self, action_type, data, profile_key="@DEFAULT@"): | |
|
272
1d2e0dfe7114
bridge: core & frontend sides of bridge are now generated
Goffi <goffi@goffi.org>
parents:
267
diff
changeset
|
265 debug ("launchAction") |
| 267 | 266 return self.cb["launchAction"](unicode(action_type), data, unicode(profile_key)) |
|
60
9764e027ecc0
SàT: multi-profile parameters, first draft
Goffi <goffi@goffi.org>
parents:
57
diff
changeset
|
267 |
|
16
0a024d5e0cd0
New account creation (in-band registration)
Goffi <goffi@goffi.org>
parents:
10
diff
changeset
|
268 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX, |
|
0a024d5e0cd0
New account creation (in-band registration)
Goffi <goffi@goffi.org>
parents:
10
diff
changeset
|
269 in_signature='sssi', out_signature='s') |
|
0a024d5e0cd0
New account creation (in-band registration)
Goffi <goffi@goffi.org>
parents:
10
diff
changeset
|
270 def registerNewAccount(self, login, password, host, port=5222): |
|
272
1d2e0dfe7114
bridge: core & frontend sides of bridge are now generated
Goffi <goffi@goffi.org>
parents:
267
diff
changeset
|
271 debug ("registerNewAccount") |
| 267 | 272 return self.cb["registerNewAccount"](unicode(login), unicode(password), unicode(host), port) |
| 0 | 273 |
|
16
0a024d5e0cd0
New account creation (in-band registration)
Goffi <goffi@goffi.org>
parents:
10
diff
changeset
|
274 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX, |
|
260
c8406fe5e81e
Added SMTP server plugin, for sending messages from classic MUA \o/
Goffi <goffi@goffi.org>
parents:
228
diff
changeset
|
275 in_signature='sssss', out_signature='') |
|
272
1d2e0dfe7114
bridge: core & frontend sides of bridge are now generated
Goffi <goffi@goffi.org>
parents:
267
diff
changeset
|
276 def sendMessage(self, to_jid, message, subject='', mess_type="chat", profile_key="@DEFAULT@"): |
|
1d2e0dfe7114
bridge: core & frontend sides of bridge are now generated
Goffi <goffi@goffi.org>
parents:
267
diff
changeset
|
277 debug ("sendMessage") |
| 267 | 278 return self.cb["sendMessage"](unicode(to_jid), unicode(message), unicode(subject), unicode(mess_type), unicode(profile_key)) |
|
65
d35c5edab53f
SàT: multi-profile: memory & dbus bridge's methods profile management
Goffi <goffi@goffi.org>
parents:
61
diff
changeset
|
279 |
|
d35c5edab53f
SàT: multi-profile: memory & dbus bridge's methods profile management
Goffi <goffi@goffi.org>
parents:
61
diff
changeset
|
280 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX, |
|
d35c5edab53f
SàT: multi-profile: memory & dbus bridge's methods profile management
Goffi <goffi@goffi.org>
parents:
61
diff
changeset
|
281 in_signature='ssss', out_signature='') |
| 267 | 282 def setParam(self, name, value, category, profile_key="@DEFAULT@"): |
|
272
1d2e0dfe7114
bridge: core & frontend sides of bridge are now generated
Goffi <goffi@goffi.org>
parents:
267
diff
changeset
|
283 debug ("setParam") |
| 267 | 284 return self.cb["setParam"](unicode(name), unicode(value), unicode(category), unicode(profile_key)) |
| 105 | 285 |
| 286 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX, | |
| 267 | 287 in_signature='ssia{ss}s', out_signature='') |
| 288 def setPresence(self, to_jid='', show='', priority=0, statuses={}, profile_key="@DEFAULT@"): | |
|
272
1d2e0dfe7114
bridge: core & frontend sides of bridge are now generated
Goffi <goffi@goffi.org>
parents:
267
diff
changeset
|
289 debug ("setPresence") |
| 267 | 290 return self.cb["setPresence"](unicode(to_jid), unicode(show), priority, statuses, unicode(profile_key)) |
| 0 | 291 |
|
16
0a024d5e0cd0
New account creation (in-band registration)
Goffi <goffi@goffi.org>
parents:
10
diff
changeset
|
292 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX, |
| 267 | 293 in_signature='sss', out_signature='') |
| 294 def subscription(self, sub_type, entity, profile_key="@DEFAULT@"): | |
|
272
1d2e0dfe7114
bridge: core & frontend sides of bridge are now generated
Goffi <goffi@goffi.org>
parents:
267
diff
changeset
|
295 debug ("subscription") |
| 267 | 296 return self.cb["subscription"](unicode(sub_type), unicode(entity), unicode(profile_key)) |
| 0 | 297 |
| 101 | 298 |
|
300
233e6fce0b49
DBus bridge: using new generated bridge
Goffi <goffi@goffi.org>
parents:
298
diff
changeset
|
299 def __attributes(self, in_sign): |
| 267 | 300 """Return arguments to user given a in_sign |
| 301 @param in_sign: in_sign in the short form (using s,a,i,b etc) | |
| 302 @return: list of arguments that correspond to a in_sign (e.g.: "sss" return "arg1, arg2, arg3")""" | |
|
7
c14a3a7018a5
added dynamic exportation of Dbus bridge method (usefull for plugins)
Goffi <goffi@goffi.org>
parents:
1
diff
changeset
|
303 i=0 |
|
c14a3a7018a5
added dynamic exportation of Dbus bridge method (usefull for plugins)
Goffi <goffi@goffi.org>
parents:
1
diff
changeset
|
304 idx=0 |
|
300
233e6fce0b49
DBus bridge: using new generated bridge
Goffi <goffi@goffi.org>
parents:
298
diff
changeset
|
305 attr=[] |
|
7
c14a3a7018a5
added dynamic exportation of Dbus bridge method (usefull for plugins)
Goffi <goffi@goffi.org>
parents:
1
diff
changeset
|
306 while i<len(in_sign): |
|
c14a3a7018a5
added dynamic exportation of Dbus bridge method (usefull for plugins)
Goffi <goffi@goffi.org>
parents:
1
diff
changeset
|
307 if in_sign[i] not in ['b','y','n','i','x','q','u','t','d','s','a']: |
| 267 | 308 raise ParseError("Unmanaged attribute type [%c]" % in_sign[i]) |
|
7
c14a3a7018a5
added dynamic exportation of Dbus bridge method (usefull for plugins)
Goffi <goffi@goffi.org>
parents:
1
diff
changeset
|
309 |
|
300
233e6fce0b49
DBus bridge: using new generated bridge
Goffi <goffi@goffi.org>
parents:
298
diff
changeset
|
310 attr.append("arg_%i" % idx) |
|
7
c14a3a7018a5
added dynamic exportation of Dbus bridge method (usefull for plugins)
Goffi <goffi@goffi.org>
parents:
1
diff
changeset
|
311 idx+=1 |
|
c14a3a7018a5
added dynamic exportation of Dbus bridge method (usefull for plugins)
Goffi <goffi@goffi.org>
parents:
1
diff
changeset
|
312 |
|
c14a3a7018a5
added dynamic exportation of Dbus bridge method (usefull for plugins)
Goffi <goffi@goffi.org>
parents:
1
diff
changeset
|
313 if in_sign[i] == 'a': |
| 73 | 314 i+=1 |
|
182
556c2bd7c344
Primitivus now implement showDialog + new "newAlert" bridge method to show a dialog from core
Goffi <goffi@goffi.org>
parents:
135
diff
changeset
|
315 if in_sign[i]!='{' and in_sign[i]!='(': #FIXME: must manage tuples out of arrays |
| 73 | 316 i+=1 |
| 317 continue #we have a simple type for the array | |
| 267 | 318 opening_car = in_sign[i] |
| 319 assert(opening_car in ['{','(']) | |
| 320 closing_car = '}' if opening_car == '{' else ')' | |
| 321 opening_count = 1 | |
| 73 | 322 while (True): #we have a dict or a list of tuples |
|
7
c14a3a7018a5
added dynamic exportation of Dbus bridge method (usefull for plugins)
Goffi <goffi@goffi.org>
parents:
1
diff
changeset
|
323 i+=1 |
|
c14a3a7018a5
added dynamic exportation of Dbus bridge method (usefull for plugins)
Goffi <goffi@goffi.org>
parents:
1
diff
changeset
|
324 if i>=len(in_sign): |
| 267 | 325 raise ParseError("missing }") |
| 326 if in_sign[i] == opening_car: | |
| 327 opening_count+=1 | |
| 328 if in_sign[i] == closing_car: | |
| 329 opening_count-=1 | |
| 330 if opening_count == 0: | |
| 331 break | |
|
7
c14a3a7018a5
added dynamic exportation of Dbus bridge method (usefull for plugins)
Goffi <goffi@goffi.org>
parents:
1
diff
changeset
|
332 i+=1 |
|
300
233e6fce0b49
DBus bridge: using new generated bridge
Goffi <goffi@goffi.org>
parents:
298
diff
changeset
|
333 return attr |
|
7
c14a3a7018a5
added dynamic exportation of Dbus bridge method (usefull for plugins)
Goffi <goffi@goffi.org>
parents:
1
diff
changeset
|
334 |
|
300
233e6fce0b49
DBus bridge: using new generated bridge
Goffi <goffi@goffi.org>
parents:
298
diff
changeset
|
335 def addMethod(self, name, int_suffix, in_sign, out_sign, async=False, doc={}): |
|
7
c14a3a7018a5
added dynamic exportation of Dbus bridge method (usefull for plugins)
Goffi <goffi@goffi.org>
parents:
1
diff
changeset
|
336 """Dynamically add a method to Dbus Bridge""" |
|
300
233e6fce0b49
DBus bridge: using new generated bridge
Goffi <goffi@goffi.org>
parents:
298
diff
changeset
|
337 _attributes = self.__attributes(in_sign) |
|
233e6fce0b49
DBus bridge: using new generated bridge
Goffi <goffi@goffi.org>
parents:
298
diff
changeset
|
338 |
|
233e6fce0b49
DBus bridge: using new generated bridge
Goffi <goffi@goffi.org>
parents:
298
diff
changeset
|
339 if async: |
|
233e6fce0b49
DBus bridge: using new generated bridge
Goffi <goffi@goffi.org>
parents:
298
diff
changeset
|
340 _attributes.extend(['callback','errback']) |
|
233e6fce0b49
DBus bridge: using new generated bridge
Goffi <goffi@goffi.org>
parents:
298
diff
changeset
|
341 |
|
233e6fce0b49
DBus bridge: using new generated bridge
Goffi <goffi@goffi.org>
parents:
298
diff
changeset
|
342 attributes = ', '.join(_attributes) |
|
7
c14a3a7018a5
added dynamic exportation of Dbus bridge method (usefull for plugins)
Goffi <goffi@goffi.org>
parents:
1
diff
changeset
|
343 |
|
c14a3a7018a5
added dynamic exportation of Dbus bridge method (usefull for plugins)
Goffi <goffi@goffi.org>
parents:
1
diff
changeset
|
344 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
|
345 exec (code) |
|
c14a3a7018a5
added dynamic exportation of Dbus bridge method (usefull for plugins)
Goffi <goffi@goffi.org>
parents:
1
diff
changeset
|
346 method = locals()[name] |
|
300
233e6fce0b49
DBus bridge: using new generated bridge
Goffi <goffi@goffi.org>
parents:
298
diff
changeset
|
347 async_callbacks = ('callback', 'errback') if async else None |
|
7
c14a3a7018a5
added dynamic exportation of Dbus bridge method (usefull for plugins)
Goffi <goffi@goffi.org>
parents:
1
diff
changeset
|
348 setattr(DbusObject, name, dbus.service.method( |
|
300
233e6fce0b49
DBus bridge: using new generated bridge
Goffi <goffi@goffi.org>
parents:
298
diff
changeset
|
349 const_INT_PREFIX+int_suffix, in_signature=in_sign, out_signature=out_sign, |
|
233e6fce0b49
DBus bridge: using new generated bridge
Goffi <goffi@goffi.org>
parents:
298
diff
changeset
|
350 async_callbacks=async_callbacks)(method)) |
|
284
c25371424090
dbus bridge: fixed introspection for dynamically added methods and signals
Goffi <goffi@goffi.org>
parents:
274
diff
changeset
|
351 function = getattr(self, name) |
|
c25371424090
dbus bridge: fixed introspection for dynamically added methods and signals
Goffi <goffi@goffi.org>
parents:
274
diff
changeset
|
352 func_table = self._dbus_class_table[self.__class__.__module__ + '.' + self.__class__.__name__][function._dbus_interface] |
|
c25371424090
dbus bridge: fixed introspection for dynamically added methods and signals
Goffi <goffi@goffi.org>
parents:
274
diff
changeset
|
353 func_table[function.__name__] = function #Needed for introspection |
| 73 | 354 |
|
298
15c8916317d0
dbus bridge: added doc parameter, unmanaged yet
Goffi <goffi@goffi.org>
parents:
284
diff
changeset
|
355 def addSignal(self, name, int_suffix, signature, doc={}): |
| 73 | 356 """Dynamically add a signal to Dbus Bridge""" |
|
300
233e6fce0b49
DBus bridge: using new generated bridge
Goffi <goffi@goffi.org>
parents:
298
diff
changeset
|
357 attributes = ', '.join(self.__attributes(signature)) |
| 73 | 358 |
| 359 code = compile ('def '+name+' (self,'+attributes+'): debug ("'+name+' signal")', '<DBus bridge>','exec') | |
| 360 exec (code) | |
| 361 signal = locals()[name] | |
| 362 setattr(DbusObject, name, dbus.service.signal( | |
| 363 const_INT_PREFIX+int_suffix, signature=signature)(signal)) | |
|
284
c25371424090
dbus bridge: fixed introspection for dynamically added methods and signals
Goffi <goffi@goffi.org>
parents:
274
diff
changeset
|
364 function = getattr(self, name) |
|
c25371424090
dbus bridge: fixed introspection for dynamically added methods and signals
Goffi <goffi@goffi.org>
parents:
274
diff
changeset
|
365 func_table = self._dbus_class_table[self.__class__.__module__ + '.' + self.__class__.__name__][function._dbus_interface] |
|
c25371424090
dbus bridge: fixed introspection for dynamically added methods and signals
Goffi <goffi@goffi.org>
parents:
274
diff
changeset
|
366 func_table[function.__name__] = function #Needed for introspection |
|
7
c14a3a7018a5
added dynamic exportation of Dbus bridge method (usefull for plugins)
Goffi <goffi@goffi.org>
parents:
1
diff
changeset
|
367 |
| 0 | 368 class DBusBridge(Bridge): |
| 369 def __init__(self): | |
| 370 dbus.mainloop.glib.DBusGMainLoop(set_as_default=True) | |
| 371 Bridge.__init__(self) | |
| 372 info ("Init DBus...") | |
| 373 self.session_bus = dbus.SessionBus() | |
| 10 | 374 self.dbus_name = dbus.service.BusName(const_INT_PREFIX, self.session_bus) |
| 0 | 375 self.dbus_bridge = DbusObject(self.session_bus, '/org/goffi/SAT/bridge') |
| 376 | |
| 267 | 377 def actionResult(self, answer_type, id, data): |
| 378 self.dbus_bridge.actionResult(answer_type, id, data) | |
| 379 | |
| 380 def actionResultExt(self, answer_type, id, data): | |
| 381 self.dbus_bridge.actionResultExt(answer_type, id, data) | |
| 382 | |
| 383 def askConfirmation(self, conf_type, id, data): | |
| 384 self.dbus_bridge.askConfirmation(conf_type, id, data) | |
| 385 | |
|
66
8147b4f40809
SàT: multi-profile: DBus signals and frontend adaptation (first draft)
Goffi <goffi@goffi.org>
parents:
65
diff
changeset
|
386 def connected(self, profile): |
|
8147b4f40809
SàT: multi-profile: DBus signals and frontend adaptation (first draft)
Goffi <goffi@goffi.org>
parents:
65
diff
changeset
|
387 self.dbus_bridge.connected(profile) |
| 267 | 388 |
|
274
c1ad04586edf
Bridge: rename connection_error to connectionError for function name consistency
Goffi <goffi@goffi.org>
parents:
272
diff
changeset
|
389 def connectionError(self, error_type, profile): |
|
c1ad04586edf
Bridge: rename connection_error to connectionError for function name consistency
Goffi <goffi@goffi.org>
parents:
272
diff
changeset
|
390 self.dbus_bridge.connectionError(error_type, profile) |
| 267 | 391 |
| 392 def contactDeleted(self, entity, profile): | |
| 393 self.dbus_bridge.contactDeleted(entity, profile) | |
| 394 | |
|
66
8147b4f40809
SàT: multi-profile: DBus signals and frontend adaptation (first draft)
Goffi <goffi@goffi.org>
parents:
65
diff
changeset
|
395 def disconnected(self, profile): |
|
8147b4f40809
SàT: multi-profile: DBus signals and frontend adaptation (first draft)
Goffi <goffi@goffi.org>
parents:
65
diff
changeset
|
396 self.dbus_bridge.disconnected(profile) |
| 267 | 397 |
| 398 def newAlert(self, message, title, alert_type, profile): | |
| 399 self.dbus_bridge.newAlert(message, title, alert_type, profile) | |
| 400 | |
|
66
8147b4f40809
SàT: multi-profile: DBus signals and frontend adaptation (first draft)
Goffi <goffi@goffi.org>
parents:
65
diff
changeset
|
401 def newContact(self, contact, attributes, groups, profile): |
|
8147b4f40809
SàT: multi-profile: DBus signals and frontend adaptation (first draft)
Goffi <goffi@goffi.org>
parents:
65
diff
changeset
|
402 self.dbus_bridge.newContact(contact, attributes, groups, profile) |
| 0 | 403 |
| 267 | 404 def newMessage(self, from_jid, message, mess_type, to_jid, profile): |
| 405 self.dbus_bridge.newMessage(from_jid, message, mess_type, to_jid, profile) | |
| 0 | 406 |
| 267 | 407 def paramUpdate(self, name, value, category, profile): |
| 408 self.dbus_bridge.paramUpdate(name, value, category, profile) | |
| 409 | |
|
66
8147b4f40809
SàT: multi-profile: DBus signals and frontend adaptation (first draft)
Goffi <goffi@goffi.org>
parents:
65
diff
changeset
|
410 def presenceUpdate(self, entity, show, priority, statuses, profile): |
|
8147b4f40809
SàT: multi-profile: DBus signals and frontend adaptation (first draft)
Goffi <goffi@goffi.org>
parents:
65
diff
changeset
|
411 self.dbus_bridge.presenceUpdate(entity, show, priority, statuses, profile) |
| 49 | 412 |
|
221
96186f36d8cb
bridge: fixed newAlert parameters order
Goffi <goffi@goffi.org>
parents:
182
diff
changeset
|
413 def subscribe(self, sub_type, entity, profile): |
|
96186f36d8cb
bridge: fixed newAlert parameters order
Goffi <goffi@goffi.org>
parents:
182
diff
changeset
|
414 self.dbus_bridge.subscribe(sub_type, entity, profile) |
| 0 | 415 |
| 49 | 416 def updatedValue(self, name, value): |
| 417 self.dbus_bridge.updatedValue(name, value) | |
| 418 | |
| 267 | 419 |
| 0 | 420 def register(self, name, callback): |
|
66
8147b4f40809
SàT: multi-profile: DBus signals and frontend adaptation (first draft)
Goffi <goffi@goffi.org>
parents:
65
diff
changeset
|
421 debug("registering DBus bridge method [%s]", name) |
| 0 | 422 self.dbus_bridge.register(name, callback) |
| 423 | |
|
300
233e6fce0b49
DBus bridge: using new generated bridge
Goffi <goffi@goffi.org>
parents:
298
diff
changeset
|
424 def addMethod(self, name, int_suffix, in_sign, out_sign, method, async=False, doc={}): |
|
7
c14a3a7018a5
added dynamic exportation of Dbus bridge method (usefull for plugins)
Goffi <goffi@goffi.org>
parents:
1
diff
changeset
|
425 """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
|
426 print ("Adding method [%s] to DBus bridge" % name) |
|
300
233e6fce0b49
DBus bridge: using new generated bridge
Goffi <goffi@goffi.org>
parents:
298
diff
changeset
|
427 self.dbus_bridge.addMethod(name, int_suffix, in_sign, out_sign, async, doc) |
|
7
c14a3a7018a5
added dynamic exportation of Dbus bridge method (usefull for plugins)
Goffi <goffi@goffi.org>
parents:
1
diff
changeset
|
428 self.register(name, method) |
|
c14a3a7018a5
added dynamic exportation of Dbus bridge method (usefull for plugins)
Goffi <goffi@goffi.org>
parents:
1
diff
changeset
|
429 |
|
298
15c8916317d0
dbus bridge: added doc parameter, unmanaged yet
Goffi <goffi@goffi.org>
parents:
284
diff
changeset
|
430 def addSignal(self, name, int_suffix, signature, doc={}): |
|
300
233e6fce0b49
DBus bridge: using new generated bridge
Goffi <goffi@goffi.org>
parents:
298
diff
changeset
|
431 self.dbus_bridge.addSignal(name, int_suffix, signature, doc) |
|
74
6e3a06b4dd36
plugin xep-0045: added roomUserJoined and roomUserLeft signals
Goffi <goffi@goffi.org>
parents:
73
diff
changeset
|
432 setattr(DBusBridge, name, getattr(self.dbus_bridge, name)) |