Applied patch from the old svn memorytest tree

[pymsnt] / src / legacy / msn / msn.py

diff --git a/src/legacy/msn/msn.py b/src/legacy/msn/msn.py
index 41b007176050bc98ae972f1189d9c58975466319..c27142368ac028b36d07cc7d2a81b610e3132096 100644 (file)
--- a/src/legacy/msn/msn.py
+++ b/src/legacy/msn/msn.py
@@ -84,6 +84,9 @@ Use of this module requires that PyOpenSSL is installed.
 
 from __future__ import nested_scopes
 
+import twistfix
+twistfix.main()
+
 # Sibling imports
 from twisted.protocols.basic import LineReceiver
 from twisted.web.http import HTTPClient
@@ -465,7 +468,7 @@ class MSNObject:
     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.
@@ -478,10 +481,11 @@ class MSNObject:
         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))
@@ -491,7 +495,7 @@ class MSNObject:
     
     def setNull(self):
         self.creator = ""
-        self.imageData = ""
+        self.imageDataFunc = lambda: None
         self.size = 0
         self.type = 0
         self.location = ""
@@ -1943,11 +1947,11 @@ class NotificationClient(MSNEventBase):
             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())
@@ -1957,12 +1961,18 @@ class NotificationClient(MSNEventBase):
                  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):
@@ -2153,7 +2163,7 @@ class SwitchboardClient(MSNEventBase):
                     # 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