annotate libervia.tac @ 165:9763dec220ed

dates update
author Goffi <goffi@goffi.org>
date Mon, 07 Jan 2013 23:38:36 +0100
parents d3437b3c88bd
children 631556a64850
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
1 #!/usr/bin/python
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
2 # -*- coding: utf-8 -*-
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
3
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
4 """
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
5 Libervia: a Salut à Toi frontend
165
9763dec220ed dates update
Goffi <goffi@goffi.org>
parents: 164
diff changeset
6 Copyright (C) 2011, 2012, 2013 Jérôme Poisson <goffi@goffi.org>
0
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
7
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
8 This program is free software: you can redistribute it and/or modify
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
9 it under the terms of the GNU Affero General Public License as published by
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
10 the Free Software Foundation, either version 3 of the License, or
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
11 (at your option) any later version.
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
12
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
13 This program is distributed in the hope that it will be useful,
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
14 but WITHOUT ANY WARRANTY; without even the implied warranty of
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
16 GNU Affero General Public License for more details.
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
17
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
18 You should have received a copy of the GNU Affero General Public License
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
19 along with this program. If not, see <http://www.gnu.org/licenses/>.
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
20 """
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
21
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
22 from twisted.application import internet, service
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
23 from twisted.internet import glib2reactor
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
24 glib2reactor.install()
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
25 from twisted.internet import reactor, defer
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
26 from twisted.web import server
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
27 from twisted.web import error as weberror
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
28 from twisted.web.static import File
61
80c490e6a1a7 server side: misc stuff:
Goffi <goffi@goffi.org>
parents: 59
diff changeset
29 from twisted.web.resource import Resource, NoResource
44
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
30 from twisted.python.components import registerAdapter
10
c28a4840e1a8 server: microblog resource
Goffi <goffi@goffi.org>
parents: 3
diff changeset
31 from twisted.words.protocols.jabber.jid import JID
0
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
32 from txjsonrpc.web import jsonrpc
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
33 from txjsonrpc import jsonrpclib
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
34 from sat_frontends.bridge.DBus import DBusBridgeFrontend,BridgeExceptionNoService
46
c3ee630914ba Account creation
Goffi <goffi@goffi.org>
parents: 45
diff changeset
35 from logging import debug, info, warning, error
127
e19a8de8b3de radio collective first draft
Goffi <goffi@goffi.org>
parents: 125
diff changeset
36 import re, glob
e19a8de8b3de radio collective first draft
Goffi <goffi@goffi.org>
parents: 125
diff changeset
37 import os.path, sys
e19a8de8b3de radio collective first draft
Goffi <goffi@goffi.org>
parents: 125
diff changeset
38 import tempfile, shutil, uuid
10
c28a4840e1a8 server: microblog resource
Goffi <goffi@goffi.org>
parents: 3
diff changeset
39 from server_side.blog import MicroBlog
44
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
40 from zope.interface import Interface, Attribute, implements
151
a159cc29b556 server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents: 148
diff changeset
41 #import time
10
c28a4840e1a8 server: microblog resource
Goffi <goffi@goffi.org>
parents: 3
diff changeset
42
154
82043fe5be4d server_side: set timeout to 300 s
Goffi <goffi@goffi.org>
parents: 153
diff changeset
43 TIMEOUT = 300 #Session's time out, after that the user will be disconnected
36
1d406077b49b Tarot Game: first draft
Goffi <goffi@goffi.org>
parents: 35
diff changeset
44 LIBERVIA_DIR = "output/"
77
975e6be24e11 media paths update
Goffi <goffi@goffi.org>
parents: 67
diff changeset
45 MEDIA_DIR = "media/"
110
dfc02690deb4 browser side: CSS: header, unibox, tabs + drag'n' drop reworked
Adrien Vigneron <adrienvigneron@mailoo.org>
parents: 107
diff changeset
46 AVATARS_DIR = "avatars/"
77
975e6be24e11 media paths update
Goffi <goffi@goffi.org>
parents: 67
diff changeset
47 CARDS_DIR = "games/cards/tarot"
0
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
48
44
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
49 class ISATSession(Interface):
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
50 profile = Attribute("Sat profile")
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
51 jid = Attribute("JID associated with the profile")
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
52
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
53 class SATSession(object):
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
54 implements(ISATSession)
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
55 def __init__(self, session):
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
56 self.profile = None
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
57 self.jid = None
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
58
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
59 class LiberviaSession(server.Session):
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
60 sessionTimeout = TIMEOUT
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
61
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
62 def __init__(self, *args, **kwargs):
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
63 self.__lock = False
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
64 server.Session.__init__(self, *args, **kwargs)
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
65
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
66 def lock(self):
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
67 """Prevent session from expiring"""
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
68 self.__lock = True
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
69 self._expireCall.reset(sys.maxint)
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
70
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
71 def unlock(self):
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
72 """Allow session to expire again, and touch it"""
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
73 self.__lock = False
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
74 self.touch()
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
75
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
76 def touch(self):
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
77 if not self.__lock:
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
78 server.Session.touch(self)
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
79
59
d0fa4e96a5e4 server side: 404 error is now sent instead of directory listing when requesting a directory
Goffi <goffi@goffi.org>
parents: 57
diff changeset
80 class ProtectedFile(File):
d0fa4e96a5e4 server side: 404 error is now sent instead of directory listing when requesting a directory
Goffi <goffi@goffi.org>
parents: 57
diff changeset
81 """A File class which doens't show directory listing"""
d0fa4e96a5e4 server side: 404 error is now sent instead of directory listing when requesting a directory
Goffi <goffi@goffi.org>
parents: 57
diff changeset
82
d0fa4e96a5e4 server side: 404 error is now sent instead of directory listing when requesting a directory
Goffi <goffi@goffi.org>
parents: 57
diff changeset
83 def directoryListing(self):
d0fa4e96a5e4 server side: 404 error is now sent instead of directory listing when requesting a directory
Goffi <goffi@goffi.org>
parents: 57
diff changeset
84 return NoResource()
d0fa4e96a5e4 server side: 404 error is now sent instead of directory listing when requesting a directory
Goffi <goffi@goffi.org>
parents: 57
diff changeset
85
46
c3ee630914ba Account creation
Goffi <goffi@goffi.org>
parents: 45
diff changeset
86 class SATActionIDHandler(object):
140
09a512d9a0c0 server side: fixed getHistory call and action result management
Goffi <goffi@goffi.org>
parents: 137
diff changeset
87 """Manage SàT action action_id lifecycle"""
09a512d9a0c0 server side: fixed getHistory call and action result management
Goffi <goffi@goffi.org>
parents: 137
diff changeset
88 ID_LIFETIME = 30 #after this time (in seconds), action_id will be suppressed and action result will be ignored
46
c3ee630914ba Account creation
Goffi <goffi@goffi.org>
parents: 45
diff changeset
89
c3ee630914ba Account creation
Goffi <goffi@goffi.org>
parents: 45
diff changeset
90 def __init__(self):
c3ee630914ba Account creation
Goffi <goffi@goffi.org>
parents: 45
diff changeset
91 self.waiting_ids = {}
c3ee630914ba Account creation
Goffi <goffi@goffi.org>
parents: 45
diff changeset
92
140
09a512d9a0c0 server side: fixed getHistory call and action result management
Goffi <goffi@goffi.org>
parents: 137
diff changeset
93 def waitForId(self, callback, action_id, profile, *args, **kwargs):
46
c3ee630914ba Account creation
Goffi <goffi@goffi.org>
parents: 45
diff changeset
94 """Wait for an action result
c3ee630914ba Account creation
Goffi <goffi@goffi.org>
parents: 45
diff changeset
95 @param callback: method to call when action gave a result back
140
09a512d9a0c0 server side: fixed getHistory call and action result management
Goffi <goffi@goffi.org>
parents: 137
diff changeset
96 @param action_id: action_id to wait for
09a512d9a0c0 server side: fixed getHistory call and action result management
Goffi <goffi@goffi.org>
parents: 137
diff changeset
97 @param profile: %(doc_profile)s
46
c3ee630914ba Account creation
Goffi <goffi@goffi.org>
parents: 45
diff changeset
98 @param *args: additional argument to pass to callback
c3ee630914ba Account creation
Goffi <goffi@goffi.org>
parents: 45
diff changeset
99 @param **kwargs: idem"""
140
09a512d9a0c0 server side: fixed getHistory call and action result management
Goffi <goffi@goffi.org>
parents: 137
diff changeset
100 action_tuple = (action_id, profile)
09a512d9a0c0 server side: fixed getHistory call and action result management
Goffi <goffi@goffi.org>
parents: 137
diff changeset
101 self.waiting_ids[action_tuple] = (callback, args, kwargs)
09a512d9a0c0 server side: fixed getHistory call and action result management
Goffi <goffi@goffi.org>
parents: 137
diff changeset
102 reactor.callLater(self.ID_LIFETIME, self.purgeID, action_tuple)
46
c3ee630914ba Account creation
Goffi <goffi@goffi.org>
parents: 45
diff changeset
103
140
09a512d9a0c0 server side: fixed getHistory call and action result management
Goffi <goffi@goffi.org>
parents: 137
diff changeset
104 def purgeID(self, action_tuple):
09a512d9a0c0 server side: fixed getHistory call and action result management
Goffi <goffi@goffi.org>
parents: 137
diff changeset
105 """Called when an action_id has not be handled in time"""
09a512d9a0c0 server side: fixed getHistory call and action result management
Goffi <goffi@goffi.org>
parents: 137
diff changeset
106 if action_tuple in self.waiting_ids:
09a512d9a0c0 server side: fixed getHistory call and action result management
Goffi <goffi@goffi.org>
parents: 137
diff changeset
107 warning ("action of action_id %s [%s] has not been managed, action_id is now ignored" % action_tuple)
09a512d9a0c0 server side: fixed getHistory call and action result management
Goffi <goffi@goffi.org>
parents: 137
diff changeset
108 del self.waiting_ids[action_tuple]
46
c3ee630914ba Account creation
Goffi <goffi@goffi.org>
parents: 45
diff changeset
109
140
09a512d9a0c0 server side: fixed getHistory call and action result management
Goffi <goffi@goffi.org>
parents: 137
diff changeset
110 def actionResultCb(self, answer_type, action_id, data, profile):
46
c3ee630914ba Account creation
Goffi <goffi@goffi.org>
parents: 45
diff changeset
111 """Manage the actionResult signal"""
140
09a512d9a0c0 server side: fixed getHistory call and action result management
Goffi <goffi@goffi.org>
parents: 137
diff changeset
112 action_tuple = (action_id, profile)
09a512d9a0c0 server side: fixed getHistory call and action result management
Goffi <goffi@goffi.org>
parents: 137
diff changeset
113 if action_tuple in self.waiting_ids:
09a512d9a0c0 server side: fixed getHistory call and action result management
Goffi <goffi@goffi.org>
parents: 137
diff changeset
114 callback, args, kwargs = self.waiting_ids[action_tuple]
09a512d9a0c0 server side: fixed getHistory call and action result management
Goffi <goffi@goffi.org>
parents: 137
diff changeset
115 del self.waiting_ids[action_tuple]
09a512d9a0c0 server side: fixed getHistory call and action result management
Goffi <goffi@goffi.org>
parents: 137
diff changeset
116 callback(answer_type, action_id, data, *args, **kwargs)
44
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
117
0
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
118 class MethodHandler(jsonrpc.JSONRPC):
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
119
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
120 def __init__(self, sat_host):
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
121 jsonrpc.JSONRPC.__init__(self)
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
122 self.sat_host=sat_host
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
123
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
124 def render(self, request):
1
0a7c685faa53 ContactPanel: first draft
Goffi <goffi@goffi.org>
parents: 0
diff changeset
125 self.session = request.getSession()
44
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
126 profile = ISATSession(self.session).profile
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
127 if not profile:
0
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
128 #user is not identified, we return a jsonrpc fault
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
129 parsed = jsonrpclib.loads(request.content.read())
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
130 fault = jsonrpclib.Fault(0, "Not allowed") #FIXME: define some standard error codes for libervia
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
131 return jsonrpc.JSONRPC._cbRender(self, fault, request, parsed.get('id'), parsed.get('jsonrpc'))
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
132 return jsonrpc.JSONRPC.render(self, request)
19
e8e3704eb97f Added basic chat panel
Goffi <goffi@goffi.org>
parents: 14
diff changeset
133
e8e3704eb97f Added basic chat panel
Goffi <goffi@goffi.org>
parents: 14
diff changeset
134 def jsonrpc_getProfileJid(self):
e8e3704eb97f Added basic chat panel
Goffi <goffi@goffi.org>
parents: 14
diff changeset
135 """Return the jid of the profile"""
44
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
136 sat_session = ISATSession(self.session)
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
137 profile = sat_session.profile
61
80c490e6a1a7 server side: misc stuff:
Goffi <goffi@goffi.org>
parents: 59
diff changeset
138 sat_session.jid = JID(self.sat_host.bridge.getParamA("JabberID", "Connection", profile_key=profile))
80c490e6a1a7 server side: misc stuff:
Goffi <goffi@goffi.org>
parents: 59
diff changeset
139 return sat_session.jid.full()
0
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
140
156
46835a4e2551 server side: disconnection
Goffi <goffi@goffi.org>
parents: 155
diff changeset
141 def jsonrpc_disconnect(self):
46835a4e2551 server side: disconnection
Goffi <goffi@goffi.org>
parents: 155
diff changeset
142 """Disconnect the profile"""
46835a4e2551 server side: disconnection
Goffi <goffi@goffi.org>
parents: 155
diff changeset
143 sat_session = ISATSession(self.session)
46835a4e2551 server side: disconnection
Goffi <goffi@goffi.org>
parents: 155
diff changeset
144 profile = sat_session.profile
46835a4e2551 server side: disconnection
Goffi <goffi@goffi.org>
parents: 155
diff changeset
145 self.sat_host.bridge.disconnect(profile)
46835a4e2551 server side: disconnection
Goffi <goffi@goffi.org>
parents: 155
diff changeset
146
0
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
147 def jsonrpc_getContacts(self):
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
148 """Return all passed args."""
44
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
149 profile = ISATSession(self.session).profile
1
0a7c685faa53 ContactPanel: first draft
Goffi <goffi@goffi.org>
parents: 0
diff changeset
150 return self.sat_host.bridge.getContacts(profile)
20
8f4b1a8914c3 - User status is now updated
Goffi <goffi@goffi.org>
parents: 19
diff changeset
151
54
f25c4077f6b9 addind contact + subscription management + misc
Goffi <goffi@goffi.org>
parents: 50
diff changeset
152 def jsonrpc_addContact(self, entity, name, groups):
f25c4077f6b9 addind contact + subscription management + misc
Goffi <goffi@goffi.org>
parents: 50
diff changeset
153 """Subscribe to contact presence, and add it to the given groups"""
f25c4077f6b9 addind contact + subscription management + misc
Goffi <goffi@goffi.org>
parents: 50
diff changeset
154 profile = ISATSession(self.session).profile
f25c4077f6b9 addind contact + subscription management + misc
Goffi <goffi@goffi.org>
parents: 50
diff changeset
155 self.sat_host.bridge.addContact(entity, profile)
f25c4077f6b9 addind contact + subscription management + misc
Goffi <goffi@goffi.org>
parents: 50
diff changeset
156 self.sat_host.bridge.updateContact(entity, name, groups, profile)
f25c4077f6b9 addind contact + subscription management + misc
Goffi <goffi@goffi.org>
parents: 50
diff changeset
157
55
d5266c41ca24 Roster list update, contact deletion + some refactoring
Goffi <goffi@goffi.org>
parents: 54
diff changeset
158 def jsonrpc_delContact(self, entity):
d5266c41ca24 Roster list update, contact deletion + some refactoring
Goffi <goffi@goffi.org>
parents: 54
diff changeset
159 """Remove contact from contacts list"""
d5266c41ca24 Roster list update, contact deletion + some refactoring
Goffi <goffi@goffi.org>
parents: 54
diff changeset
160 profile = ISATSession(self.session).profile
d5266c41ca24 Roster list update, contact deletion + some refactoring
Goffi <goffi@goffi.org>
parents: 54
diff changeset
161 self.sat_host.bridge.delContact(entity, profile)
d5266c41ca24 Roster list update, contact deletion + some refactoring
Goffi <goffi@goffi.org>
parents: 54
diff changeset
162
57
e552a67b933d Contact update + add dedication in About dialog
Goffi <goffi@goffi.org>
parents: 55
diff changeset
163 def jsonrpc_updateContact(self, entity, name, groups):
e552a67b933d Contact update + add dedication in About dialog
Goffi <goffi@goffi.org>
parents: 55
diff changeset
164 """Update contact's roster item"""
e552a67b933d Contact update + add dedication in About dialog
Goffi <goffi@goffi.org>
parents: 55
diff changeset
165 profile = ISATSession(self.session).profile
e552a67b933d Contact update + add dedication in About dialog
Goffi <goffi@goffi.org>
parents: 55
diff changeset
166 self.sat_host.bridge.updateContact(entity, name, groups, profile)
e552a67b933d Contact update + add dedication in About dialog
Goffi <goffi@goffi.org>
parents: 55
diff changeset
167
54
f25c4077f6b9 addind contact + subscription management + misc
Goffi <goffi@goffi.org>
parents: 50
diff changeset
168 def jsonrpc_subscription(self, sub_type, entity, name, groups):
f25c4077f6b9 addind contact + subscription management + misc
Goffi <goffi@goffi.org>
parents: 50
diff changeset
169 """Confirm (or infirm) subscription,
f25c4077f6b9 addind contact + subscription management + misc
Goffi <goffi@goffi.org>
parents: 50
diff changeset
170 and setup user roster in case of subscription"""
f25c4077f6b9 addind contact + subscription management + misc
Goffi <goffi@goffi.org>
parents: 50
diff changeset
171 profile = ISATSession(self.session).profile
f25c4077f6b9 addind contact + subscription management + misc
Goffi <goffi@goffi.org>
parents: 50
diff changeset
172 self.sat_host.bridge.subscription(sub_type, entity, profile)
f25c4077f6b9 addind contact + subscription management + misc
Goffi <goffi@goffi.org>
parents: 50
diff changeset
173 if sub_type == 'subscribed':
f25c4077f6b9 addind contact + subscription management + misc
Goffi <goffi@goffi.org>
parents: 50
diff changeset
174 self.sat_host.bridge.updateContact(entity, name, groups, profile)
f25c4077f6b9 addind contact + subscription management + misc
Goffi <goffi@goffi.org>
parents: 50
diff changeset
175
f25c4077f6b9 addind contact + subscription management + misc
Goffi <goffi@goffi.org>
parents: 50
diff changeset
176 def jsonrpc_getWaitingSub(self):
f25c4077f6b9 addind contact + subscription management + misc
Goffi <goffi@goffi.org>
parents: 50
diff changeset
177 """Return list of room already joined by user"""
f25c4077f6b9 addind contact + subscription management + misc
Goffi <goffi@goffi.org>
parents: 50
diff changeset
178 profile = ISATSession(self.session).profile
f25c4077f6b9 addind contact + subscription management + misc
Goffi <goffi@goffi.org>
parents: 50
diff changeset
179 return self.sat_host.bridge.getWaitingSub(profile)
f25c4077f6b9 addind contact + subscription management + misc
Goffi <goffi@goffi.org>
parents: 50
diff changeset
180
20
8f4b1a8914c3 - User status is now updated
Goffi <goffi@goffi.org>
parents: 19
diff changeset
181 def jsonrpc_setStatus(self, status):
8f4b1a8914c3 - User status is now updated
Goffi <goffi@goffi.org>
parents: 19
diff changeset
182 """Change the status"""
44
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
183 profile = ISATSession(self.session).profile
20
8f4b1a8914c3 - User status is now updated
Goffi <goffi@goffi.org>
parents: 19
diff changeset
184 self.sat_host.bridge.setPresence('', '', 0, {'':status}, profile)
8f4b1a8914c3 - User status is now updated
Goffi <goffi@goffi.org>
parents: 19
diff changeset
185
19
e8e3704eb97f Added basic chat panel
Goffi <goffi@goffi.org>
parents: 14
diff changeset
186
e8e3704eb97f Added basic chat panel
Goffi <goffi@goffi.org>
parents: 14
diff changeset
187 def jsonrpc_sendMessage(self, to_jid, msg, subject, type):
e8e3704eb97f Added basic chat panel
Goffi <goffi@goffi.org>
parents: 14
diff changeset
188 """send message"""
44
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
189 profile = ISATSession(self.session).profile
19
e8e3704eb97f Added basic chat panel
Goffi <goffi@goffi.org>
parents: 14
diff changeset
190 return self.sat_host.bridge.sendMessage(to_jid, msg, subject, type, profile)
0
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
191
11
331c093e4eb3 magicBox is now able to send global microblog
Goffi <goffi@goffi.org>
parents: 10
diff changeset
192 def jsonrpc_sendMblog(self, raw_text):
331c093e4eb3 magicBox is now able to send global microblog
Goffi <goffi@goffi.org>
parents: 10
diff changeset
193 """Parse raw_text of the microblog box, and send message consequently"""
44
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
194 profile = ISATSession(self.session).profile
14
9bf8ed012adc - Group microblog management, first draft
Goffi <goffi@goffi.org>
parents: 11
diff changeset
195 match = re.match(r'@(.+?): *(.*$)', raw_text)
9bf8ed012adc - Group microblog management, first draft
Goffi <goffi@goffi.org>
parents: 11
diff changeset
196 if match:
9bf8ed012adc - Group microblog management, first draft
Goffi <goffi@goffi.org>
parents: 11
diff changeset
197 recip = match.group(1)
9bf8ed012adc - Group microblog management, first draft
Goffi <goffi@goffi.org>
parents: 11
diff changeset
198 text = match.group(2)
133
4ad621df9e34 browser side: group blog is now used to send all microblogs
Goffi <goffi@goffi.org>
parents: 132
diff changeset
199 #if recip == '@' and text:
4ad621df9e34 browser side: group blog is now used to send all microblogs
Goffi <goffi@goffi.org>
parents: 132
diff changeset
200 # #This text if for the public microblog
4ad621df9e34 browser side: group blog is now used to send all microblogs
Goffi <goffi@goffi.org>
parents: 132
diff changeset
201 # return self.sat_host.bridge.sendPersonalEvent("MICROBLOG", {'content':text}, profile)
14
9bf8ed012adc - Group microblog management, first draft
Goffi <goffi@goffi.org>
parents: 11
diff changeset
202 if recip == '@' and text:
9bf8ed012adc - Group microblog management, first draft
Goffi <goffi@goffi.org>
parents: 11
diff changeset
203 #This text if for the public microblog
133
4ad621df9e34 browser side: group blog is now used to send all microblogs
Goffi <goffi@goffi.org>
parents: 132
diff changeset
204 print "sending public blog"
4ad621df9e34 browser side: group blog is now used to send all microblogs
Goffi <goffi@goffi.org>
parents: 132
diff changeset
205 return self.sat_host.bridge.sendGroupBlog("PUBLIC", [], text, profile)
14
9bf8ed012adc - Group microblog management, first draft
Goffi <goffi@goffi.org>
parents: 11
diff changeset
206 else:
133
4ad621df9e34 browser side: group blog is now used to send all microblogs
Goffi <goffi@goffi.org>
parents: 132
diff changeset
207 print "sending group blog"
4ad621df9e34 browser side: group blog is now used to send all microblogs
Goffi <goffi@goffi.org>
parents: 132
diff changeset
208 return self.sat_host.bridge.sendGroupBlog("GROUP", [recip], text, profile)
132
30d8e328559b server & browser side: microblogging refactoring first draft
Goffi <goffi@goffi.org>
parents: 131
diff changeset
209
30d8e328559b server & browser side: microblogging refactoring first draft
Goffi <goffi@goffi.org>
parents: 131
diff changeset
210 def jsonrpc_getLastMblogs(self, publisher_jid, max_item):
30d8e328559b server & browser side: microblogging refactoring first draft
Goffi <goffi@goffi.org>
parents: 131
diff changeset
211 """Get last microblogs posted by a contact
30d8e328559b server & browser side: microblogging refactoring first draft
Goffi <goffi@goffi.org>
parents: 131
diff changeset
212 @param publisher_jid: jid of the publisher
30d8e328559b server & browser side: microblogging refactoring first draft
Goffi <goffi@goffi.org>
parents: 131
diff changeset
213 @param max_item: number of items to ask
30d8e328559b server & browser side: microblogging refactoring first draft
Goffi <goffi@goffi.org>
parents: 131
diff changeset
214 @return list of microblog data (dict)"""
30d8e328559b server & browser side: microblogging refactoring first draft
Goffi <goffi@goffi.org>
parents: 131
diff changeset
215 profile = ISATSession(self.session).profile
30d8e328559b server & browser side: microblogging refactoring first draft
Goffi <goffi@goffi.org>
parents: 131
diff changeset
216 d = defer.Deferred()
30d8e328559b server & browser side: microblogging refactoring first draft
Goffi <goffi@goffi.org>
parents: 131
diff changeset
217 self.sat_host.bridge.getLastGroupBlogs(publisher_jid, max_item, profile, callback=d.callback, errback=d.errback)
30d8e328559b server & browser side: microblogging refactoring first draft
Goffi <goffi@goffi.org>
parents: 131
diff changeset
218 return d
30d8e328559b server & browser side: microblogging refactoring first draft
Goffi <goffi@goffi.org>
parents: 131
diff changeset
219
30d8e328559b server & browser side: microblogging refactoring first draft
Goffi <goffi@goffi.org>
parents: 131
diff changeset
220 def jsonrpc_getMassiveLastMblogs(self, publishers_type, publishers_list, max_item):
30d8e328559b server & browser side: microblogging refactoring first draft
Goffi <goffi@goffi.org>
parents: 131
diff changeset
221 """Get lasts microblogs posted by several contacts at once
30d8e328559b server & browser side: microblogging refactoring first draft
Goffi <goffi@goffi.org>
parents: 131
diff changeset
222 @param publishers_type: one of "ALL", "GROUP", "JID"
30d8e328559b server & browser side: microblogging refactoring first draft
Goffi <goffi@goffi.org>
parents: 131
diff changeset
223 @param publishers_list: list of publishers type (empty list of all, list of groups or list of jids)
30d8e328559b server & browser side: microblogging refactoring first draft
Goffi <goffi@goffi.org>
parents: 131
diff changeset
224 @param max_item: number of items to ask
30d8e328559b server & browser side: microblogging refactoring first draft
Goffi <goffi@goffi.org>
parents: 131
diff changeset
225 @return: dictionary key=publisher's jid, value=list of microblog data (dict)"""
30d8e328559b server & browser side: microblogging refactoring first draft
Goffi <goffi@goffi.org>
parents: 131
diff changeset
226 profile = ISATSession(self.session).profile
30d8e328559b server & browser side: microblogging refactoring first draft
Goffi <goffi@goffi.org>
parents: 131
diff changeset
227 d = defer.Deferred()
30d8e328559b server & browser side: microblogging refactoring first draft
Goffi <goffi@goffi.org>
parents: 131
diff changeset
228 self.sat_host.bridge.getMassiveLastGroupBlogs(publishers_type, publishers_list, max_item, profile, callback=d.callback, errback=d.errback)
135
ceef355156de server + browser side: groupblog subscription + fixed blog insertion order
Goffi <goffi@goffi.org>
parents: 133
diff changeset
229 self.sat_host.bridge.massiveSubscribeGroupBlogs(publishers_type, publishers_list, profile)
132
30d8e328559b server & browser side: microblogging refactoring first draft
Goffi <goffi@goffi.org>
parents: 131
diff changeset
230 return d
14
9bf8ed012adc - Group microblog management, first draft
Goffi <goffi@goffi.org>
parents: 11
diff changeset
231
20
8f4b1a8914c3 - User status is now updated
Goffi <goffi@goffi.org>
parents: 19
diff changeset
232 def jsonrpc_getPresenceStatus(self):
8f4b1a8914c3 - User status is now updated
Goffi <goffi@goffi.org>
parents: 19
diff changeset
233 """Get Presence information for connected contacts"""
44
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
234 profile = ISATSession(self.session).profile
20
8f4b1a8914c3 - User status is now updated
Goffi <goffi@goffi.org>
parents: 19
diff changeset
235 return self.sat_host.bridge.getPresenceStatus(profile)
8f4b1a8914c3 - User status is now updated
Goffi <goffi@goffi.org>
parents: 19
diff changeset
236
123
5cb852d9757e use of async history
Goffi <goffi@goffi.org>
parents: 121
diff changeset
237 def jsonrpc_getHistory(self, from_jid, to_jid, size, between):
19
e8e3704eb97f Added basic chat panel
Goffi <goffi@goffi.org>
parents: 14
diff changeset
238 """Return history for the from_jid/to_jid couple"""
44
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
239 sat_session = ISATSession(self.session)
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
240 profile = sat_session.profile
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
241 sat_jid = sat_session.jid
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
242 if not sat_jid:
19
e8e3704eb97f Added basic chat panel
Goffi <goffi@goffi.org>
parents: 14
diff changeset
243 error("No jid saved for this profile")
e8e3704eb97f Added basic chat panel
Goffi <goffi@goffi.org>
parents: 14
diff changeset
244 return {}
44
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
245 if JID(from_jid).userhost() != sat_jid.userhost() and JID(to_jid).userhost() != sat_jid.userhost():
19
e8e3704eb97f Added basic chat panel
Goffi <goffi@goffi.org>
parents: 14
diff changeset
246 error("Trying to get history from a different jid, maybe a hack attempt ?")
e8e3704eb97f Added basic chat panel
Goffi <goffi@goffi.org>
parents: 14
diff changeset
247 return {}
123
5cb852d9757e use of async history
Goffi <goffi@goffi.org>
parents: 121
diff changeset
248 d = defer.Deferred()
140
09a512d9a0c0 server side: fixed getHistory call and action result management
Goffi <goffi@goffi.org>
parents: 137
diff changeset
249 self.sat_host.bridge.getHistory(from_jid, to_jid, size, between, profile, callback=d.callback, errback=d.errback)
123
5cb852d9757e use of async history
Goffi <goffi@goffi.org>
parents: 121
diff changeset
250 def show(result_dbus):
5cb852d9757e use of async history
Goffi <goffi@goffi.org>
parents: 121
diff changeset
251 result = []
5cb852d9757e use of async history
Goffi <goffi@goffi.org>
parents: 121
diff changeset
252 for line in result_dbus:
5cb852d9757e use of async history
Goffi <goffi@goffi.org>
parents: 121
diff changeset
253 #XXX: we have to do this stupid thing because Python D-Bus use its own types instead of standard types
5cb852d9757e use of async history
Goffi <goffi@goffi.org>
parents: 121
diff changeset
254 # and txJsonRPC doesn't accept D-Bus types, resulting in a empty query
137
b145da69a218 server + browser side: new api fix
Goffi <goffi@goffi.org>
parents: 135
diff changeset
255 timestamp, from_jid, to_jid, message, mess_type = line
b145da69a218 server + browser side: new api fix
Goffi <goffi@goffi.org>
parents: 135
diff changeset
256 result.append((float(timestamp), unicode(from_jid), unicode(to_jid), unicode(message), unicode(mess_type)))
123
5cb852d9757e use of async history
Goffi <goffi@goffi.org>
parents: 121
diff changeset
257 return result
5cb852d9757e use of async history
Goffi <goffi@goffi.org>
parents: 121
diff changeset
258 d.addCallback(show)
5cb852d9757e use of async history
Goffi <goffi@goffi.org>
parents: 121
diff changeset
259 return d
19
e8e3704eb97f Added basic chat panel
Goffi <goffi@goffi.org>
parents: 14
diff changeset
260
50
72c51a4839cc MUC group joining
Goffi <goffi@goffi.org>
parents: 46
diff changeset
261 def jsonrpc_joinMUC(self, room_jid, nick):
72c51a4839cc MUC group joining
Goffi <goffi@goffi.org>
parents: 46
diff changeset
262 """Join a Multi-User Chat room"""
72c51a4839cc MUC group joining
Goffi <goffi@goffi.org>
parents: 46
diff changeset
263 profile = ISATSession(self.session).profile
72c51a4839cc MUC group joining
Goffi <goffi@goffi.org>
parents: 46
diff changeset
264 try:
72c51a4839cc MUC group joining
Goffi <goffi@goffi.org>
parents: 46
diff changeset
265 room_jid = JID(room_jid)
72c51a4839cc MUC group joining
Goffi <goffi@goffi.org>
parents: 46
diff changeset
266 except:
72c51a4839cc MUC group joining
Goffi <goffi@goffi.org>
parents: 46
diff changeset
267 warning('Invalid room jid')
72c51a4839cc MUC group joining
Goffi <goffi@goffi.org>
parents: 46
diff changeset
268 return
125
f9d63624699f radio collective integration, first draft
Goffi <goffi@goffi.org>
parents: 124
diff changeset
269 self.sat_host.bridge.joinMUC(room_jid.userhost(), nick, {}, profile)
50
72c51a4839cc MUC group joining
Goffi <goffi@goffi.org>
parents: 46
diff changeset
270
121
2d40b0f5fb37 server side: asynchronous login
Goffi <goffi@goffi.org>
parents: 117
diff changeset
271 def jsonrpc_getRoomsJoined(self):
30
7684e3ceb12d server_side: added getRoomJoined method
Goffi <goffi@goffi.org>
parents: 24
diff changeset
272 """Return list of room already joined by user"""
44
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
273 profile = ISATSession(self.session).profile
121
2d40b0f5fb37 server side: asynchronous login
Goffi <goffi@goffi.org>
parents: 117
diff changeset
274 return self.sat_host.bridge.getRoomsJoined(profile)
30
7684e3ceb12d server_side: added getRoomJoined method
Goffi <goffi@goffi.org>
parents: 24
diff changeset
275
24
28e203f13144 server side: misc stuff
Goffi <goffi@goffi.org>
parents: 20
diff changeset
276 def jsonrpc_launchTarotGame(self, other_players):
28e203f13144 server side: misc stuff
Goffi <goffi@goffi.org>
parents: 20
diff changeset
277 """Create a room, invite the other players and start a Tarot game"""
44
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
278 profile = ISATSession(self.session).profile
24
28e203f13144 server side: misc stuff
Goffi <goffi@goffi.org>
parents: 20
diff changeset
279 self.sat_host.bridge.tarotGameLaunch(other_players, profile)
11
331c093e4eb3 magicBox is now able to send global microblog
Goffi <goffi@goffi.org>
parents: 10
diff changeset
280
36
1d406077b49b Tarot Game: first draft
Goffi <goffi@goffi.org>
parents: 35
diff changeset
281 def jsonrpc_getTarotCardsPaths(self):
1d406077b49b Tarot Game: first draft
Goffi <goffi@goffi.org>
parents: 35
diff changeset
282 """Give the path of all the tarot cards"""
77
975e6be24e11 media paths update
Goffi <goffi@goffi.org>
parents: 67
diff changeset
283 _join = os.path.join
975e6be24e11 media paths update
Goffi <goffi@goffi.org>
parents: 67
diff changeset
284 _media_dir = _join(self.sat_host.media_dir,'')
975e6be24e11 media paths update
Goffi <goffi@goffi.org>
parents: 67
diff changeset
285 return map(lambda x: _join(MEDIA_DIR, x[len(_media_dir):]),glob.glob(_join(_media_dir,CARDS_DIR,'*_*.png')));
36
1d406077b49b Tarot Game: first draft
Goffi <goffi@goffi.org>
parents: 35
diff changeset
286
37
b306aa090438 Tarot game: game launching (first hand showed), and contract selection
Goffi <goffi@goffi.org>
parents: 36
diff changeset
287 def jsonrpc_tarotGameReady(self, player, referee):
b306aa090438 Tarot game: game launching (first hand showed), and contract selection
Goffi <goffi@goffi.org>
parents: 36
diff changeset
288 """Tell to the server that we are ready to start the game"""
44
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
289 profile = ISATSession(self.session).profile
153
ada146bac8fe server side: fixed tarotGameReady call
Goffi <goffi@goffi.org>
parents: 151
diff changeset
290 self.sat_host.bridge.tarotGameReady(player, referee, profile)
36
1d406077b49b Tarot Game: first draft
Goffi <goffi@goffi.org>
parents: 35
diff changeset
291
37
b306aa090438 Tarot game: game launching (first hand showed), and contract selection
Goffi <goffi@goffi.org>
parents: 36
diff changeset
292 def jsonrpc_tarotGameContratChoosed(self, player_nick, referee, contrat):
b306aa090438 Tarot game: game launching (first hand showed), and contract selection
Goffi <goffi@goffi.org>
parents: 36
diff changeset
293 """Tell to the server that we are ready to start the game"""
44
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
294 profile = ISATSession(self.session).profile
37
b306aa090438 Tarot game: game launching (first hand showed), and contract selection
Goffi <goffi@goffi.org>
parents: 36
diff changeset
295 self.sat_host.bridge.tarotGameContratChoosed(player_nick, referee, contrat, profile)
39
305e81c7a32c Tarot game: a game can now be finished
Goffi <goffi@goffi.org>
parents: 38
diff changeset
296
305e81c7a32c Tarot game: a game can now be finished
Goffi <goffi@goffi.org>
parents: 38
diff changeset
297 def jsonrpc_tarotGamePlayCards(self, player_nick, referee, cards):
128
2849ec993d89 basic radio collective
Goffi <goffi@goffi.org>
parents: 127
diff changeset
298 """Tell to the server the cards we want to put on the table"""
44
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
299 profile = ISATSession(self.session).profile
39
305e81c7a32c Tarot game: a game can now be finished
Goffi <goffi@goffi.org>
parents: 38
diff changeset
300 self.sat_host.bridge.tarotGamePlayCards(player_nick, referee, cards, profile)
36
1d406077b49b Tarot Game: first draft
Goffi <goffi@goffi.org>
parents: 35
diff changeset
301
125
f9d63624699f radio collective integration, first draft
Goffi <goffi@goffi.org>
parents: 124
diff changeset
302 def jsonrpc_launchRadioCollective(self, invited):
f9d63624699f radio collective integration, first draft
Goffi <goffi@goffi.org>
parents: 124
diff changeset
303 """Create a room, invite people, and start a radio collective"""
f9d63624699f radio collective integration, first draft
Goffi <goffi@goffi.org>
parents: 124
diff changeset
304 profile = ISATSession(self.session).profile
f9d63624699f radio collective integration, first draft
Goffi <goffi@goffi.org>
parents: 124
diff changeset
305 self.sat_host.bridge.radiocolLaunch(invited, profile)
f9d63624699f radio collective integration, first draft
Goffi <goffi@goffi.org>
parents: 124
diff changeset
306
137
b145da69a218 server + browser side: new api fix
Goffi <goffi@goffi.org>
parents: 135
diff changeset
307 def jsonrpc_getEntityData(self, jid, keys):
b145da69a218 server + browser side: new api fix
Goffi <goffi@goffi.org>
parents: 135
diff changeset
308 """Get cached data for an entit
b145da69a218 server + browser side: new api fix
Goffi <goffi@goffi.org>
parents: 135
diff changeset
309 @param jid: jid of contact from who we want data
b145da69a218 server + browser side: new api fix
Goffi <goffi@goffi.org>
parents: 135
diff changeset
310 @param keys: name of data we want (list)
b145da69a218 server + browser side: new api fix
Goffi <goffi@goffi.org>
parents: 135
diff changeset
311 @return: requested data"""
124
6d1f4a3da29b server: fixed buggy vcard cache retrieving, fixes avatar issue
Goffi <goffi@goffi.org>
parents: 123
diff changeset
312 profile = ISATSession(self.session).profile
137
b145da69a218 server + browser side: new api fix
Goffi <goffi@goffi.org>
parents: 135
diff changeset
313 return self.sat_host.bridge.getEntityData(jid, keys, profile)
110
dfc02690deb4 browser side: CSS: header, unibox, tabs + drag'n' drop reworked
Adrien Vigneron <adrienvigneron@mailoo.org>
parents: 107
diff changeset
314
148
8635bc9db9bf added parameter management to test XMLUI, but it's currently deactivated for security reasons (need some configuration options) + separated mainTabPanel CSS from LiberviaTabPanel
Goffi <goffi@goffi.org>
parents: 140
diff changeset
315 #def jsonrpc_getParamsUI(self):
8635bc9db9bf added parameter management to test XMLUI, but it's currently deactivated for security reasons (need some configuration options) + separated mainTabPanel CSS from LiberviaTabPanel
Goffi <goffi@goffi.org>
parents: 140
diff changeset
316 # """Return the parameters XMLUI for profile"""
8635bc9db9bf added parameter management to test XMLUI, but it's currently deactivated for security reasons (need some configuration options) + separated mainTabPanel CSS from LiberviaTabPanel
Goffi <goffi@goffi.org>
parents: 140
diff changeset
317 # profile = ISATSession(self.session).profile
8635bc9db9bf added parameter management to test XMLUI, but it's currently deactivated for security reasons (need some configuration options) + separated mainTabPanel CSS from LiberviaTabPanel
Goffi <goffi@goffi.org>
parents: 140
diff changeset
318 # d = defer.Deferred()
8635bc9db9bf added parameter management to test XMLUI, but it's currently deactivated for security reasons (need some configuration options) + separated mainTabPanel CSS from LiberviaTabPanel
Goffi <goffi@goffi.org>
parents: 140
diff changeset
319 # self.sat_host.bridge.getParamsUI(profile, callback=d.callback, errback=d.errback)
8635bc9db9bf added parameter management to test XMLUI, but it's currently deactivated for security reasons (need some configuration options) + separated mainTabPanel CSS from LiberviaTabPanel
Goffi <goffi@goffi.org>
parents: 140
diff changeset
320 # #d.addCallback(lambda result: unicode(result))
8635bc9db9bf added parameter management to test XMLUI, but it's currently deactivated for security reasons (need some configuration options) + separated mainTabPanel CSS from LiberviaTabPanel
Goffi <goffi@goffi.org>
parents: 140
diff changeset
321 # return d
8635bc9db9bf added parameter management to test XMLUI, but it's currently deactivated for security reasons (need some configuration options) + separated mainTabPanel CSS from LiberviaTabPanel
Goffi <goffi@goffi.org>
parents: 140
diff changeset
322
8635bc9db9bf added parameter management to test XMLUI, but it's currently deactivated for security reasons (need some configuration options) + separated mainTabPanel CSS from LiberviaTabPanel
Goffi <goffi@goffi.org>
parents: 140
diff changeset
323 #def jsonrpc_setParam(self, name, value, category):
8635bc9db9bf added parameter management to test XMLUI, but it's currently deactivated for security reasons (need some configuration options) + separated mainTabPanel CSS from LiberviaTabPanel
Goffi <goffi@goffi.org>
parents: 140
diff changeset
324 # profile = ISATSession(self.session).profile
8635bc9db9bf added parameter management to test XMLUI, but it's currently deactivated for security reasons (need some configuration options) + separated mainTabPanel CSS from LiberviaTabPanel
Goffi <goffi@goffi.org>
parents: 140
diff changeset
325 # return self.sat_host.bridge.setParam(name, value, category, profile)
8635bc9db9bf added parameter management to test XMLUI, but it's currently deactivated for security reasons (need some configuration options) + separated mainTabPanel CSS from LiberviaTabPanel
Goffi <goffi@goffi.org>
parents: 140
diff changeset
326
8635bc9db9bf added parameter management to test XMLUI, but it's currently deactivated for security reasons (need some configuration options) + separated mainTabPanel CSS from LiberviaTabPanel
Goffi <goffi@goffi.org>
parents: 140
diff changeset
327 def jsonrpc_launchAction(self, action_type, data):
8635bc9db9bf added parameter management to test XMLUI, but it's currently deactivated for security reasons (need some configuration options) + separated mainTabPanel CSS from LiberviaTabPanel
Goffi <goffi@goffi.org>
parents: 140
diff changeset
328 profile = ISATSession(self.session).profile
8635bc9db9bf added parameter management to test XMLUI, but it's currently deactivated for security reasons (need some configuration options) + separated mainTabPanel CSS from LiberviaTabPanel
Goffi <goffi@goffi.org>
parents: 140
diff changeset
329 return self.sat_host.bridge.launchAction(action_type, data, profile)
8635bc9db9bf added parameter management to test XMLUI, but it's currently deactivated for security reasons (need some configuration options) + separated mainTabPanel CSS from LiberviaTabPanel
Goffi <goffi@goffi.org>
parents: 140
diff changeset
330
0
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
331 class Register(jsonrpc.JSONRPC):
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
332 """This class manage the registration procedure with SàT
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
333 It provide an api for the browser, check password and setup the web server"""
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
334
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
335 def __init__(self, sat_host):
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
336 jsonrpc.JSONRPC.__init__(self)
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
337 self.sat_host=sat_host
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
338 self.profiles_waiting={}
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
339 self.request=None
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
340
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
341 def getWaitingRequest(self, profile):
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
342 """Tell if a profile is trying to log in"""
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
343 if self.profiles_waiting.has_key(profile):
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
344 return self.profiles_waiting[profile]
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
345 else:
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
346 return None
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
347
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
348 def render(self, request):
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
349 """
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
350 Render method with some hacks:
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
351 - if login is requested, try to login with form data
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
352 - except login, every method is jsonrpc
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
353 - user doesn't need to be authentified for isRegistered, but must be for all other methods
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
354 """
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
355 if request.postpath==['login']:
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
356 return self.login(request)
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
357 _session = request.getSession()
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
358 parsed = jsonrpclib.loads(request.content.read())
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
359 if parsed.get("method")!="isRegistered":
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
360 #if we don't call login or isRegistered, we need to be identified
44
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
361 profile = ISATSession(_session).profile
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
362 if not profile:
0
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
363 #user is not identified, we return a jsonrpc fault
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
364 fault = jsonrpclib.Fault(0, "Not allowed") #FIXME: define some standard error codes for libervia
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
365 return jsonrpc.JSONRPC._cbRender(self, fault, request, parsed.get('id'), parsed.get('jsonrpc'))
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
366 self.request = request
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
367 return jsonrpc.JSONRPC.render(self, request)
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
368
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
369 def login(self, request):
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
370 """
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
371 this method is called with the POST information from the registering form
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
372 it test if the password is ok, and log in if it's the case,
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
373 else it return an error
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
374 @param request: request of the register formulaire, must have "login" and "password" as arguments
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
375 @return: A constant indicating the state:
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
376 - BAD REQUEST: something is wrong in the request (bad arguments, profile_key for login)
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
377 - AUTH ERROR: either the profile or the password is wrong
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
378 - ALREADY WAITING: a request has already be made for this profile
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
379 - server.NOT_DONE_YET: the profile is being processed, the return value will be given by self._logged or self._logginError
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
380 """
160
6f913f5adca8 server side: registration refactoring first draft; main registration code is moved to SàT backend
Goffi <goffi@goffi.org>
parents: 156
diff changeset
381
0
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
382 try:
66
9d8e79ac4c9c Login/Register box: integration of Adrien Vigneron's design
Goffi <goffi@goffi.org>
parents: 61
diff changeset
383 if request.args['submit_type'][0] == 'login':
9d8e79ac4c9c Login/Register box: integration of Adrien Vigneron's design
Goffi <goffi@goffi.org>
parents: 61
diff changeset
384 _login = request.args['login'][0]
9d8e79ac4c9c Login/Register box: integration of Adrien Vigneron's design
Goffi <goffi@goffi.org>
parents: 61
diff changeset
385 if _login.startswith('@'):
9d8e79ac4c9c Login/Register box: integration of Adrien Vigneron's design
Goffi <goffi@goffi.org>
parents: 61
diff changeset
386 raise Exception('No profile_key allowed')
9d8e79ac4c9c Login/Register box: integration of Adrien Vigneron's design
Goffi <goffi@goffi.org>
parents: 61
diff changeset
387 _pass = request.args['login_password'][0]
9d8e79ac4c9c Login/Register box: integration of Adrien Vigneron's design
Goffi <goffi@goffi.org>
parents: 61
diff changeset
388
9d8e79ac4c9c Login/Register box: integration of Adrien Vigneron's design
Goffi <goffi@goffi.org>
parents: 61
diff changeset
389 elif request.args['submit_type'][0] == 'register':
160
6f913f5adca8 server side: registration refactoring first draft; main registration code is moved to SàT backend
Goffi <goffi@goffi.org>
parents: 156
diff changeset
390 return self._registerNewAccount(request)
66
9d8e79ac4c9c Login/Register box: integration of Adrien Vigneron's design
Goffi <goffi@goffi.org>
parents: 61
diff changeset
391
9d8e79ac4c9c Login/Register box: integration of Adrien Vigneron's design
Goffi <goffi@goffi.org>
parents: 61
diff changeset
392 else:
9d8e79ac4c9c Login/Register box: integration of Adrien Vigneron's design
Goffi <goffi@goffi.org>
parents: 61
diff changeset
393 raise Exception('Unknown submit type')
0
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
394 except KeyError:
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
395 return "BAD REQUEST"
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
396
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
397 _profile_check = self.sat_host.bridge.getProfileName(_login)
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
398
121
2d40b0f5fb37 server side: asynchronous login
Goffi <goffi@goffi.org>
parents: 117
diff changeset
399 def profile_pass_cb(_profile_pass):
2d40b0f5fb37 server side: asynchronous login
Goffi <goffi@goffi.org>
parents: 117
diff changeset
400 if not _profile_check or _profile_check != _login or _profile_pass != _pass:
2d40b0f5fb37 server side: asynchronous login
Goffi <goffi@goffi.org>
parents: 117
diff changeset
401 request.write("AUTH ERROR")
2d40b0f5fb37 server side: asynchronous login
Goffi <goffi@goffi.org>
parents: 117
diff changeset
402 request.finish()
2d40b0f5fb37 server side: asynchronous login
Goffi <goffi@goffi.org>
parents: 117
diff changeset
403 return
2d40b0f5fb37 server side: asynchronous login
Goffi <goffi@goffi.org>
parents: 117
diff changeset
404
2d40b0f5fb37 server side: asynchronous login
Goffi <goffi@goffi.org>
parents: 117
diff changeset
405 if self.profiles_waiting.has_key(_login):
2d40b0f5fb37 server side: asynchronous login
Goffi <goffi@goffi.org>
parents: 117
diff changeset
406 request.write("ALREADY WAITING")
2d40b0f5fb37 server side: asynchronous login
Goffi <goffi@goffi.org>
parents: 117
diff changeset
407 request.finish()
2d40b0f5fb37 server side: asynchronous login
Goffi <goffi@goffi.org>
parents: 117
diff changeset
408 return
2d40b0f5fb37 server side: asynchronous login
Goffi <goffi@goffi.org>
parents: 117
diff changeset
409
2d40b0f5fb37 server side: asynchronous login
Goffi <goffi@goffi.org>
parents: 117
diff changeset
410 if self.sat_host.bridge.isConnected(_login):
2d40b0f5fb37 server side: asynchronous login
Goffi <goffi@goffi.org>
parents: 117
diff changeset
411 request.write(self._logged(_login, request, finish=False))
2d40b0f5fb37 server side: asynchronous login
Goffi <goffi@goffi.org>
parents: 117
diff changeset
412 request.finish()
2d40b0f5fb37 server side: asynchronous login
Goffi <goffi@goffi.org>
parents: 117
diff changeset
413 return
2d40b0f5fb37 server side: asynchronous login
Goffi <goffi@goffi.org>
parents: 117
diff changeset
414
2d40b0f5fb37 server side: asynchronous login
Goffi <goffi@goffi.org>
parents: 117
diff changeset
415 self.profiles_waiting[_login] = request
155
9c4550b1df3c server side: async connection
Goffi <goffi@goffi.org>
parents: 154
diff changeset
416 d = defer.Deferred()
9c4550b1df3c server side: async connection
Goffi <goffi@goffi.org>
parents: 154
diff changeset
417 self.sat_host.bridge.asyncConnect(_login, lambda: d.callback(None), d.errback)
9c4550b1df3c server side: async connection
Goffi <goffi@goffi.org>
parents: 154
diff changeset
418 return d
0
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
419
121
2d40b0f5fb37 server side: asynchronous login
Goffi <goffi@goffi.org>
parents: 117
diff changeset
420 def profile_pass_errback(ignore):
2d40b0f5fb37 server side: asynchronous login
Goffi <goffi@goffi.org>
parents: 117
diff changeset
421 error("INTERNAL ERROR: can't check profile password")
2d40b0f5fb37 server side: asynchronous login
Goffi <goffi@goffi.org>
parents: 117
diff changeset
422 request.write("AUTH ERROR")
2d40b0f5fb37 server side: asynchronous login
Goffi <goffi@goffi.org>
parents: 117
diff changeset
423 request.finish()
2d40b0f5fb37 server side: asynchronous login
Goffi <goffi@goffi.org>
parents: 117
diff changeset
424
2d40b0f5fb37 server side: asynchronous login
Goffi <goffi@goffi.org>
parents: 117
diff changeset
425 d = defer.Deferred()
2d40b0f5fb37 server side: asynchronous login
Goffi <goffi@goffi.org>
parents: 117
diff changeset
426 self.sat_host.bridge.asyncGetParamA("Password", "Connection", profile_key=_login, callback=d.callback, errback=d.errback)
2d40b0f5fb37 server side: asynchronous login
Goffi <goffi@goffi.org>
parents: 117
diff changeset
427 d.addCallbacks(profile_pass_cb, profile_pass_errback)
0
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
428
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
429 return server.NOT_DONE_YET
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
430
46
c3ee630914ba Account creation
Goffi <goffi@goffi.org>
parents: 45
diff changeset
431 def _postAccountCreation(self, answer_type, id, data, profile):
c3ee630914ba Account creation
Goffi <goffi@goffi.org>
parents: 45
diff changeset
432 """Called when a account has just been created,
c3ee630914ba Account creation
Goffi <goffi@goffi.org>
parents: 45
diff changeset
433 setup stuff has microblog access"""
c3ee630914ba Account creation
Goffi <goffi@goffi.org>
parents: 45
diff changeset
434 def _connected(ignore):
c3ee630914ba Account creation
Goffi <goffi@goffi.org>
parents: 45
diff changeset
435 mblog_d = defer.Deferred()
c3ee630914ba Account creation
Goffi <goffi@goffi.org>
parents: 45
diff changeset
436 self.sat_host.bridge.setMicroblogAccess("open", profile, lambda: mblog_d.callback(None), mblog_d.errback)
c3ee630914ba Account creation
Goffi <goffi@goffi.org>
parents: 45
diff changeset
437 mblog_d.addBoth(lambda ignore: self.sat_host.bridge.disconnect(profile))
c3ee630914ba Account creation
Goffi <goffi@goffi.org>
parents: 45
diff changeset
438
c3ee630914ba Account creation
Goffi <goffi@goffi.org>
parents: 45
diff changeset
439 d = defer.Deferred()
c3ee630914ba Account creation
Goffi <goffi@goffi.org>
parents: 45
diff changeset
440 self.sat_host.bridge.asyncConnect(profile, lambda: d.callback(None), d.errback)
c3ee630914ba Account creation
Goffi <goffi@goffi.org>
parents: 45
diff changeset
441 d.addCallback(_connected)
c3ee630914ba Account creation
Goffi <goffi@goffi.org>
parents: 45
diff changeset
442
160
6f913f5adca8 server side: registration refactoring first draft; main registration code is moved to SàT backend
Goffi <goffi@goffi.org>
parents: 156
diff changeset
443 def _registerNewAccount(self, request):
46
c3ee630914ba Account creation
Goffi <goffi@goffi.org>
parents: 45
diff changeset
444 """Create a new account, or return error
160
6f913f5adca8 server side: registration refactoring first draft; main registration code is moved to SàT backend
Goffi <goffi@goffi.org>
parents: 156
diff changeset
445 @param request: initial login request
46
c3ee630914ba Account creation
Goffi <goffi@goffi.org>
parents: 45
diff changeset
446 @return: "REGISTRATION" in case of success"""
54
f25c4077f6b9 addind contact + subscription management + misc
Goffi <goffi@goffi.org>
parents: 50
diff changeset
447 #TODO: must be moved in SàT core
160
6f913f5adca8 server side: registration refactoring first draft; main registration code is moved to SàT backend
Goffi <goffi@goffi.org>
parents: 156
diff changeset
448
46
c3ee630914ba Account creation
Goffi <goffi@goffi.org>
parents: 45
diff changeset
449 try:
160
6f913f5adca8 server side: registration refactoring first draft; main registration code is moved to SàT backend
Goffi <goffi@goffi.org>
parents: 156
diff changeset
450 profile = login = request.args['register_login'][0]
6f913f5adca8 server side: registration refactoring first draft; main registration code is moved to SàT backend
Goffi <goffi@goffi.org>
parents: 156
diff changeset
451 password = request.args['register_password'][0] #FIXME: password is ignored so far
6f913f5adca8 server side: registration refactoring first draft; main registration code is moved to SàT backend
Goffi <goffi@goffi.org>
parents: 156
diff changeset
452 email = request.args['email'][0]
46
c3ee630914ba Account creation
Goffi <goffi@goffi.org>
parents: 45
diff changeset
453 except KeyError:
c3ee630914ba Account creation
Goffi <goffi@goffi.org>
parents: 45
diff changeset
454 return "BAD REQUEST"
c3ee630914ba Account creation
Goffi <goffi@goffi.org>
parents: 45
diff changeset
455 if not re.match(r'^[a-z0-9_-]+$', login, re.IGNORECASE) or \
c3ee630914ba Account creation
Goffi <goffi@goffi.org>
parents: 45
diff changeset
456 not re.match(r'^.+@.+\..+', email, re.IGNORECASE):
c3ee630914ba Account creation
Goffi <goffi@goffi.org>
parents: 45
diff changeset
457 return "BAD REQUEST"
c3ee630914ba Account creation
Goffi <goffi@goffi.org>
parents: 45
diff changeset
458
160
6f913f5adca8 server side: registration refactoring first draft; main registration code is moved to SàT backend
Goffi <goffi@goffi.org>
parents: 156
diff changeset
459 def registered(result):
6f913f5adca8 server side: registration refactoring first draft; main registration code is moved to SàT backend
Goffi <goffi@goffi.org>
parents: 156
diff changeset
460 request.write('REGISTRATION')
6f913f5adca8 server side: registration refactoring first draft; main registration code is moved to SàT backend
Goffi <goffi@goffi.org>
parents: 156
diff changeset
461 request.finish()
6f913f5adca8 server side: registration refactoring first draft; main registration code is moved to SàT backend
Goffi <goffi@goffi.org>
parents: 156
diff changeset
462 #import pudb
6f913f5adca8 server side: registration refactoring first draft; main registration code is moved to SàT backend
Goffi <goffi@goffi.org>
parents: 156
diff changeset
463 #pudb.set_trace()
6f913f5adca8 server side: registration refactoring first draft; main registration code is moved to SàT backend
Goffi <goffi@goffi.org>
parents: 156
diff changeset
464
6f913f5adca8 server side: registration refactoring first draft; main registration code is moved to SàT backend
Goffi <goffi@goffi.org>
parents: 156
diff changeset
465 def registeringError(failure):
6f913f5adca8 server side: registration refactoring first draft; main registration code is moved to SàT backend
Goffi <goffi@goffi.org>
parents: 156
diff changeset
466 reason = str(failure.value)
6f913f5adca8 server side: registration refactoring first draft; main registration code is moved to SàT backend
Goffi <goffi@goffi.org>
parents: 156
diff changeset
467 if reason == "CONFLICT":
6f913f5adca8 server side: registration refactoring first draft; main registration code is moved to SàT backend
Goffi <goffi@goffi.org>
parents: 156
diff changeset
468 request.write('ALREADY EXISTS')
6f913f5adca8 server side: registration refactoring first draft; main registration code is moved to SàT backend
Goffi <goffi@goffi.org>
parents: 156
diff changeset
469 elif reason == "INTERNAL":
6f913f5adca8 server side: registration refactoring first draft; main registration code is moved to SàT backend
Goffi <goffi@goffi.org>
parents: 156
diff changeset
470 request.write('INTERNAL')
6f913f5adca8 server side: registration refactoring first draft; main registration code is moved to SàT backend
Goffi <goffi@goffi.org>
parents: 156
diff changeset
471 else:
6f913f5adca8 server side: registration refactoring first draft; main registration code is moved to SàT backend
Goffi <goffi@goffi.org>
parents: 156
diff changeset
472 #import pdb
6f913f5adca8 server side: registration refactoring first draft; main registration code is moved to SàT backend
Goffi <goffi@goffi.org>
parents: 156
diff changeset
473 #pdb.set_trace()
6f913f5adca8 server side: registration refactoring first draft; main registration code is moved to SàT backend
Goffi <goffi@goffi.org>
parents: 156
diff changeset
474
6f913f5adca8 server side: registration refactoring first draft; main registration code is moved to SàT backend
Goffi <goffi@goffi.org>
parents: 156
diff changeset
475 error('Unknown registering error: %s' % (reason,))
6f913f5adca8 server side: registration refactoring first draft; main registration code is moved to SàT backend
Goffi <goffi@goffi.org>
parents: 156
diff changeset
476 request.write('Unknown error (%s)' % reason)
6f913f5adca8 server side: registration refactoring first draft; main registration code is moved to SàT backend
Goffi <goffi@goffi.org>
parents: 156
diff changeset
477 request.finish()
6f913f5adca8 server side: registration refactoring first draft; main registration code is moved to SàT backend
Goffi <goffi@goffi.org>
parents: 156
diff changeset
478
6f913f5adca8 server side: registration refactoring first draft; main registration code is moved to SàT backend
Goffi <goffi@goffi.org>
parents: 156
diff changeset
479 d = defer.Deferred()
6f913f5adca8 server side: registration refactoring first draft; main registration code is moved to SàT backend
Goffi <goffi@goffi.org>
parents: 156
diff changeset
480 self.sat_host.bridge.registerSatAccount(email, password, profile, lambda: d.callback(None), d.errback)
6f913f5adca8 server side: registration refactoring first draft; main registration code is moved to SàT backend
Goffi <goffi@goffi.org>
parents: 156
diff changeset
481 d.addCallback(registered)
6f913f5adca8 server side: registration refactoring first draft; main registration code is moved to SàT backend
Goffi <goffi@goffi.org>
parents: 156
diff changeset
482 d.addErrback(registeringError)
6f913f5adca8 server side: registration refactoring first draft; main registration code is moved to SàT backend
Goffi <goffi@goffi.org>
parents: 156
diff changeset
483 return server.NOT_DONE_YET
46
c3ee630914ba Account creation
Goffi <goffi@goffi.org>
parents: 45
diff changeset
484
0
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
485 def __cleanWaiting(self, login):
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
486 """Remove login from waiting queue"""
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
487 try:
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
488 del self.profiles_waiting[login]
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
489 except KeyError:
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
490 pass
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
491
14
9bf8ed012adc - Group microblog management, first draft
Goffi <goffi@goffi.org>
parents: 11
diff changeset
492 def _logged(self, profile, request, finish=True):
0
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
493 """Set everything when a user just logged
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
494 and return "LOGGED" to the requester"""
61
80c490e6a1a7 server side: misc stuff:
Goffi <goffi@goffi.org>
parents: 59
diff changeset
495 def result(answer):
80c490e6a1a7 server side: misc stuff:
Goffi <goffi@goffi.org>
parents: 59
diff changeset
496 if finish:
80c490e6a1a7 server side: misc stuff:
Goffi <goffi@goffi.org>
parents: 59
diff changeset
497 request.write(answer)
80c490e6a1a7 server side: misc stuff:
Goffi <goffi@goffi.org>
parents: 59
diff changeset
498 request.finish()
80c490e6a1a7 server side: misc stuff:
Goffi <goffi@goffi.org>
parents: 59
diff changeset
499 else:
80c490e6a1a7 server side: misc stuff:
Goffi <goffi@goffi.org>
parents: 59
diff changeset
500 return answer
80c490e6a1a7 server side: misc stuff:
Goffi <goffi@goffi.org>
parents: 59
diff changeset
501
14
9bf8ed012adc - Group microblog management, first draft
Goffi <goffi@goffi.org>
parents: 11
diff changeset
502 self.__cleanWaiting(profile)
0
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
503 _session = request.getSession()
44
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
504 sat_session = ISATSession(_session)
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
505 if sat_session.profile:
61
80c490e6a1a7 server side: misc stuff:
Goffi <goffi@goffi.org>
parents: 59
diff changeset
506 error (('/!\\ Session has already a profile, this should NEVER happen !'))
80c490e6a1a7 server side: misc stuff:
Goffi <goffi@goffi.org>
parents: 59
diff changeset
507 return result('SESSION_ACTIVE')
44
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
508 sat_session.profile = profile
24
28e203f13144 server side: misc stuff
Goffi <goffi@goffi.org>
parents: 20
diff changeset
509 self.sat_host.prof_connected.add(profile)
45
7f106052326f server side: user is now disconnected on session end, and queue is purged
Goffi <goffi@goffi.org>
parents: 44
diff changeset
510
7f106052326f server side: user is now disconnected on session end, and queue is purged
Goffi <goffi@goffi.org>
parents: 44
diff changeset
511 def onExpire():
156
46835a4e2551 server side: disconnection
Goffi <goffi@goffi.org>
parents: 155
diff changeset
512 info ("Session expired (profile=%s)" % (profile,))
45
7f106052326f server side: user is now disconnected on session end, and queue is purged
Goffi <goffi@goffi.org>
parents: 44
diff changeset
513 try:
7f106052326f server side: user is now disconnected on session end, and queue is purged
Goffi <goffi@goffi.org>
parents: 44
diff changeset
514 #We purge the queue
7f106052326f server side: user is now disconnected on session end, and queue is purged
Goffi <goffi@goffi.org>
parents: 44
diff changeset
515 del self.sat_host.signal_handler.queue[profile]
7f106052326f server side: user is now disconnected on session end, and queue is purged
Goffi <goffi@goffi.org>
parents: 44
diff changeset
516 except KeyError:
7f106052326f server side: user is now disconnected on session end, and queue is purged
Goffi <goffi@goffi.org>
parents: 44
diff changeset
517 pass
130
6576c5a90060 Working Radio Collective \o/
Goffi <goffi@goffi.org>
parents: 129
diff changeset
518 #and now we disconnect the profile
45
7f106052326f server side: user is now disconnected on session end, and queue is purged
Goffi <goffi@goffi.org>
parents: 44
diff changeset
519 self.sat_host.bridge.disconnect(profile)
7f106052326f server side: user is now disconnected on session end, and queue is purged
Goffi <goffi@goffi.org>
parents: 44
diff changeset
520
7f106052326f server side: user is now disconnected on session end, and queue is purged
Goffi <goffi@goffi.org>
parents: 44
diff changeset
521 _session.notifyOnExpire(onExpire)
7f106052326f server side: user is now disconnected on session end, and queue is purged
Goffi <goffi@goffi.org>
parents: 44
diff changeset
522
14
9bf8ed012adc - Group microblog management, first draft
Goffi <goffi@goffi.org>
parents: 11
diff changeset
523 d = defer.Deferred()
61
80c490e6a1a7 server side: misc stuff:
Goffi <goffi@goffi.org>
parents: 59
diff changeset
524 return result('LOGGED')
0
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
525
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
526 def _logginError(self, login, request, error_type):
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
527 """Something went wrong during loggin, return an error"""
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
528 self.__cleanWaiting(login)
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
529 return error_type
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
530
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
531 def jsonrpc_isConnected(self):
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
532 _session = self.request.getSession()
44
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
533 profile = ISATSession(_session).profile
0
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
534 return self.sat_host.bridge.isConnected(profile)
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
535
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
536 def jsonrpc_connect(self):
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
537 _session = self.request.getSession()
44
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
538 profile = ISATSession(_session).profile
0
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
539 if self.profiles_waiting.has_key(profile):
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
540 raise jsonrpclib.Fault('1','Already waiting') #FIXME: define some standard error codes for libervia
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
541 self.profiles_waiting[profile] = self.request
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
542 self.sat_host.bridge.connect(profile)
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
543 return server.NOT_DONE_YET
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
544
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
545 def jsonrpc_isRegistered(self):
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
546 """Tell if the user is already registered"""
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
547 _session = self.request.getSession()
44
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
548 profile = ISATSession(_session).profile
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
549 return bool(profile)
0
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
550
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
551 class SignalHandler(jsonrpc.JSONRPC):
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
552
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
553 def __init__(self, sat_host):
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
554 Resource.__init__(self)
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
555 self.register=None
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
556 self.sat_host=sat_host
3
154d4caa57f4 server side: proper profile management in signals generic callback
Goffi <goffi@goffi.org>
parents: 2
diff changeset
557 self.signalDeferred = {}
45
7f106052326f server side: user is now disconnected on session end, and queue is purged
Goffi <goffi@goffi.org>
parents: 44
diff changeset
558 self.queue = {}
2
669c531a857e signals handling and first draft of microblogging
Goffi <goffi@goffi.org>
parents: 1
diff changeset
559
0
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
560 def plugRegister(self, register):
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
561 self.register = register
2
669c531a857e signals handling and first draft of microblogging
Goffi <goffi@goffi.org>
parents: 1
diff changeset
562
669c531a857e signals handling and first draft of microblogging
Goffi <goffi@goffi.org>
parents: 1
diff changeset
563 def jsonrpc_getSignals(self):
669c531a857e signals handling and first draft of microblogging
Goffi <goffi@goffi.org>
parents: 1
diff changeset
564 """Keep the connection alive until a signal is received, then send it
669c531a857e signals handling and first draft of microblogging
Goffi <goffi@goffi.org>
parents: 1
diff changeset
565 @return: (signal, *signal_args)"""
3
154d4caa57f4 server side: proper profile management in signals generic callback
Goffi <goffi@goffi.org>
parents: 2
diff changeset
566 _session = self.request.getSession()
44
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
567 profile = ISATSession(_session).profile
24
28e203f13144 server side: misc stuff
Goffi <goffi@goffi.org>
parents: 20
diff changeset
568 if profile in self.queue: #if we have signals to send in queue
28e203f13144 server side: misc stuff
Goffi <goffi@goffi.org>
parents: 20
diff changeset
569 if self.queue[profile]:
28e203f13144 server side: misc stuff
Goffi <goffi@goffi.org>
parents: 20
diff changeset
570 return self.queue[profile].pop(0)
28e203f13144 server side: misc stuff
Goffi <goffi@goffi.org>
parents: 20
diff changeset
571 else:
28e203f13144 server side: misc stuff
Goffi <goffi@goffi.org>
parents: 20
diff changeset
572 #the queue is empty, we delete the profile from queue
28e203f13144 server side: misc stuff
Goffi <goffi@goffi.org>
parents: 20
diff changeset
573 del self.queue[profile]
44
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
574 _session.lock() #we don't want the session to expire as long as this connection is active
156
46835a4e2551 server side: disconnection
Goffi <goffi@goffi.org>
parents: 155
diff changeset
575 def unlock(signal, profile):
44
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
576 _session.unlock()
156
46835a4e2551 server side: disconnection
Goffi <goffi@goffi.org>
parents: 155
diff changeset
577 try:
46835a4e2551 server side: disconnection
Goffi <goffi@goffi.org>
parents: 155
diff changeset
578 source_defer = self.signalDeferred[profile]
46835a4e2551 server side: disconnection
Goffi <goffi@goffi.org>
parents: 155
diff changeset
579 if source_defer.called and source_defer.result[0] == "disconnected":
46835a4e2551 server side: disconnection
Goffi <goffi@goffi.org>
parents: 155
diff changeset
580 info(u"[%s] disconnected" % (profile,))
46835a4e2551 server side: disconnection
Goffi <goffi@goffi.org>
parents: 155
diff changeset
581 _session.expire()
46835a4e2551 server side: disconnection
Goffi <goffi@goffi.org>
parents: 155
diff changeset
582 except IndexError:
46835a4e2551 server side: disconnection
Goffi <goffi@goffi.org>
parents: 155
diff changeset
583 error("Deferred result should be a tuple with fonction name first")
46835a4e2551 server side: disconnection
Goffi <goffi@goffi.org>
parents: 155
diff changeset
584
3
154d4caa57f4 server side: proper profile management in signals generic callback
Goffi <goffi@goffi.org>
parents: 2
diff changeset
585 self.signalDeferred[profile] = defer.Deferred()
156
46835a4e2551 server side: disconnection
Goffi <goffi@goffi.org>
parents: 155
diff changeset
586 self.request.notifyFinish().addBoth(unlock, profile)
3
154d4caa57f4 server side: proper profile management in signals generic callback
Goffi <goffi@goffi.org>
parents: 2
diff changeset
587 return self.signalDeferred[profile]
2
669c531a857e signals handling and first draft of microblogging
Goffi <goffi@goffi.org>
parents: 1
diff changeset
588
669c531a857e signals handling and first draft of microblogging
Goffi <goffi@goffi.org>
parents: 1
diff changeset
589 def getGenericCb(self, function_name):
3
154d4caa57f4 server side: proper profile management in signals generic callback
Goffi <goffi@goffi.org>
parents: 2
diff changeset
590 """Return a generic function which send all params to signalDeferred.callback
154d4caa57f4 server side: proper profile management in signals generic callback
Goffi <goffi@goffi.org>
parents: 2
diff changeset
591 function must have profile as last argument"""
2
669c531a857e signals handling and first draft of microblogging
Goffi <goffi@goffi.org>
parents: 1
diff changeset
592 def genericCb(*args):
3
154d4caa57f4 server side: proper profile management in signals generic callback
Goffi <goffi@goffi.org>
parents: 2
diff changeset
593 profile = args[-1]
24
28e203f13144 server side: misc stuff
Goffi <goffi@goffi.org>
parents: 20
diff changeset
594 if not profile in self.sat_host.prof_connected:
28e203f13144 server side: misc stuff
Goffi <goffi@goffi.org>
parents: 20
diff changeset
595 return
3
154d4caa57f4 server side: proper profile management in signals generic callback
Goffi <goffi@goffi.org>
parents: 2
diff changeset
596 if profile in self.signalDeferred:
154d4caa57f4 server side: proper profile management in signals generic callback
Goffi <goffi@goffi.org>
parents: 2
diff changeset
597 self.signalDeferred[profile].callback((function_name,args[:-1]))
24
28e203f13144 server side: misc stuff
Goffi <goffi@goffi.org>
parents: 20
diff changeset
598 del self.signalDeferred[profile]
2
669c531a857e signals handling and first draft of microblogging
Goffi <goffi@goffi.org>
parents: 1
diff changeset
599 else:
24
28e203f13144 server side: misc stuff
Goffi <goffi@goffi.org>
parents: 20
diff changeset
600 if not self.queue.has_key(profile):
28e203f13144 server side: misc stuff
Goffi <goffi@goffi.org>
parents: 20
diff changeset
601 self.queue[profile] = []
28e203f13144 server side: misc stuff
Goffi <goffi@goffi.org>
parents: 20
diff changeset
602 self.queue[profile].append((function_name, args[:-1]))
2
669c531a857e signals handling and first draft of microblogging
Goffi <goffi@goffi.org>
parents: 1
diff changeset
603 return genericCb
669c531a857e signals handling and first draft of microblogging
Goffi <goffi@goffi.org>
parents: 1
diff changeset
604
0
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
605 def connected(self, profile):
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
606 assert(self.register) #register must be plugged
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
607 request = self.register.getWaitingRequest(profile)
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
608 if request:
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
609 self.register._logged(profile, request)
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
610
156
46835a4e2551 server side: disconnection
Goffi <goffi@goffi.org>
parents: 155
diff changeset
611 def disconnected(self, profile):
46835a4e2551 server side: disconnection
Goffi <goffi@goffi.org>
parents: 155
diff changeset
612 if not profile in self.sat_host.prof_connected:
46835a4e2551 server side: disconnection
Goffi <goffi@goffi.org>
parents: 155
diff changeset
613 error("'disconnected' signal received for a not connected profile")
46835a4e2551 server side: disconnection
Goffi <goffi@goffi.org>
parents: 155
diff changeset
614 return
46835a4e2551 server side: disconnection
Goffi <goffi@goffi.org>
parents: 155
diff changeset
615 self.sat_host.prof_connected.remove(profile)
46835a4e2551 server side: disconnection
Goffi <goffi@goffi.org>
parents: 155
diff changeset
616 if profile in self.signalDeferred:
46835a4e2551 server side: disconnection
Goffi <goffi@goffi.org>
parents: 155
diff changeset
617 self.signalDeferred[profile].callback(("disconnected",))
46835a4e2551 server side: disconnection
Goffi <goffi@goffi.org>
parents: 155
diff changeset
618 del self.signalDeferred[profile]
46835a4e2551 server side: disconnection
Goffi <goffi@goffi.org>
parents: 155
diff changeset
619 else:
46835a4e2551 server side: disconnection
Goffi <goffi@goffi.org>
parents: 155
diff changeset
620 if not self.queue.has_key(profile):
46835a4e2551 server side: disconnection
Goffi <goffi@goffi.org>
parents: 155
diff changeset
621 self.queue[profile] = []
46835a4e2551 server side: disconnection
Goffi <goffi@goffi.org>
parents: 155
diff changeset
622 self.queue[profile].append(("disconnected",))
46835a4e2551 server side: disconnection
Goffi <goffi@goffi.org>
parents: 155
diff changeset
623
46835a4e2551 server side: disconnection
Goffi <goffi@goffi.org>
parents: 155
diff changeset
624
0
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
625 def connectionError(self, error_type, profile):
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
626 assert(self.register) #register must be plugged
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
627 request = self.register.getWaitingRequest(profile)
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
628 if request: #The user is trying to log in
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
629 if error_type == "AUTH_ERROR":
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
630 _error_t = "AUTH ERROR"
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
631 else:
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
632 _error_t = "UNKNOWN"
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
633 self.register._logginError(profile, request, _error_t)
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
634
2
669c531a857e signals handling and first draft of microblogging
Goffi <goffi@goffi.org>
parents: 1
diff changeset
635 def render(self, request):
669c531a857e signals handling and first draft of microblogging
Goffi <goffi@goffi.org>
parents: 1
diff changeset
636 """
669c531a857e signals handling and first draft of microblogging
Goffi <goffi@goffi.org>
parents: 1
diff changeset
637 Render method wich reject access if user is not identified
669c531a857e signals handling and first draft of microblogging
Goffi <goffi@goffi.org>
parents: 1
diff changeset
638 """
669c531a857e signals handling and first draft of microblogging
Goffi <goffi@goffi.org>
parents: 1
diff changeset
639 _session = request.getSession()
669c531a857e signals handling and first draft of microblogging
Goffi <goffi@goffi.org>
parents: 1
diff changeset
640 parsed = jsonrpclib.loads(request.content.read())
44
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
641 profile = ISATSession(_session).profile
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
642 if not profile:
2
669c531a857e signals handling and first draft of microblogging
Goffi <goffi@goffi.org>
parents: 1
diff changeset
643 #user is not identified, we return a jsonrpc fault
669c531a857e signals handling and first draft of microblogging
Goffi <goffi@goffi.org>
parents: 1
diff changeset
644 fault = jsonrpclib.Fault(0, "Not allowed") #FIXME: define some standard error codes for libervia
669c531a857e signals handling and first draft of microblogging
Goffi <goffi@goffi.org>
parents: 1
diff changeset
645 return jsonrpc.JSONRPC._cbRender(self, fault, request, parsed.get('id'), parsed.get('jsonrpc'))
669c531a857e signals handling and first draft of microblogging
Goffi <goffi@goffi.org>
parents: 1
diff changeset
646 self.request = request
669c531a857e signals handling and first draft of microblogging
Goffi <goffi@goffi.org>
parents: 1
diff changeset
647 return jsonrpc.JSONRPC.render(self, request)
0
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
648
127
e19a8de8b3de radio collective first draft
Goffi <goffi@goffi.org>
parents: 125
diff changeset
649 class UploadManager(Resource):
e19a8de8b3de radio collective first draft
Goffi <goffi@goffi.org>
parents: 125
diff changeset
650 """This class manage the upload of a file
e19a8de8b3de radio collective first draft
Goffi <goffi@goffi.org>
parents: 125
diff changeset
651 It redirect the stream to SàT core backend"""
e19a8de8b3de radio collective first draft
Goffi <goffi@goffi.org>
parents: 125
diff changeset
652 isLeaf = True
151
a159cc29b556 server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents: 148
diff changeset
653 NAME = 'path' #name use by the FileUpload
127
e19a8de8b3de radio collective first draft
Goffi <goffi@goffi.org>
parents: 125
diff changeset
654
e19a8de8b3de radio collective first draft
Goffi <goffi@goffi.org>
parents: 125
diff changeset
655 def __init__(self, sat_host):
e19a8de8b3de radio collective first draft
Goffi <goffi@goffi.org>
parents: 125
diff changeset
656 self.sat_host=sat_host
e19a8de8b3de radio collective first draft
Goffi <goffi@goffi.org>
parents: 125
diff changeset
657 self.upload_dir = tempfile.mkdtemp()
e19a8de8b3de radio collective first draft
Goffi <goffi@goffi.org>
parents: 125
diff changeset
658 self.sat_host.addCleanup(shutil.rmtree, self.upload_dir)
e19a8de8b3de radio collective first draft
Goffi <goffi@goffi.org>
parents: 125
diff changeset
659
128
2849ec993d89 basic radio collective
Goffi <goffi@goffi.org>
parents: 127
diff changeset
660 def getTmpDir(self):
2849ec993d89 basic radio collective
Goffi <goffi@goffi.org>
parents: 127
diff changeset
661 return self.upload_dir
2849ec993d89 basic radio collective
Goffi <goffi@goffi.org>
parents: 127
diff changeset
662
151
a159cc29b556 server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents: 148
diff changeset
663 def _getFileName(self, request):
a159cc29b556 server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents: 148
diff changeset
664 """Generate unique filename for a file"""
a159cc29b556 server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents: 148
diff changeset
665 raise NotImplementedError
a159cc29b556 server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents: 148
diff changeset
666
a159cc29b556 server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents: 148
diff changeset
667 def _fileWritten(self, request, filepath):
a159cc29b556 server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents: 148
diff changeset
668 """Called once the file is actually written on disk"""
a159cc29b556 server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents: 148
diff changeset
669 raise NotImplementedError
a159cc29b556 server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents: 148
diff changeset
670
127
e19a8de8b3de radio collective first draft
Goffi <goffi@goffi.org>
parents: 125
diff changeset
671 def render(self, request):
e19a8de8b3de radio collective first draft
Goffi <goffi@goffi.org>
parents: 125
diff changeset
672 """
e19a8de8b3de radio collective first draft
Goffi <goffi@goffi.org>
parents: 125
diff changeset
673 Render method with some hacks:
e19a8de8b3de radio collective first draft
Goffi <goffi@goffi.org>
parents: 125
diff changeset
674 - if login is requested, try to login with form data
e19a8de8b3de radio collective first draft
Goffi <goffi@goffi.org>
parents: 125
diff changeset
675 - except login, every method is jsonrpc
e19a8de8b3de radio collective first draft
Goffi <goffi@goffi.org>
parents: 125
diff changeset
676 - user doesn't need to be authentified for isRegistered, but must be for all other methods
e19a8de8b3de radio collective first draft
Goffi <goffi@goffi.org>
parents: 125
diff changeset
677 """
151
a159cc29b556 server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents: 148
diff changeset
678 #start = time.time()
a159cc29b556 server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents: 148
diff changeset
679 filename = self._getFileName(request)
128
2849ec993d89 basic radio collective
Goffi <goffi@goffi.org>
parents: 127
diff changeset
680 filepath = os.path.join(self.upload_dir, filename)
151
a159cc29b556 server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents: 148
diff changeset
681 #FIXME: the uploaded file is fully loaded in memory at form parsing time so far
a159cc29b556 server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents: 148
diff changeset
682 # (see twisted.web.http.Request.requestReceived). A custom requestReceived should
a159cc29b556 server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents: 148
diff changeset
683 # be written in the futur. In addition, it is not yet possible to get progression informations
a159cc29b556 server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents: 148
diff changeset
684 # (see http://twistedmatrix.com/trac/ticket/288)
a159cc29b556 server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents: 148
diff changeset
685
128
2849ec993d89 basic radio collective
Goffi <goffi@goffi.org>
parents: 127
diff changeset
686 with open(filepath,'w') as f:
151
a159cc29b556 server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents: 148
diff changeset
687 f.write(request.args[self.NAME][0])
a159cc29b556 server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents: 148
diff changeset
688 self._fileWritten(request, filepath)
a159cc29b556 server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents: 148
diff changeset
689 #end = time.time()
a159cc29b556 server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents: 148
diff changeset
690 #print "time spent in render: %fs" % (end - start)
a159cc29b556 server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents: 148
diff changeset
691 return "OK"
a159cc29b556 server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents: 148
diff changeset
692
a159cc29b556 server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents: 148
diff changeset
693 class UploadManagerRadioCol(UploadManager):
a159cc29b556 server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents: 148
diff changeset
694 NAME = 'song'
a159cc29b556 server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents: 148
diff changeset
695
a159cc29b556 server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents: 148
diff changeset
696 def _getFileName(self, request):
a159cc29b556 server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents: 148
diff changeset
697 return "%s.ogg" % str(uuid.uuid4()) #XXX: chromium doesn't seem to play song without the .ogg extension, even with audio/ogg mime-type
a159cc29b556 server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents: 148
diff changeset
698
a159cc29b556 server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents: 148
diff changeset
699 def _fileWritten(self, request, filepath):
a159cc29b556 server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents: 148
diff changeset
700 """Called once the file is actually written on disk"""
128
2849ec993d89 basic radio collective
Goffi <goffi@goffi.org>
parents: 127
diff changeset
701 profile = ISATSession(request.getSession()).profile
2849ec993d89 basic radio collective
Goffi <goffi@goffi.org>
parents: 127
diff changeset
702 self.sat_host.bridge.radiocolSongAdded(request.args['referee'][0], filepath, profile)
151
a159cc29b556 server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents: 148
diff changeset
703
a159cc29b556 server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents: 148
diff changeset
704 class UploadManagerAvatar(UploadManager):
a159cc29b556 server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents: 148
diff changeset
705 NAME = 'avatar_path'
a159cc29b556 server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents: 148
diff changeset
706
a159cc29b556 server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents: 148
diff changeset
707 def _getFileName(self, request):
a159cc29b556 server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents: 148
diff changeset
708 return str(uuid.uuid4())
a159cc29b556 server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents: 148
diff changeset
709
a159cc29b556 server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents: 148
diff changeset
710 def _fileWritten(self, request, filepath):
a159cc29b556 server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents: 148
diff changeset
711 """Called once the file is actually written on disk"""
a159cc29b556 server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents: 148
diff changeset
712 profile = ISATSession(request.getSession()).profile
a159cc29b556 server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents: 148
diff changeset
713 print u"fichier écrit:", filepath
a159cc29b556 server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents: 148
diff changeset
714 self.sat_host.bridge.setAvatar(filepath, profile)
10
c28a4840e1a8 server: microblog resource
Goffi <goffi@goffi.org>
parents: 3
diff changeset
715
0
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
716 class Libervia(service.Service):
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
717
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
718 def __init__(self):
127
e19a8de8b3de radio collective first draft
Goffi <goffi@goffi.org>
parents: 125
diff changeset
719 self._cleanup = []
59
d0fa4e96a5e4 server side: 404 error is now sent instead of directory listing when requesting a directory
Goffi <goffi@goffi.org>
parents: 57
diff changeset
720 root = ProtectedFile(LIBERVIA_DIR)
0
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
721 self.signal_handler = SignalHandler(self)
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
722 _register = Register(self)
151
a159cc29b556 server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents: 148
diff changeset
723 _upload_radiocol = UploadManagerRadioCol(self)
a159cc29b556 server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents: 148
diff changeset
724 _upload_avatar = UploadManagerAvatar(self)
0
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
725 self.signal_handler.plugRegister(_register)
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
726 self.sessions = {} #key = session value = user
24
28e203f13144 server side: misc stuff
Goffi <goffi@goffi.org>
parents: 20
diff changeset
727 self.prof_connected = set() #Profiles connected
46
c3ee630914ba Account creation
Goffi <goffi@goffi.org>
parents: 45
diff changeset
728 self.action_handler = SATActionIDHandler()
0
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
729 ## bridge ##
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
730 try:
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
731 self.bridge=DBusBridgeFrontend()
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
732 except BridgeExceptionNoService:
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
733 print(u"Can't connect to SàT backend, are you sure it's launched ?")
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
734 sys.exit(1)
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
735 self.bridge.register("connected", self.signal_handler.connected)
156
46835a4e2551 server side: disconnection
Goffi <goffi@goffi.org>
parents: 155
diff changeset
736 self.bridge.register("disconnected", self.signal_handler.disconnected)
0
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
737 self.bridge.register("connectionError", self.signal_handler.connectionError)
117
2e2e10785c33 server side: refactored signal according to SàT's bridge changes + getCardCache handling + updatedValue handling
Goffi <goffi@goffi.org>
parents: 110
diff changeset
738 self.bridge.register("actionResult", self.action_handler.actionResultCb)
2e2e10785c33 server side: refactored signal according to SàT's bridge changes + getCardCache handling + updatedValue handling
Goffi <goffi@goffi.org>
parents: 110
diff changeset
739 #core
137
b145da69a218 server + browser side: new api fix
Goffi <goffi@goffi.org>
parents: 135
diff changeset
740 for signal_name in ['presenceUpdate', 'newMessage', 'subscribe', 'contactDeleted', 'newContact', 'entityDataUpdated']:
2
669c531a857e signals handling and first draft of microblogging
Goffi <goffi@goffi.org>
parents: 1
diff changeset
741 self.bridge.register(signal_name, self.signal_handler.getGenericCb(signal_name))
117
2e2e10785c33 server side: refactored signal according to SàT's bridge changes + getCardCache handling + updatedValue handling
Goffi <goffi@goffi.org>
parents: 110
diff changeset
742 #plugins
2e2e10785c33 server side: refactored signal according to SàT's bridge changes + getCardCache handling + updatedValue handling
Goffi <goffi@goffi.org>
parents: 110
diff changeset
743 for signal_name in ['personalEvent', 'roomJoined', 'roomUserJoined', 'roomUserLeft', 'tarotGameStarted', 'tarotGameNew', 'tarotGameChooseContrat',
127
e19a8de8b3de radio collective first draft
Goffi <goffi@goffi.org>
parents: 125
diff changeset
744 'tarotGameShowCards', 'tarotGameInvalidCards', 'tarotGameCardsPlayed', 'tarotGameYourTurn', 'tarotGameScore',
130
6576c5a90060 Working Radio Collective \o/
Goffi <goffi@goffi.org>
parents: 129
diff changeset
745 'radiocolStarted', 'radiocolPreload', 'radiocolPlay', 'radiocolNoUpload', 'radiocolUploadOk', 'radiocolSongRejected']:
117
2e2e10785c33 server side: refactored signal according to SàT's bridge changes + getCardCache handling + updatedValue handling
Goffi <goffi@goffi.org>
parents: 110
diff changeset
746 self.bridge.register(signal_name, self.signal_handler.getGenericCb(signal_name), "plugin")
77
975e6be24e11 media paths update
Goffi <goffi@goffi.org>
parents: 67
diff changeset
747 self.media_dir = self.bridge.getConfig('','media_dir')
107
c3fb3292f582 browser side: CSS: changed tabs margin + fixed dragover background for chat panels
Goffi <goffi@goffi.org>
parents: 77
diff changeset
748 self.local_dir = self.bridge.getConfig('','local_dir')
10
c28a4840e1a8 server: microblog resource
Goffi <goffi@goffi.org>
parents: 3
diff changeset
749 root.putChild('json_signal_api', self.signal_handler)
c28a4840e1a8 server: microblog resource
Goffi <goffi@goffi.org>
parents: 3
diff changeset
750 root.putChild('json_api', MethodHandler(self))
c28a4840e1a8 server: microblog resource
Goffi <goffi@goffi.org>
parents: 3
diff changeset
751 root.putChild('register_api', _register)
151
a159cc29b556 server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents: 148
diff changeset
752 root.putChild('upload_radiocol', _upload_radiocol)
a159cc29b556 server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents: 148
diff changeset
753 root.putChild('upload_avatar', _upload_avatar)
10
c28a4840e1a8 server: microblog resource
Goffi <goffi@goffi.org>
parents: 3
diff changeset
754 root.putChild('blog', MicroBlog(self))
59
d0fa4e96a5e4 server side: 404 error is now sent instead of directory listing when requesting a directory
Goffi <goffi@goffi.org>
parents: 57
diff changeset
755 root.putChild('css', ProtectedFile("server_css/"))
77
975e6be24e11 media paths update
Goffi <goffi@goffi.org>
parents: 67
diff changeset
756 root.putChild(os.path.dirname(MEDIA_DIR), ProtectedFile(self.media_dir))
110
dfc02690deb4 browser side: CSS: header, unibox, tabs + drag'n' drop reworked
Adrien Vigneron <adrienvigneron@mailoo.org>
parents: 107
diff changeset
757 root.putChild(os.path.dirname(AVATARS_DIR), ProtectedFile(os.path.join(self.local_dir, AVATARS_DIR)))
151
a159cc29b556 server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents: 148
diff changeset
758 root.putChild('radiocol', ProtectedFile(_upload_radiocol.getTmpDir(), defaultType="audio/ogg")) #We cheat for PoC because we know we are on the same host, so we use directly upload dir
10
c28a4840e1a8 server: microblog resource
Goffi <goffi@goffi.org>
parents: 3
diff changeset
759 self.site = server.Site(root)
44
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
760 self.site.sessionFactory = LiberviaSession
0
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
761
127
e19a8de8b3de radio collective first draft
Goffi <goffi@goffi.org>
parents: 125
diff changeset
762 def addCleanup(self, callback, *args, **kwargs):
e19a8de8b3de radio collective first draft
Goffi <goffi@goffi.org>
parents: 125
diff changeset
763 """Add cleaning method to call when service is stopped
e19a8de8b3de radio collective first draft
Goffi <goffi@goffi.org>
parents: 125
diff changeset
764 cleaning method will be called in reverse order of they insertion
e19a8de8b3de radio collective first draft
Goffi <goffi@goffi.org>
parents: 125
diff changeset
765 @param callback: callable to call on service stop
e19a8de8b3de radio collective first draft
Goffi <goffi@goffi.org>
parents: 125
diff changeset
766 @param *args: list of arguments of the callback
e19a8de8b3de radio collective first draft
Goffi <goffi@goffi.org>
parents: 125
diff changeset
767 @param **kwargs: list of keyword arguments of the callback"""
e19a8de8b3de radio collective first draft
Goffi <goffi@goffi.org>
parents: 125
diff changeset
768 self._cleanup.insert(0, (callback, args, kwargs))
e19a8de8b3de radio collective first draft
Goffi <goffi@goffi.org>
parents: 125
diff changeset
769
0
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
770 def startService(self):
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
771 reactor.listenTCP(8080, self.site)
127
e19a8de8b3de radio collective first draft
Goffi <goffi@goffi.org>
parents: 125
diff changeset
772
e19a8de8b3de radio collective first draft
Goffi <goffi@goffi.org>
parents: 125
diff changeset
773 def stopService(self):
e19a8de8b3de radio collective first draft
Goffi <goffi@goffi.org>
parents: 125
diff changeset
774 print "launching cleaning methods"
e19a8de8b3de radio collective first draft
Goffi <goffi@goffi.org>
parents: 125
diff changeset
775 for callback, args, kwargs in self._cleanup:
e19a8de8b3de radio collective first draft
Goffi <goffi@goffi.org>
parents: 125
diff changeset
776 callback(*args, **kwargs)
1
0a7c685faa53 ContactPanel: first draft
Goffi <goffi@goffi.org>
parents: 0
diff changeset
777
0
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
778 def run(self):
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
779 reactor.run()
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
780
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
781 def stop(self):
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
782 reactor.stop()
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
783
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
784
44
2744dd31e8a5 server side: Session management refactoring
Goffi <goffi@goffi.org>
parents: 41
diff changeset
785 registerAdapter(SATSession, server.Session, ISATSession)
0
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
786 application = service.Application('Libervia')
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
787 service = Libervia()
140cec48224a Initial commit
Goffi <goffi@goffi.org>
parents:
diff changeset
788 service.setServiceParent(application)