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

[pymsnt] / src / xdb.py

diff --git a/src/xdb.py b/src/xdb.py
index 1e3e33e64c91a3a93f3a454a52a75809a998b674..e3caf0e97b50d7ff8b24ddf7b220f0f4e290099c 100644 (file)
--- a/src/xdb.py
+++ b/src/xdb.py
@@ -6,6 +6,7 @@ from debug import LogEvent, INFO, WARN
 import os
 import os.path
 import shutil
+import md5
 import config
 
 X = os.path.sep
@@ -18,8 +19,11 @@ def unmangle(file):
        file = "%s@%s" % ("%".join(chunks), end)
        return file
 
-def mangle(jid):
-       return jid.replace("@", "%")
+def mangle(file):
+       return file.replace("@", "%")
+
+def makeHash(file):
+       return md5.md5(file).hexdigest()[0:3]
 
 
 class XDB:
@@ -40,7 +44,7 @@ class XDB:
                if(self.mangle):
                        file = mangle(file)
                
-               hash = file[0:2]
+               hash = makeHash(file)
                document = xmlw.parseFile(self.name + X + hash + X + file + ".xml")
                
                return document
@@ -50,7 +54,7 @@ class XDB:
                        file = mangle(file)
                
                prev_umask = os.umask(SPOOL_UMASK)
-               hash = file[0:2]
+               hash = makeHash(file)
                pre = self.name + X + hash + X
                if not os.path.exists(pre):
                        os.makedirs(pre)