From 3b7f72045122d2b3d03991cd325f376cf29a4587 Mon Sep 17 00:00:00 2001
From: Michael Ziegler <diese-addy@funzt-halt.net>
Date: Wed, 25 Mar 2009 22:14:37 +0100
Subject: [PATCH] added base path autodetection, so people don't have to
 configure *anything* anymore...

---
 mumble-django.wsgi     | 17 +++++++++++++----
 pyweb/mumble/models.py | 19 ++++++++++---------
 pyweb/settings.py      | 31 ++++++++++++++++++++-----------
 3 files changed, 43 insertions(+), 24 deletions(-)

diff --git a/mumble-django.wsgi b/mumble-django.wsgi
index 4d633ad..1a031ee 100644
--- a/mumble-django.wsgi
+++ b/mumble-django.wsgi
@@ -1,13 +1,22 @@
-import os, sys
 
-# Set this to the same path you used in settings.py.
-MUMBLE_DJANGO_ROOT = '/home/mistagee/mumble-django/hgrep';
+# Set this to the same path you used in settings.py, or None for auto-detection.
+MUMBLE_DJANGO_ROOT = None;
+
+### DO NOT CHANGE ANYTHING BELOW THIS LINE ###
+
+import os, sys
+from os.path import join, dirname, abspath
 
+# Path auto-detection
+if not MUMBLE_DJANGO_ROOT:
+	MUMBLE_DJANGO_ROOT = dirname(abspath(__file__));
 
+# environment variables
 sys.path.append( MUMBLE_DJANGO_ROOT )
-sys.path.append( MUMBLE_DJANGO_ROOT+'/pyweb' )
+sys.path.append( join( MUMBLE_DJANGO_ROOT, 'pyweb' ) )
 os.environ['DJANGO_SETTINGS_MODULE'] = 'pyweb.settings'
 
+# WSGI handler
 import django.core.handlers.wsgi
 application = django.core.handlers.wsgi.WSGIHandler()
 
diff --git a/pyweb/mumble/models.py b/pyweb/mumble/models.py
index 8e288dd..64131af 100644
--- a/pyweb/mumble/models.py
+++ b/pyweb/mumble/models.py
@@ -168,15 +168,16 @@ class MumbleUser( models.Model ):
 			self.mumbleid = murmur.registerPlayer( dbus.String( self.name ) );
 		
 		# Update user's registration
-		murmur.setRegistration(
-			dbus.Int32(  self.mumbleid    ),
-			dbus.String( self.name        ),
-			dbus.String( self.owner.email ),
-			dbus.String( self.password    )
-			);
-		
-		# Don't save the users' passwords, we don't need them anyway
-		self.password = '';
+		if self.password:
+			murmur.setRegistration(
+				dbus.Int32(  self.mumbleid    ),
+				dbus.String( self.name        ),
+				dbus.String( self.owner.email ),
+				dbus.String( self.password    )
+				);
+			
+			# Don't save the users' passwords, we don't need them anyway
+			self.password = '';
 		
 		self.setAdmin( self.isAdmin );
 		
diff --git a/pyweb/settings.py b/pyweb/settings.py
index 14ac170..69606cd 100644
--- a/pyweb/settings.py
+++ b/pyweb/settings.py
@@ -3,10 +3,13 @@
 #################################################################
 #################################################################
 ##                                                             ##
-##  The only setting you normally need to alter is this path.  ##
-##  Set this to the path where you extracted mumble-django.    ##
+##  The only setting you should alter is this path.            ##
+##  Mumble-Django will try to auto-detect this value if it     ##
+##  isn't set, which is the default. However, if this should   ##
+##  not work as expected, et this to the path where you        ##
+##  extracted Mumble-Django.                                   ##
 ##                                                             ##
-MUMBLE_DJANGO_ROOT = '/home/mistagee/mumble-django';           ##
+MUMBLE_DJANGO_ROOT = None;                                     ##
 ##                                                             ##
 ##  For a basic installation, this is all you need to edit in  ##
 ##  this file, the rest will be handled automatically!         ##
@@ -19,6 +22,12 @@ MUMBLE_DJANGO_ROOT = '/home/mistagee/mumble-django';           ##
 #################################################################
 #################################################################
 
+
+from os.path import join, dirname, abspath
+
+if not MUMBLE_DJANGO_ROOT:
+	MUMBLE_DJANGO_ROOT = dirname(dirname(abspath(__file__)));
+
 DEBUG = True
 TEMPLATE_DEBUG = DEBUG
 
@@ -28,12 +37,12 @@ ADMINS = (
 
 MANAGERS = ADMINS
 
-DATABASE_ENGINE = 'sqlite3'                              # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
-DATABASE_NAME = MUMBLE_DJANGO_ROOT+'/mumble-django.db3'  # Or path to database file if using sqlite3.
-DATABASE_USER = ''                                       # Not used with sqlite3.
-DATABASE_PASSWORD = ''                                   # Not used with sqlite3.
-DATABASE_HOST = ''                                       # Set to empty string for localhost. Not used with sqlite3.
-DATABASE_PORT = ''                                       # Set to empty string for default. Not used with sqlite3.
+DATABASE_ENGINE = 'sqlite3'
+DATABASE_NAME = join( MUMBLE_DJANGO_ROOT, 'mumble-django.db3' )
+DATABASE_USER = ''
+DATABASE_PASSWORD = ''
+DATABASE_HOST = ''
+DATABASE_PORT = ''
 
 # Local time zone for this installation. Choices can be found here:
 # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
@@ -54,7 +63,7 @@ USE_I18N = True
 
 # Absolute path to the directory that holds media.
 # Example: "/home/media/media.lawrence.com/"
-MEDIA_ROOT = MUMBLE_DJANGO_ROOT+'/htdocs'
+MEDIA_ROOT = join( MUMBLE_DJANGO_ROOT, 'htdocs' )
 
 # URL that handles the media served from MEDIA_ROOT. Make sure to use a
 # trailing slash if there is a path component (optional in other cases).
@@ -88,7 +97,7 @@ TEMPLATE_DIRS = (
     # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
     # Always use forward slashes, even on Windows.
     # Don't forget to use absolute paths, not relative paths.
-    MUMBLE_DJANGO_ROOT+'/template',
+    join( MUMBLE_DJANGO_ROOT, 'template' ),
 )
 
 INSTALLED_APPS = (