fix user's settings migration

1 files changed, 14 insertions, 3 deletions

diff --git a/tools/migrate_db.py b/tools/migrate_db.py
index dc07717..891329c 100755
--- a/tools/migrate_db.py
+++ b/tools/migrate_db.py
@@ -3,6 +3,7 @@
 import os
 import sys
 import chardet
+import json
 
 sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
 os.environ['DJANGO_SETTINGS_MODULE'] = 'scannerjammer.settings'
@@ -115,13 +116,24 @@ if __name__ == '__main__':
         user.date_joined = datetime.fromtimestamp(row['joindate'])
         user.last_login = datetime.fromtimestamp(row['seendate'])
         user.save()
-
+	
+	settings_text_nice = {}
+	settings_old = row['settings']
+	
+	if settings_old is not None:
+		slinez = settings_old.split("\n")
+		for l in slinez:
+			pair = l.split("\t")
+			if len(pair) >= 2 and pair[0] is not None and pair[1] is not None:
+				settings_text_nice[pair[0]] = pair[1]
+	
         user_profile.nickname = row['username'] or '' #fixed
         user_profile.score = row['score']
         user_profile.access = row['access']
         user_profile.bio = row['bio'] or ''
         user_profile.lastseen_chat = datetime.fromtimestamp(row['seendate'])
-        user_profile.save()
+        user_profile.settings_text = json.dumps(settings_text_nice)
+	user_profile.save()
 
         #for key, value in row.iteritems():
         #     print key, ', ', value, ', ', type(value)
@@ -130,7 +142,6 @@ if __name__ == '__main__':
         row['__user_pk'] = user.pk
         map_user[row['id']] = user.pk
 
-
     # Migrate sj_search_log table
 
     sj_search_log = list(db.get_sj_search_log_table())