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

[pymsnt] / src / housekeep.py

diff --git a/src/housekeep.py b/src/housekeep.py
index ee939a0edfcd1faf99faa65fa487ae30b7fc16da..608c01e836bbb1d3230977ff612be8a831f89043 100644 (file)
--- a/src/housekeep.py
+++ b/src/housekeep.py
@@ -1,15 +1,20 @@
 # Copyright 2005 James Bunton <james@delx.cjb.net>
 # Licensed for distribution under the GPL version 2, check COPYING for details
 
+from tlib import xmlw
+
 import utils
 import config
 import xdb
 
 import shutil
+import sys
 import os
 import os.path
 
 
+X = os.path.sep
+
 def init():
        global noteList
        global noteListF
@@ -28,8 +33,8 @@ def init():
 
 class NotesToMyself:
        def __init__(self):
-               pre = os.path.abspath(config.spooldir) + "/" + config.jid + "/"
-               self.filename = pre + "/notes_to_myself"
+               pre = os.path.abspath(config.spooldir) + X + config.jid + X
+               self.filename = pre + X + "notes_to_myself"
                self.notes = []
                
                if os.path.exists(self.filename):
@@ -58,20 +63,22 @@ class NotesToMyself:
 
 
 def doSpoolPrepCheck():
-       pre = os.path.abspath(config.spooldir) + "/" + config.jid + "/"
+       pre = os.path.abspath(config.spooldir) + X + config.jid + X
 
        print "Checking spool files and stringprepping any if necessary...",
 
        for file in os.listdir(pre):
                try:
+                       if not os.path.isfile(file):
+                               continue
                        file = xdb.unmangle(file).decode("utf-8")
-                       filej = utils.jid(file).full()
+                       filej = xmlw.jid.intern(file).full()
                        if(file != filej):
                                file = xdb.mangle(file)
                                filej = xdb.mangle(filej)
                                if(os.path.exists(filej)):
                                        print "Need to move", file, "to", filej, "but the latter exists!\nAborting!"
-                                       os.exit(1)
+                                       sys.exit(1)
                                else:
                                        shutil.move(pre + file, pre + filej)
                except:
@@ -84,12 +91,12 @@ def doHashDirUpgrade():
        print "Upgrading your XDB structure to use hashed directories for speed...",
 
        # Do avatars...
-       pre = os.path.abspath(config.spooldir) + "/" + config.jid + "/avatars/"
+       pre = os.path.join(os.path.abspath(config.spooldir), config.jid) + X + "avatars" + X
        if os.path.exists(pre):
                for file in os.listdir(pre):
                        try:
                                if os.path.isfile(pre + file):
-                                       pre2 = pre + file[0:3] + "/"
+                                       pre2 = pre + file[0:3] + X
                                        if not os.path.exists(pre2):
                                                os.makedirs(pre2)
                                        shutil.move(pre + file, pre2 + file)
@@ -98,19 +105,19 @@ def doHashDirUpgrade():
                                raise
        
        # Do spool files...
-       pre = os.path.abspath(config.spooldir) + "/" + config.jid + "/"
+       pre = os.path.join(os.path.abspath(config.spooldir), config.jid) + X
        if os.path.exists(pre):
                for file in os.listdir(pre):
                        try:
                                if os.path.isfile(pre + file) and file != "notes_to_myself":
                                        hash = file[0:2]
-                                       pre2 = pre + hash + "/"
+                                       pre2 = pre + hash + X
                                        if not os.path.exists(pre2):
                                                os.makedirs(pre2)
 
                                        if(os.path.exists(pre2 + file)):
                                                print "Need to move", file, "to", pre2 + file, "but the latter exists!\nAborting!"
-                                               os.exit(1)
+                                               sys.exit(1)
                                        else:
                                                shutil.move(pre + file, pre2 + file)
                        except:
@@ -119,7 +126,42 @@ def doHashDirUpgrade():
        print "done"
 
 
+def doMD5HashDirUpgrade():
+       print "Moving the avatar directory from msn.host.com up to the spool directory."
+
+       pre = os.path.join(os.path.abspath(config.spooldir), config.jid) + X
+       if os.path.exists(pre + "avatars"):
+               # Remove the avatars dir that gets created when we import
+               # legacy/glue.py (it only contains the defaultAvatar)
+               shutil.rmtree(config.spooldir + X + "avatars")
+               shutil.move(pre + "avatars", config.spooldir + X + "avatars")
+       else:
+               print "Could not move your cached avatars directory automatically. It is safe to delete it, the avatars will be recreated as necessary."
 
-noteList = ["doSpoolPrepCheck", "doHashDirUpgrade"]
-noteListF = [doSpoolPrepCheck, doHashDirUpgrade]
+
+       print "Upgrading your spool directory to use md5 hashes."
+       
+       dirlist = os.listdir(pre)
+       dir, hash, file = "","",""
+       try:
+               for dir in dirlist:
+                       if not os.path.isdir(pre + dir) or dir == "avatars" or len(dir) == 3:
+                               continue
+                       pre2 = pre + dir + X
+                       for file in os.listdir(pre2):
+                               if not os.path.isfile(pre2 + file):
+                                       continue
+                               hash = xdb.makeHash(os.path.splitext(file)[0])
+                               if not os.path.exists(pre + hash):
+                                       os.makedirs(pre + hash)
+                               shutil.move(pre2 + file, pre + hash + X + file)
+                       os.rmdir(dir)
+       except Exception, e:
+               print "Error in migration", pre, dir, hash, file, str(e)
+               sys.exit(1)
+
+
+
+noteList = ["doSpoolPrepCheck", "doHashDirUpgrade", "doMD5HashDirUpgrade"]
+noteListF = [doSpoolPrepCheck, doHashDirUpgrade, doMD5HashDirUpgrade]