diff options
| -rwxr-xr-x | manage.py | 2 | ||||
| -rw-r--r-- | scannerjammer/__init__.py (renamed from scanneerjammer/__init__.py) | 0 | ||||
| -rw-r--r-- | scannerjammer/settings.py (renamed from scanneerjammer/settings.py) | 6 | ||||
| -rw-r--r-- | scannerjammer/urls.py (renamed from scanneerjammer/urls.py) | 4 | ||||
| -rw-r--r-- | scannerjammer/wsgi.py (renamed from scanneerjammer/wsgi.py) | 4 | ||||
| -rwxr-xr-x | tools/migrate_db.py | 53 |
6 files changed, 58 insertions, 11 deletions
@@ -3,7 +3,7 @@ import os import sys if __name__ == "__main__": - os.environ.setdefault("DJANGO_SETTINGS_MODULE", "scanneerjammer.settings") + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "scannerjammer.settings") from django.core.management import execute_from_command_line diff --git a/scanneerjammer/__init__.py b/scannerjammer/__init__.py index e69de29..e69de29 100644 --- a/scanneerjammer/__init__.py +++ b/scannerjammer/__init__.py diff --git a/scanneerjammer/settings.py b/scannerjammer/settings.py index 7a53b3f..6313f64 100644 --- a/scanneerjammer/settings.py +++ b/scannerjammer/settings.py @@ -1,6 +1,6 @@ import os -# Django settings for scanneerjammer project. +# Django settings for scannerjammer project. DEBUG = True TEMPLATE_DEBUG = DEBUG @@ -102,10 +102,10 @@ MIDDLEWARE_CLASSES = ( # 'django.middleware.clickjacking.XFrameOptionsMiddleware', ) -ROOT_URLCONF = 'scanneerjammer.urls' +ROOT_URLCONF = 'scannerjammer.urls' # Python dotted path to the WSGI application used by Django's runserver. -WSGI_APPLICATION = 'scanneerjammer.wsgi.application' +WSGI_APPLICATION = 'scannerjammer.wsgi.application' TEMPLATE_DIRS = ( # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates". diff --git a/scanneerjammer/urls.py b/scannerjammer/urls.py index faaae0b..16fe4ac 100644 --- a/scanneerjammer/urls.py +++ b/scannerjammer/urls.py @@ -6,8 +6,8 @@ admin.autodiscover() urlpatterns = patterns('', # Examples: - # url(r'^$', 'scanneerjammer.views.home', name='home'), - # url(r'^scanneerjammer/', include('scanneerjammer.foo.urls')), + # url(r'^$', 'scannerjammer.views.home', name='home'), + # url(r'^scannerjammer/', include('scannerjammer.foo.urls')), # Uncomment the admin/doc line below to enable admin documentation: url(r'^admin/doc/', include('django.contrib.admindocs.urls')), diff --git a/scanneerjammer/wsgi.py b/scannerjammer/wsgi.py index 4c3d964..b70598c 100644 --- a/scanneerjammer/wsgi.py +++ b/scannerjammer/wsgi.py @@ -1,5 +1,5 @@ """ -WSGI config for scanneerjammer project. +WSGI config for scannerjammer project. This module contains the WSGI application used by Django's development server and any production WSGI deployments. It should expose a module-level variable @@ -15,7 +15,7 @@ framework. """ import os -os.environ.setdefault("DJANGO_SETTINGS_MODULE", "scanneerjammer.settings") +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "scannerjammer.settings") # This application object is used by any WSGI server configured to use this # file. This includes Django's development server, if the WSGI_APPLICATION diff --git a/tools/migrate_db.py b/tools/migrate_db.py index 16bf30c..c47ddee 100755 --- a/tools/migrate_db.py +++ b/tools/migrate_db.py @@ -1,8 +1,26 @@ #!/usr/bin/env python +import os +import sys + +sys.path.append(os.path.join(os.path.dirname(__file__), '..')) +os.environ['DJANGO_SETTINGS_MODULE'] = 'scannerjammer.settings' + from db import db as DB from pprint import pprint +import django +from datetime import datetime + +from django.conf import settings +from django.contrib.auth.models import User + +from backend.models import SJLike +from backend.models import SJRoom +from backend.models import SJContent +from backend.models import SJSearch +from backend.models import SJUserProfile + class MigrateDB(DB): def __init__(self, *args, **kwargs): @@ -54,7 +72,36 @@ class MigrateDB(DB): if __name__ == '__main__': db = MigrateDB() db.connect() + + # migrate sj_user table for row in db.get_sj_user_table(): - for key, value in row.iteritems(): - print key, ', ', value, ', ', type(value) - print + try: + user = User.objects.get(username=row['username']) + except User.DoesNotExist: + user = User.objects.create_user( + row['username'], + '%s@example.com' % row['username'], + row['password'] + ) + try: + user_profile = user.get_profile() + except django.core.exceptions.ObjectDoesNotExist: + user_profile = SJUserProfile(user=user) + user_profile.lastseen_chat = datetime.fromtimestamp(0) + user_profile.lastseen_webcam = datetime.fromtimestamp(0) + user_profile.save() + + user.date_joined = datetime.fromtimestamp(row['joindate']) + user.last_login = datetime.fromtimestamp(row['seendate']) + user.save() + + user_profile.nickname = row['nickname'] or '' + 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() + + #for key, value in row.iteritems(): + # print key, ', ', value, ', ', type(value) + #print |