Use md5 hashes for spool dir. Moved avatar dir to root of spool dir.

[pymsnt] / src / avatar.py

diff --git a/src/avatar.py b/src/avatar.py
index ab8b43f38b7536bc1c280c2dd87793407c97f143..697400aa7c11e84fd0c6f179817ca704666c8c56 100644 (file)
--- a/src/avatar.py
+++ b/src/avatar.py
@@ -51,14 +51,14 @@ class Avatar:
                cType = photo.addElement("TYPE")
                cType.addContent("image/png")
                binval = photo.addElement("BINVAL")
-               binval.addContent(base64.encodestring(self.getImageData()))
+               binval.addContent(base64.encodestring(self.getImageData()).replace("\n", ""))
                return photo
 
        def makeDataElement(self):
                """ Returns an XML Element that can be put into a jabber:x:avatar IQ stanza. """
                data = Element((None, "data"))
                data["mimetype"] = "image/png"
-               data.addContent(base64.encodestring(self.getImageData()))
+               data.addContent(base64.encodestring(self.getImageData()).replace("\n", ""))
                return data
 
        def __eq__(self, other):
@@ -73,7 +73,7 @@ class AvatarCache:
                """ Returns the full path to the directory that a 
                particular key is in. Creates that directory if it doesn't already exist. """
                X = os.path.sep
-               d = os.path.os.path.abspath(config.spooldir) + X + config.jid + X + "avatars" + X + key[0:3] + X 
+               d = os.path.os.path.abspath(config.spooldir) + X + "avatars" + X + key[0:3] + X 
                if not os.path.exists(d):
                        os.makedirs(d)
                return d