from __future__ import nested_scopes
+import twistfix
+twistfix.main()
+
# Sibling imports
from twisted.protocols.basic import LineReceiver
from twisted.web.http import HTTPClient
Used to represent a MSNObject. This can be currently only be an avatar.
@ivar creator: The userHandle of the creator of this picture.
- @ivar imageData: The PNG image data (only for our own avatar)
+ @ivar imageDataFunc: A function to return the PNG image data (only for our own avatar)
@ivar type: Always set to 3, for avatar.
@ivar size: The size of the image.
@ivar location: The filename of the image.
if s:
self.parse(s)
- def setData(self, creator, imageData):
+ def setData(self, creator, imageDataFunc):
""" Set the creator and imageData for this object """
+ imageData = imageDataFunc()
self.creator = creator
- self.imageData = imageData
+ self.imageDataFunc = imageDataFunc
self.size = len(imageData)
self.type = 3
self.location = "TMP" + str(random.randint(1000,9999))
def setNull(self):
self.creator = ""
- self.imageData = ""
+ self.imageDataFunc = lambda: None
self.size = 0
self.type = 0
self.location = ""
self._setStateData('lst_sofar',sofar)
def handle_BLP(self, params):
- # check to see if this is in response to a SYN
- if self._getState() == 'SYNC':
- self._getStateData('list').privacy = listCodeToID[params[0].lower()]
- else:
+ # If this is in response to a SYN, then there will be a transaction ID
+ try:
id = int(params[0])
self.factory.contacts.privacy = listCodeToID[params[1].lower()]
self._fireCallback(id, params[1])
+ except ValueError:
+ self._getStateData('list').privacy = listCodeToID[params[0].lower()]
def handle_GTC(self, params):
- # check to see if this is in response to a SYN
- if self._getState() == 'SYNC':
- if params[0].lower() == "a": self._getStateData('list').autoAdd = 0
- elif params[0].lower() == "n": self._getStateData('list').autoAdd = 1
- else: raise MSNProtocolError, "Invalid Paramater for GTC" # debug
- else:
+ # If this is in response to a SYN, then there will be a transaction ID
+ try:
id = int(params[0])
if params[1].lower() == "a": self._fireCallback(id, 0)
elif params[1].lower() == "n": self._fireCallback(id, 1)
else: raise MSNProtocolError, "Invalid Paramater for GTC" # debug
+ except ValueError:
+ if params[0].lower() == "a": self._getStateData('list').autoAdd = 0
+ elif params[0].lower() == "n": self._getStateData('list').autoAdd = 1
+ else: raise MSNProtocolError, "Invalid Paramater for GTC" # debug
def handle_SYN(self, params):
id = int(params[0])
- self._setStateData('phone', []) # Always needs to be set
- if params[3] == 0: # No LST will be received. New account?
+ contacts = MSNContactList()
+ self._setStateData('list', contacts)
+ self._setStateData('phone', [])
+ self._setStateData('lst_reply', int(params[3]))
+ self._setStateData('lsg_reply', int(params[4]))
+ self._setStateData('lst_sofar', 0)
+ if params[3] == "0": # No LST will be received. New account?
self._setState('SESSION')
- self._fireCallback(id, None, None)
- else:
- contacts = MSNContactList()
- self._setStateData('list', contacts)
- self._setStateData('lst_reply', int(params[3]))
- self._setStateData('lsg_reply', int(params[4]))
- self._setStateData('lst_sofar', 0)
+ self._fireCallback(id, contacts, [])
def handle_LSG(self, params):
if self._getState() == 'SYNC':
def handle_PRP(self, params):
if params[1] == "MFN":
self._fireCallback(int(params[0]))
- elif self._getState() == 'SYNC':
- self._getStateData('phone').append((params[0], unquote(params[1])))
else:
- self._fireCallback(int(params[0]), int(params[1]), unquote(params[3]))
+ try:
+ self._fireCallback(int(params[0]), int(params[1]), unquote(params[3]))
+ except ValueError:
+ self._getStateData('phone').append((params[0], unquote(params[1])))
def handle_BPR(self, params):
numParams = len(params)
return (personal,)
return d.addCallback(_cb)
- def changeAvatar(self, imageData, push):
+ def changeAvatar(self, imageDataFunc, push):
"""
Used to change the avatar that other users see.
- @param imageData: the PNG image data to set as the avatar
+ @param imageDataFunc: a function to return the PNG image data to set as the avatar
@param push : whether to push the update to the server
(it will otherwise be sent with the next
changeStatus())
The callback argument will be the same as for changeStatus.
"""
- if self.msnobj and imageData == self.msnobj.imageData: return
- if imageData:
- self.msnobj.setData(self.factory.userHandle, imageData)
+ checkMsnobj = MSNObject()
+ checkMsnobj.setData(self.factory.userHandle, imageDataFunc)
+ if self.msnobj and self.msnobj.sha1d == checkMsnobj.sha1d:
+ return # Avatar hasn't changed
+ if imageDataFunc:
+ # We need to keep the same MSNObject instance, as it is
+ # passed on to SwitchboardClient objects
+ self.msnobj.setData(self.factory.userHandle, imageDataFunc)
else:
self.msnobj.setNull()
- if push: return self.changeStatus(self.factory.status) # Push to server
+ if push:
+ return self.changeStatus(self.factory.status) # Push to server
def requestSwitchboardServer(self):
# Check that we have an avatar to send
if self.msnobj:
slpLink = SLPLink_AvatarSend(remoteUser=slpMessage.fro, switchboard=self, filesize=self.msnobj.size, sessionID=slpMessage.sessionID, sessionGuid=slpMessage.sessionGuid)
- slpLink.write(self.msnobj.imageData)
+ slpLink.write(self.msnobj.imageDataFunc())
slpLink.close()
else:
# They shouldn't have sent a request if we have