Mercurial > libervia-backend

comparison src/bridge/DBus.py @ 336:953536246d9d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
core: added email in registerNewAccount
author Goffi <goffi@goffi.org>
date Wed, 25 May 2011 17:18:05 +0200
parents 233e6fce0b49
children 4402ac630712
comparison
equal deleted inserted replaced
335:99206631503e 336:953536246d9d
43 ### signals ### 43 ### signals ###
44 44
45 @dbus.service.signal(const_INT_PREFIX+const_REQ_SUFFIX, 45 @dbus.service.signal(const_INT_PREFIX+const_REQ_SUFFIX,
46 signature='ssa{ss}') 46 signature='ssa{ss}')
47 def actionResult(self, answer_type, id, data): 47 def actionResult(self, answer_type, id, data):
48 debug ("actionResult") 48 pass
49 49
50 @dbus.service.signal(const_INT_PREFIX+const_REQ_SUFFIX, 50 @dbus.service.signal(const_INT_PREFIX+const_REQ_SUFFIX,
51 signature='ssa{sa{ss}}') 51 signature='ssa{sa{ss}}')
52 def actionResultExt(self, answer_type, id, data): 52 def actionResultExt(self, answer_type, id, data):
53 debug ("actionResultExt") 53 pass
54 54
55 @dbus.service.signal(const_INT_PREFIX+const_REQ_SUFFIX, 55 @dbus.service.signal(const_INT_PREFIX+const_REQ_SUFFIX,
56 signature='ssa{ss}') 56 signature='ssa{ss}')
57 def askConfirmation(self, conf_type, id, data): 57 def askConfirmation(self, conf_type, id, data):
58 debug ("askConfirmation") 58 pass
59 59
60 @dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX, 60 @dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX,
61 signature='s') 61 signature='s')
62 def connected(self, profile): 62 def connected(self, profile):
63 debug ("connected") 63 pass
64 64
65 @dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX, 65 @dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX,
66 signature='ss') 66 signature='ss')
67 def connectionError(self, error_type, profile): 67 def connectionError(self, error_type, profile):
68 debug ("connectionError") 68 pass
69 69
70 @dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX, 70 @dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX,
71 signature='ss') 71 signature='ss')
72 def contactDeleted(self, entity, profile): 72 def contactDeleted(self, entity, profile):
73 debug ("contactDeleted") 73 pass
74 74
75 @dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX, 75 @dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX,
76 signature='s') 76 signature='s')
77 def disconnected(self, profile): 77 def disconnected(self, profile):
78 debug ("disconnected") 78 pass
79 79
80 @dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX, 80 @dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX,
81 signature='ssss') 81 signature='ssss')
82 def newAlert(self, message, title, alert_type, profile): 82 def newAlert(self, message, title, alert_type, profile):
83 debug ("newAlert") 83 pass
84 84
85 @dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX, 85 @dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX,
86 signature='sa{ss}ass') 86 signature='sa{ss}ass')
87 def newContact(self, contact, attributes, groups, profile): 87 def newContact(self, contact, attributes, groups, profile):
88 debug ("newContact") 88 pass
89 89
90 @dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX, 90 @dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX,
91 signature='sssss') 91 signature='sssss')
92 def newMessage(self, from_jid, message, mess_type, to_jid, profile): 92 def newMessage(self, from_jid, message, mess_type, to_jid, profile):
93 debug ("newMessage") 93 pass
94 94
95 @dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX, 95 @dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX,
96 signature='ssss') 96 signature='ssss')
97 def paramUpdate(self, name, value, category, profile): 97 def paramUpdate(self, name, value, category, profile):
98 debug ("paramUpdate") 98 pass
99 99
100 @dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX, 100 @dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX,
101 signature='ssia{ss}s') 101 signature='ssia{ss}s')
102 def presenceUpdate(self, entity, show, priority, statuses, profile): 102 def presenceUpdate(self, entity, show, priority, statuses, profile):
103 debug ("presenceUpdate") 103 pass
104 104
105 @dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX, 105 @dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX,
106 signature='sss') 106 signature='sss')
107 def subscribe(self, sub_type, entity, profile): 107 def subscribe(self, sub_type, entity, profile):
108 debug ("subscribe") 108 pass
109 109
110 @dbus.service.signal(const_INT_PREFIX+const_REQ_SUFFIX, 110 @dbus.service.signal(const_INT_PREFIX+const_REQ_SUFFIX,
111 signature='sa{ss}') 111 signature='sa{ss}')
112 def updatedValue(self, name, value): 112 def updatedValue(self, name, value):
113 debug ("updatedValue") 113 pass
114 114
115 115
116 ### methods ### 116 ### methods ###
117 117
118 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX, 118 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
119 in_signature='ss', out_signature='') 119 in_signature='ss', out_signature='')
120 def addContact(self, entity, profile_key="@DEFAULT@"): 120 def addContact(self, entity, profile_key="@DEFAULT@"):
121 debug ("addContact")
122 return self.cb["addContact"](unicode(entity), unicode(profile_key)) 121 return self.cb["addContact"](unicode(entity), unicode(profile_key))
123 122
124 @dbus.service.method(const_INT_PREFIX+const_REQ_SUFFIX, 123 @dbus.service.method(const_INT_PREFIX+const_REQ_SUFFIX,
125 in_signature='ssss', out_signature='s') 124 in_signature='ssss', out_signature='s')
126 def callMenu(self, category, name, menu_type, profile_key): 125 def callMenu(self, category, name, menu_type, profile_key):
127 debug ("callMenu")
128 return self.cb["callMenu"](unicode(category), unicode(name), unicode(menu_type), unicode(profile_key)) 126 return self.cb["callMenu"](unicode(category), unicode(name), unicode(menu_type), unicode(profile_key))
129 127
130 @dbus.service.method(const_INT_PREFIX+const_REQ_SUFFIX, 128 @dbus.service.method(const_INT_PREFIX+const_REQ_SUFFIX,
131 in_signature='sba{ss}', out_signature='') 129 in_signature='sba{ss}', out_signature='')
132 def confirmationAnswer(self, id, accepted, data): 130 def confirmationAnswer(self, id, accepted, data):
133 debug ("confirmationAnswer")
134 return self.cb["confirmationAnswer"](unicode(id), accepted, data) 131 return self.cb["confirmationAnswer"](unicode(id), accepted, data)
135 132
136 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX, 133 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
137 in_signature='s', out_signature='') 134 in_signature='s', out_signature='')
138 def connect(self, profile_key="@DEFAULT@"): 135 def connect(self, profile_key="@DEFAULT@"):
139 debug ("connect")
140 return self.cb["connect"](unicode(profile_key)) 136 return self.cb["connect"](unicode(profile_key))
141 137
142 @dbus.service.method(const_INT_PREFIX+const_REQ_SUFFIX, 138 @dbus.service.method(const_INT_PREFIX+const_REQ_SUFFIX,
143 in_signature='s', out_signature='i') 139 in_signature='s', out_signature='i')
144 def createProfile(self, profile): 140 def createProfile(self, profile):
145 debug ("createProfile")
146 return self.cb["createProfile"](unicode(profile)) 141 return self.cb["createProfile"](unicode(profile))
147 142
148 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX, 143 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
149 in_signature='ss', out_signature='') 144 in_signature='ss', out_signature='')
150 def delContact(self, entity, profile_key="@DEFAULT@"): 145 def delContact(self, entity, profile_key="@DEFAULT@"):
151 debug ("delContact")
152 return self.cb["delContact"](unicode(entity), unicode(profile_key)) 146 return self.cb["delContact"](unicode(entity), unicode(profile_key))
153 147
154 @dbus.service.method(const_INT_PREFIX+const_REQ_SUFFIX, 148 @dbus.service.method(const_INT_PREFIX+const_REQ_SUFFIX,
155 in_signature='s', out_signature='i') 149 in_signature='s', out_signature='i')
156 def deleteProfile(self, profile): 150 def deleteProfile(self, profile):
157 debug ("deleteProfile")
158 return self.cb["deleteProfile"](unicode(profile)) 151 return self.cb["deleteProfile"](unicode(profile))
159 152
160 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX, 153 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
161 in_signature='s', out_signature='') 154 in_signature='s', out_signature='')
162 def disconnect(self, profile_key="@DEFAULT@"): 155 def disconnect(self, profile_key="@DEFAULT@"):
163 debug ("disconnect")
164 return self.cb["disconnect"](unicode(profile_key)) 156 return self.cb["disconnect"](unicode(profile_key))
165 157
166 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX, 158 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
167 in_signature='s', out_signature='a(sa{ss}as)') 159 in_signature='s', out_signature='a(sa{ss}as)')
168 def getContacts(self, profile_key="@DEFAULT@"): 160 def getContacts(self, profile_key="@DEFAULT@"):
169 debug ("getContacts")
170 return self.cb["getContacts"](unicode(profile_key)) 161 return self.cb["getContacts"](unicode(profile_key))
171 162
172 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX, 163 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
173 in_signature='ssi', out_signature='a{i(ss)}') 164 in_signature='ssi', out_signature='a{i(ss)}')
174 def getHistory(self, from_jid, to_jid, size): 165 def getHistory(self, from_jid, to_jid, size):
175 debug ("getHistory")
176 return self.cb["getHistory"](unicode(from_jid), unicode(to_jid), size) 166 return self.cb["getHistory"](unicode(from_jid), unicode(to_jid), size)
177 167
178 @dbus.service.method(const_INT_PREFIX+const_REQ_SUFFIX, 168 @dbus.service.method(const_INT_PREFIX+const_REQ_SUFFIX,
179 in_signature='sss', out_signature='s') 169 in_signature='sss', out_signature='s')
180 def getMenuHelp(self, category, name, menu_type): 170 def getMenuHelp(self, category, name, menu_type):
181 debug ("getMenuHelp")
182 return self.cb["getMenuHelp"](unicode(category), unicode(name), unicode(menu_type)) 171 return self.cb["getMenuHelp"](unicode(category), unicode(name), unicode(menu_type))
183 172
184 @dbus.service.method(const_INT_PREFIX+const_REQ_SUFFIX, 173 @dbus.service.method(const_INT_PREFIX+const_REQ_SUFFIX,
185 in_signature='', out_signature='a(sss)') 174 in_signature='', out_signature='a(sss)')
186 def getMenus(self, ): 175 def getMenus(self, ):
187 debug ("getMenus")
188 return self.cb["getMenus"]() 176 return self.cb["getMenus"]()
189 177
190 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX, 178 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
191 in_signature='ssss', out_signature='s') 179 in_signature='ssss', out_signature='s')
192 def getParamA(self, name, category, attribute="value", profile_key="@DEFAULT@"): 180 def getParamA(self, name, category, attribute="value", profile_key="@DEFAULT@"):
193 debug ("getParamA")
194 return self.cb["getParamA"](unicode(name), unicode(category), unicode(attribute), unicode(profile_key)) 181 return self.cb["getParamA"](unicode(name), unicode(category), unicode(attribute), unicode(profile_key))
195 182
196 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX, 183 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
197 in_signature='s', out_signature='s') 184 in_signature='s', out_signature='s')
198 def getParams(self, profile_key="@DEFAULT@"): 185 def getParams(self, profile_key="@DEFAULT@"):
199 debug ("getParams")
200 return self.cb["getParams"](unicode(profile_key)) 186 return self.cb["getParams"](unicode(profile_key))
201 187
202 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX, 188 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
203 in_signature='', out_signature='as') 189 in_signature='', out_signature='as')
204 def getParamsCategories(self, ): 190 def getParamsCategories(self, ):
205 debug ("getParamsCategories")
206 return self.cb["getParamsCategories"]() 191 return self.cb["getParamsCategories"]()
207 192
208 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX, 193 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
209 in_signature='ss', out_signature='s') 194 in_signature='ss', out_signature='s')
210 def getParamsForCategory(self, category, profile_key="@DEFAULT@"): 195 def getParamsForCategory(self, category, profile_key="@DEFAULT@"):
211 debug ("getParamsForCategory")
212 return self.cb["getParamsForCategory"](unicode(category), unicode(profile_key)) 196 return self.cb["getParamsForCategory"](unicode(category), unicode(profile_key))
213 197
214 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX, 198 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
215 in_signature='s', out_signature='s') 199 in_signature='s', out_signature='s')
216 def getParamsUI(self, profile_key="@DEFAULT@"): 200 def getParamsUI(self, profile_key="@DEFAULT@"):
217 debug ("getParamsUI")
218 return self.cb["getParamsUI"](unicode(profile_key)) 201 return self.cb["getParamsUI"](unicode(profile_key))
219 202
220 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX, 203 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
221 in_signature='s', out_signature='a{sa{s(sia{ss})}}') 204 in_signature='s', out_signature='a{sa{s(sia{ss})}}')
222 def getPresenceStatus(self, profile_key="@DEFAULT@"): 205 def getPresenceStatus(self, profile_key="@DEFAULT@"):
223 debug ("getPresenceStatus")
224 return self.cb["getPresenceStatus"](unicode(profile_key)) 206 return self.cb["getPresenceStatus"](unicode(profile_key))
225 207
226 @dbus.service.method(const_INT_PREFIX+const_REQ_SUFFIX, 208 @dbus.service.method(const_INT_PREFIX+const_REQ_SUFFIX,
227 in_signature='s', out_signature='s') 209 in_signature='s', out_signature='s')
228 def getProfileName(self, profile_key="@DEFAULT@"): 210 def getProfileName(self, profile_key="@DEFAULT@"):
229 debug ("getProfileName")
230 return self.cb["getProfileName"](unicode(profile_key)) 211 return self.cb["getProfileName"](unicode(profile_key))
231 212
232 @dbus.service.method(const_INT_PREFIX+const_REQ_SUFFIX, 213 @dbus.service.method(const_INT_PREFIX+const_REQ_SUFFIX,
233 in_signature='', out_signature='as') 214 in_signature='', out_signature='as')
234 def getProfilesList(self, ): 215 def getProfilesList(self, ):
235 debug ("getProfilesList")
236 return self.cb["getProfilesList"]() 216 return self.cb["getProfilesList"]()
237 217
238 @dbus.service.method(const_INT_PREFIX+const_REQ_SUFFIX, 218 @dbus.service.method(const_INT_PREFIX+const_REQ_SUFFIX,
239 in_signature='s', out_signature='a{ss}') 219 in_signature='s', out_signature='a{ss}')
240 def getProgress(self, id): 220 def getProgress(self, id):
241 debug ("getProgress")
242 return self.cb["getProgress"](unicode(id)) 221 return self.cb["getProgress"](unicode(id))
243 222
244 @dbus.service.method(const_INT_PREFIX+const_REQ_SUFFIX, 223 @dbus.service.method(const_INT_PREFIX+const_REQ_SUFFIX,
245 in_signature='', out_signature='s') 224 in_signature='', out_signature='s')
246 def getVersion(self, ): 225 def getVersion(self, ):
247 debug ("getVersion")
248 return self.cb["getVersion"]() 226 return self.cb["getVersion"]()
249 227
250 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX, 228 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
251 in_signature='s', out_signature='a{ss}') 229 in_signature='s', out_signature='a{ss}')
252 def getWaitingSub(self, profile_key="@DEFAULT@"): 230 def getWaitingSub(self, profile_key="@DEFAULT@"):
253 debug ("getWaitingSub")
254 return self.cb["getWaitingSub"](unicode(profile_key)) 231 return self.cb["getWaitingSub"](unicode(profile_key))
255 232
256 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX, 233 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
257 in_signature='s', out_signature='b') 234 in_signature='s', out_signature='b')
258 def isConnected(self, profile_key="@DEFAULT@"): 235 def isConnected(self, profile_key="@DEFAULT@"):
259 debug ("isConnected")
260 return self.cb["isConnected"](unicode(profile_key)) 236 return self.cb["isConnected"](unicode(profile_key))
261 237
262 @dbus.service.method(const_INT_PREFIX+const_REQ_SUFFIX, 238 @dbus.service.method(const_INT_PREFIX+const_REQ_SUFFIX,
263 in_signature='sa{ss}s', out_signature='s') 239 in_signature='sa{ss}s', out_signature='s')
264 def launchAction(self, action_type, data, profile_key="@DEFAULT@"): 240 def launchAction(self, action_type, data, profile_key="@DEFAULT@"):
265 debug ("launchAction")
266 return self.cb["launchAction"](unicode(action_type), data, unicode(profile_key)) 241 return self.cb["launchAction"](unicode(action_type), data, unicode(profile_key))
267 242
268 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX, 243 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
269 in_signature='sssi', out_signature='s') 244 in_signature='ssssi', out_signature='s')
270 def registerNewAccount(self, login, password, host, port=5222): 245 def registerNewAccount(self, login, password, email, host, port=5222):
271 debug ("registerNewAccount") 246 return self.cb["registerNewAccount"](unicode(login), unicode(password), unicode(email), unicode(host), port)
272 return self.cb["registerNewAccount"](unicode(login), unicode(password), unicode(host), port)
273 247
274 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX, 248 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
275 in_signature='sssss', out_signature='') 249 in_signature='sssss', out_signature='')
276 def sendMessage(self, to_jid, message, subject='', mess_type="chat", profile_key="@DEFAULT@"): 250 def sendMessage(self, to_jid, message, subject='', mess_type="chat", profile_key="@DEFAULT@"):
277 debug ("sendMessage")
278 return self.cb["sendMessage"](unicode(to_jid), unicode(message), unicode(subject), unicode(mess_type), unicode(profile_key)) 251 return self.cb["sendMessage"](unicode(to_jid), unicode(message), unicode(subject), unicode(mess_type), unicode(profile_key))
279 252
280 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX, 253 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
281 in_signature='ssss', out_signature='') 254 in_signature='ssss', out_signature='')
282 def setParam(self, name, value, category, profile_key="@DEFAULT@"): 255 def setParam(self, name, value, category, profile_key="@DEFAULT@"):
283 debug ("setParam")
284 return self.cb["setParam"](unicode(name), unicode(value), unicode(category), unicode(profile_key)) 256 return self.cb["setParam"](unicode(name), unicode(value), unicode(category), unicode(profile_key))
285 257
286 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX, 258 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
287 in_signature='ssia{ss}s', out_signature='') 259 in_signature='ssia{ss}s', out_signature='')
288 def setPresence(self, to_jid='', show='', priority=0, statuses={}, profile_key="@DEFAULT@"): 260 def setPresence(self, to_jid='', show='', priority=0, statuses={}, profile_key="@DEFAULT@"):
289 debug ("setPresence")
290 return self.cb["setPresence"](unicode(to_jid), unicode(show), priority, statuses, unicode(profile_key)) 261 return self.cb["setPresence"](unicode(to_jid), unicode(show), priority, statuses, unicode(profile_key))
291 262
292 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX, 263 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
293 in_signature='sss', out_signature='') 264 in_signature='sss', out_signature='')
294 def subscription(self, sub_type, entity, profile_key="@DEFAULT@"): 265 def subscription(self, sub_type, entity, profile_key="@DEFAULT@"):
295 debug ("subscription")
296 return self.cb["subscription"](unicode(sub_type), unicode(entity), unicode(profile_key)) 266 return self.cb["subscription"](unicode(sub_type), unicode(entity), unicode(profile_key))
297 267
298 268
299 def __attributes(self, in_sign): 269 def __attributes(self, in_sign):
300 """Return arguments to user given a in_sign 270 """Return arguments to user given a in_sign