# Copyright 2005 James Bunton <james@delx.cjb.net>
# Licensed for distribution under the GPL version 2, check COPYING for details
-from tlib import xmlw
+from twisted.words.protocols.jabber.jid import internJID
import utils
import config
import xdb
import shutil
+import sys
import os
import os.path
for file in os.listdir(pre):
try:
+ if not os.path.isfile(file):
+ continue
file = xdb.unmangle(file).decode("utf-8")
- filej = xmlw.jid.intern(file).full()
+ filej = internJID(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:
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:
print "done"
+def doMD5HashDirUpgrade():
+ print "Moving the avatar directory from msn.host.com up to the spool directory."
-noteList = ["doSpoolPrepCheck", "doHashDirUpgrade"]
-noteListF = [doSpoolPrepCheck, doHashDirUpgrade]
+ 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(os.path.join(config.spooldir, "avatars"))
+ shutil.move(pre + "avatars", os.path.join(config.spooldir, "avatars"))
+ else:
+ print "Could not move your cached avatars directory automatically. It is safe to delete it, the avatars will be recreated as necessary."
+
+
+ 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(pre2)
+ except Exception, e:
+ print "Error in migration", pre, dir, hash, file, str(e)
+ sys.exit(1)
+
+
+
+noteList = ["doSpoolPrepCheck", "doHashDirUpgrade", "doMD5HashDirUpgrade"]
+noteListF = [doSpoolPrepCheck, doHashDirUpgrade, doMD5HashDirUpgrade]