annotate muc.py @ 90:965dd6f5fcc3

Tried to improve XMPP disconnections handling Signed-off-by: Charly COSTE <changaco@changaco.net>
author Charly COSTE <changaco@changaco.net>
date Sun, 20 Sep 2009 11:56:03 +0200
parents 22cfc31f9c90
children 59401ac0f47a
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
1 #!/usr/bin/env python
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
2 # -*- coding: utf-8 -*-
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
3
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
4 # This program is free software: you can redistribute it and/or modify
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
5 # it under the terms of the GNU General Public License as published by
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
6 # the Free Software Foundation, either version 3 of the License, or
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
7 # (at your option) any later version.
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
8 #
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
9 # This program is distributed in the hope that it will be useful,
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
12 # GNU General Public License for more details.
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
13 #
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
14 # You should have received a copy of the GNU General Public License
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
15 # along with this program. If not, see <http://www.gnu.org/licenses/>.
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
16
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
17
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
18 import xmppony as xmpp
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
19 from time import sleep
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
20
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
21
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
22 class muc:
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
23
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
24 class PasswordNeeded(Exception): pass
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
25 class MembersOnlyRoom(Exception): pass
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
26 class BannedFromRoom(Exception): pass
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
27 class NicknameConflict(Exception): pass
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
28 class RoomIsFull(Exception): pass
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
29 class RoomIsLocked(Exception): pass
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
30 class ForgotNickname(Exception): pass
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
31 class UnknownError(Exception): pass
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
32
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
33 def __init__(self, room_jid):
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
34 self.room_jid = room_jid
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
35 self.connected = False
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
36 self.participants = {}
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
37
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
38
90
965dd6f5fcc3 Tried to improve XMPP disconnections handling
Charly COSTE <changaco@changaco.net>
parents: 81
diff changeset
39 def _join(self, callback=None):
965dd6f5fcc3 Tried to improve XMPP disconnections handling
Charly COSTE <changaco@changaco.net>
parents: 81
diff changeset
40 self.callback = callback
965dd6f5fcc3 Tried to improve XMPP disconnections handling
Charly COSTE <changaco@changaco.net>
parents: 81
diff changeset
41 self.xmpp_c.RegisterHandler('presence', self._xmpp_presence_handler)
965dd6f5fcc3 Tried to improve XMPP disconnections handling
Charly COSTE <changaco@changaco.net>
parents: 81
diff changeset
42 s = xmpp.protocol.Presence(to=self.jid, status=self.status, payload=[xmpp.simplexml.Node(tag='x', attrs={'xmlns': 'http://jabber.org/protocol/muc'}, payload=[xmpp.simplexml.Node(tag='history', attrs={'maxchars': '0'})])])
965dd6f5fcc3 Tried to improve XMPP disconnections handling
Charly COSTE <changaco@changaco.net>
parents: 81
diff changeset
43 try:
965dd6f5fcc3 Tried to improve XMPP disconnections handling
Charly COSTE <changaco@changaco.net>
parents: 81
diff changeset
44 self.xmpp_c.send(s)
965dd6f5fcc3 Tried to improve XMPP disconnections handling
Charly COSTE <changaco@changaco.net>
parents: 81
diff changeset
45 except IOError, xmpp.Conflict:
965dd6f5fcc3 Tried to improve XMPP disconnections handling
Charly COSTE <changaco@changaco.net>
parents: 81
diff changeset
46 self.xmpp_c.reconnectAndReauth()
965dd6f5fcc3 Tried to improve XMPP disconnections handling
Charly COSTE <changaco@changaco.net>
parents: 81
diff changeset
47 for m in self.xmpp_c.mucs:
965dd6f5fcc3 Tried to improve XMPP disconnections handling
Charly COSTE <changaco@changaco.net>
parents: 81
diff changeset
48 m.rejoin()
965dd6f5fcc3 Tried to improve XMPP disconnections handling
Charly COSTE <changaco@changaco.net>
parents: 81
diff changeset
49 self.xmpp_c.send(s)
965dd6f5fcc3 Tried to improve XMPP disconnections handling
Charly COSTE <changaco@changaco.net>
parents: 81
diff changeset
50
965dd6f5fcc3 Tried to improve XMPP disconnections handling
Charly COSTE <changaco@changaco.net>
parents: 81
diff changeset
51
0
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
52 def join(self, xmpp_c, nickname, status=None, callback=None):
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
53 """Join room on xmpp_c connection using nickname"""
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
54 self.jid = self.room_jid+'/'+nickname
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
55 self.nickname = nickname
90
965dd6f5fcc3 Tried to improve XMPP disconnections handling
Charly COSTE <changaco@changaco.net>
parents: 81
diff changeset
56 self.status = status
0
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
57 self.xmpp_c = xmpp_c
90
965dd6f5fcc3 Tried to improve XMPP disconnections handling
Charly COSTE <changaco@changaco.net>
parents: 81
diff changeset
58 self.xmpp_c.mucs.append(self)
965dd6f5fcc3 Tried to improve XMPP disconnections handling
Charly COSTE <changaco@changaco.net>
parents: 81
diff changeset
59 self._join(callback=callback)
0
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
60
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
61
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
62 def _xmpp_presence_handler(self, xmpp_c, presence):
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
63 if presence.getFrom() == self.jid:
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
64 errors = []
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
65 if presence.getAttr('type') == 'error':
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
66 for c in presence.getChildren():
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
67 if c.getName() == 'error':
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
68 for cc in c.getChildren():
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
69 if cc.getNamespace() == 'urn:ietf:params:xml:ns:xmpp-stanzas' and cc.getName() != 'text':
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
70 err = c.getAttr('type')+' '+cc.getName()
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
71 if err == 'auth not-authorized':
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
72 # password-protected room
81
22cfc31f9c90 Fixed muc.py
Charly COSTE <changaco@changaco.net>
parents: 40
diff changeset
73 errors.append(self.__class__.PasswordNeeded(self.jid))
0
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
74 elif err == 'auth registration-required':
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
75 # members-only room
81
22cfc31f9c90 Fixed muc.py
Charly COSTE <changaco@changaco.net>
parents: 40
diff changeset
76 errors.append(self.__class__.MembersOnlyRoom(self.jid))
0
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
77 elif err == 'auth forbidden':
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
78 # banned from room
81
22cfc31f9c90 Fixed muc.py
Charly COSTE <changaco@changaco.net>
parents: 40
diff changeset
79 errors.append(self.__class__.BannedFromRoom(self.jid))
0
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
80 elif err == 'cancel conflict':
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
81 # nickname conflict
81
22cfc31f9c90 Fixed muc.py
Charly COSTE <changaco@changaco.net>
parents: 40
diff changeset
82 errors.append(self.__class__.NicknameConflict(self.jid))
0
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
83 elif err == 'wait service-unavailable':
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
84 # room is full
81
22cfc31f9c90 Fixed muc.py
Charly COSTE <changaco@changaco.net>
parents: 40
diff changeset
85 errors.append(self.__class__.RoomIsFull(self.jid))
0
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
86 elif err == 'cancel item-not-found':
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
87 # room is locked
81
22cfc31f9c90 Fixed muc.py
Charly COSTE <changaco@changaco.net>
parents: 40
diff changeset
88 errors.append(self.__class__.RoomIsLocked(self.jid))
0
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
89 elif err == 'modify jid-malformed':
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
90 # forgot to give a nickname
81
22cfc31f9c90 Fixed muc.py
Charly COSTE <changaco@changaco.net>
parents: 40
diff changeset
91 errors.append(self.__class__.ForgotNickname(self.jid))
0
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
92 else:
81
22cfc31f9c90 Fixed muc.py
Charly COSTE <changaco@changaco.net>
parents: 40
diff changeset
93 errors.append(self.__class__.UnknownError(presence.__str__(fancy=1).encode('utf-8')))
0
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
94 break
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
95 if len(errors) == 0:
81
22cfc31f9c90 Fixed muc.py
Charly COSTE <changaco@changaco.net>
parents: 40
diff changeset
96 errors.append(self.__class__.UnknownError(presence.__str__(fancy=1).encode('utf-8')))
0
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
97 else:
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
98 self.connected = True
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
99 xmpp_c.UnregisterHandler('presence', self._xmpp_presence_handler)
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
100 if self.callback != None:
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
101 self.callback(errors)
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
102
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
103
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
104 def say(self, message):
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
105 """Say message in the room"""
40
faa468731d8a Tried to get thread safety and handle disconnections in muc.py
Charly COSTE <changaco@changaco.net>
parents: 17
diff changeset
106 self.xmpp_c.lock.acquire()
90
965dd6f5fcc3 Tried to improve XMPP disconnections handling
Charly COSTE <changaco@changaco.net>
parents: 81
diff changeset
107 s = xmpp.protocol.Message(to=self.room_jid, typ='groupchat', body=message)
40
faa468731d8a Tried to get thread safety and handle disconnections in muc.py
Charly COSTE <changaco@changaco.net>
parents: 17
diff changeset
108 try:
90
965dd6f5fcc3 Tried to improve XMPP disconnections handling
Charly COSTE <changaco@changaco.net>
parents: 81
diff changeset
109 self.xmpp_c.send(s)
965dd6f5fcc3 Tried to improve XMPP disconnections handling
Charly COSTE <changaco@changaco.net>
parents: 81
diff changeset
110 except IOError, xmpp.Conflict:
40
faa468731d8a Tried to get thread safety and handle disconnections in muc.py
Charly COSTE <changaco@changaco.net>
parents: 17
diff changeset
111 self.xmpp_c.reconnectAndReauth()
90
965dd6f5fcc3 Tried to improve XMPP disconnections handling
Charly COSTE <changaco@changaco.net>
parents: 81
diff changeset
112 for m in self.xmpp_c.mucs:
965dd6f5fcc3 Tried to improve XMPP disconnections handling
Charly COSTE <changaco@changaco.net>
parents: 81
diff changeset
113 m.rejoin()
965dd6f5fcc3 Tried to improve XMPP disconnections handling
Charly COSTE <changaco@changaco.net>
parents: 81
diff changeset
114 self.xmpp_c.send(s)
40
faa468731d8a Tried to get thread safety and handle disconnections in muc.py
Charly COSTE <changaco@changaco.net>
parents: 17
diff changeset
115 self.xmpp_c.lock.release()
0
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
116
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
117
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
118 def sayTo(self, to, message):
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
119 """Send a private message"""
40
faa468731d8a Tried to get thread safety and handle disconnections in muc.py
Charly COSTE <changaco@changaco.net>
parents: 17
diff changeset
120 self.xmpp_c.lock.acquire()
90
965dd6f5fcc3 Tried to improve XMPP disconnections handling
Charly COSTE <changaco@changaco.net>
parents: 81
diff changeset
121 s = xmpp.protocol.Message(to=self.room_jid+'/'+to, typ='chat', body=message)
40
faa468731d8a Tried to get thread safety and handle disconnections in muc.py
Charly COSTE <changaco@changaco.net>
parents: 17
diff changeset
122 try:
90
965dd6f5fcc3 Tried to improve XMPP disconnections handling
Charly COSTE <changaco@changaco.net>
parents: 81
diff changeset
123 self.xmpp_c.send(s)
965dd6f5fcc3 Tried to improve XMPP disconnections handling
Charly COSTE <changaco@changaco.net>
parents: 81
diff changeset
124 except IOError, xmpp.Conflict:
40
faa468731d8a Tried to get thread safety and handle disconnections in muc.py
Charly COSTE <changaco@changaco.net>
parents: 17
diff changeset
125 self.xmpp_c.reconnectAndReauth()
90
965dd6f5fcc3 Tried to improve XMPP disconnections handling
Charly COSTE <changaco@changaco.net>
parents: 81
diff changeset
126 for m in self.xmpp_c.mucs:
965dd6f5fcc3 Tried to improve XMPP disconnections handling
Charly COSTE <changaco@changaco.net>
parents: 81
diff changeset
127 m.rejoin()
965dd6f5fcc3 Tried to improve XMPP disconnections handling
Charly COSTE <changaco@changaco.net>
parents: 81
diff changeset
128 self.xmpp_c.send(s)
40
faa468731d8a Tried to get thread safety and handle disconnections in muc.py
Charly COSTE <changaco@changaco.net>
parents: 17
diff changeset
129 self.xmpp_c.lock.release()
0
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
130
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
131
17
32a35f7eff70 Rewrote/modified many things, multiple bridges should now work and are preferred over multiple bots.
Charly COSTE <changaco@changaco.net>
parents: 7
diff changeset
132 def change_nick(self, nickname, status=None, callback=None):
0
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
133 """Change nickname"""
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
134 self.jid = self.room_jid+'/'+nickname
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
135 self.callback = callback
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
136 self.xmpp_c.RegisterHandler('presence', self._xmpp_presence_handler)
40
faa468731d8a Tried to get thread safety and handle disconnections in muc.py
Charly COSTE <changaco@changaco.net>
parents: 17
diff changeset
137 self.xmpp_c.lock.acquire()
90
965dd6f5fcc3 Tried to improve XMPP disconnections handling
Charly COSTE <changaco@changaco.net>
parents: 81
diff changeset
138 s = xmpp.protocol.Presence(to=self.jid, status=status)
40
faa468731d8a Tried to get thread safety and handle disconnections in muc.py
Charly COSTE <changaco@changaco.net>
parents: 17
diff changeset
139 try:
90
965dd6f5fcc3 Tried to improve XMPP disconnections handling
Charly COSTE <changaco@changaco.net>
parents: 81
diff changeset
140 self.xmpp_c.send(s)
965dd6f5fcc3 Tried to improve XMPP disconnections handling
Charly COSTE <changaco@changaco.net>
parents: 81
diff changeset
141 except IOError, xmpp.Conflict:
40
faa468731d8a Tried to get thread safety and handle disconnections in muc.py
Charly COSTE <changaco@changaco.net>
parents: 17
diff changeset
142 self.xmpp_c.reconnectAndReauth()
90
965dd6f5fcc3 Tried to improve XMPP disconnections handling
Charly COSTE <changaco@changaco.net>
parents: 81
diff changeset
143 for m in self.xmpp_c.mucs:
965dd6f5fcc3 Tried to improve XMPP disconnections handling
Charly COSTE <changaco@changaco.net>
parents: 81
diff changeset
144 m.rejoin()
965dd6f5fcc3 Tried to improve XMPP disconnections handling
Charly COSTE <changaco@changaco.net>
parents: 81
diff changeset
145 self.xmpp_c.send(s)
40
faa468731d8a Tried to get thread safety and handle disconnections in muc.py
Charly COSTE <changaco@changaco.net>
parents: 17
diff changeset
146 self.xmpp_c.lock.release()
0
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
147
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
148
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
149 def leave(self, message=''):
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
150 """Leave the room"""
40
faa468731d8a Tried to get thread safety and handle disconnections in muc.py
Charly COSTE <changaco@changaco.net>
parents: 17
diff changeset
151 self.xmpp_c.lock.acquire()
90
965dd6f5fcc3 Tried to improve XMPP disconnections handling
Charly COSTE <changaco@changaco.net>
parents: 81
diff changeset
152 s = xmpp.protocol.Presence(to=self.jid, typ='unavailable', status=message)
40
faa468731d8a Tried to get thread safety and handle disconnections in muc.py
Charly COSTE <changaco@changaco.net>
parents: 17
diff changeset
153 try:
90
965dd6f5fcc3 Tried to improve XMPP disconnections handling
Charly COSTE <changaco@changaco.net>
parents: 81
diff changeset
154 self.xmpp_c.send(s)
965dd6f5fcc3 Tried to improve XMPP disconnections handling
Charly COSTE <changaco@changaco.net>
parents: 81
diff changeset
155 except IOError, xmpp.Conflict:
40
faa468731d8a Tried to get thread safety and handle disconnections in muc.py
Charly COSTE <changaco@changaco.net>
parents: 17
diff changeset
156 self.xmpp_c.reconnectAndReauth()
90
965dd6f5fcc3 Tried to improve XMPP disconnections handling
Charly COSTE <changaco@changaco.net>
parents: 81
diff changeset
157 for m in self.xmpp_c.mucs:
965dd6f5fcc3 Tried to improve XMPP disconnections handling
Charly COSTE <changaco@changaco.net>
parents: 81
diff changeset
158 m.rejoin()
965dd6f5fcc3 Tried to improve XMPP disconnections handling
Charly COSTE <changaco@changaco.net>
parents: 81
diff changeset
159 self.xmpp_c.send(s)
0
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
160 self.connected = False
40
faa468731d8a Tried to get thread safety and handle disconnections in muc.py
Charly COSTE <changaco@changaco.net>
parents: 17
diff changeset
161 self.xmpp_c.lock.release()
0
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
162
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
163
90
965dd6f5fcc3 Tried to improve XMPP disconnections handling
Charly COSTE <changaco@changaco.net>
parents: 81
diff changeset
164 def rejoin(self, callback=None):
965dd6f5fcc3 Tried to improve XMPP disconnections handling
Charly COSTE <changaco@changaco.net>
parents: 81
diff changeset
165 """Rejoin room"""
965dd6f5fcc3 Tried to improve XMPP disconnections handling
Charly COSTE <changaco@changaco.net>
parents: 81
diff changeset
166 self.connected = False
965dd6f5fcc3 Tried to improve XMPP disconnections handling
Charly COSTE <changaco@changaco.net>
parents: 81
diff changeset
167 self._join(callback=callback)
965dd6f5fcc3 Tried to improve XMPP disconnections handling
Charly COSTE <changaco@changaco.net>
parents: 81
diff changeset
168
965dd6f5fcc3 Tried to improve XMPP disconnections handling
Charly COSTE <changaco@changaco.net>
parents: 81
diff changeset
169
0
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
170 def __del__(self):
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
171 if self.connected:
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
172 self.leave()
90
965dd6f5fcc3 Tried to improve XMPP disconnections handling
Charly COSTE <changaco@changaco.net>
parents: 81
diff changeset
173 if self in self.xmpp_c.mucs:
965dd6f5fcc3 Tried to improve XMPP disconnections handling
Charly COSTE <changaco@changaco.net>
parents: 81
diff changeset
174 self.xmpp_c.mucs.remove(self)
0
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
175
4c842d23d4ce Initial commit, version 0.1
Charly COSTE <changaco@changaco.net>
parents:
diff changeset
176 xmpp.muc = muc