From df21107e3feee505ce1c04850576c3103489d680 Mon Sep 17 00:00:00 2001
From: Andrew Resch <andrewresch@gmail.com>
Date: Mon, 18 May 2009 21:34:03 +0000
Subject: [PATCH] Improvements to the new UI class and improve how
 ConfigManager handles setting the config directory

---
 deluge/configmanager.py | 21 +++++++++++++++++----
 deluge/ui/ui.py         | 27 +++++++--------------------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/deluge/configmanager.py b/deluge/configmanager.py
index 0a7dc7234..1bc5e5c80 100644
--- a/deluge/configmanager.py
+++ b/deluge/configmanager.py
@@ -45,18 +45,31 @@ class _ConfigManager:
         del self.config_files
 
     def set_config_dir(self, directory):
-        """Sets the config directory"""
-        if directory == None:
-            return
+        """
+        Sets the config directory.
+
+        :param directory: str, the directory where the config info should be
+
+        :returns bool: True if successfully changed directory, False if not
+        """
+
+        if not directory:
+            return False
+
         log.info("Setting config directory to: %s", directory)
         if not os.path.exists(directory):
             # Try to create the config folder if it doesn't exist
             try:
                 os.makedirs(directory)
             except Exception, e:
-                log.warning("Unable to make config directory: %s", e)
+                log.error("Unable to make config directory: %s", e)
+                return False
+        elif not os.path.isdir(directory):
+            log.error("Config directory needs to be a directory!")
+            return False
 
         self.__config_directory = directory
+        return True
 
     def get_config_dir(self):
         return self.config_directory
diff --git a/deluge/ui/ui.py b/deluge/ui/ui.py
index dc9195fc2..445f0cf49 100644
--- a/deluge/ui/ui.py
+++ b/deluge/ui/ui.py
@@ -71,32 +71,19 @@ class _UI(object):
     def start(self):
         (self.__options, self.__args) = self.__parser.parse_args()
 
-
         if self.__options.quiet:
             self.__options.loglevel = "none"
 
-        if self.__options.config:
-            if not os.path.isdir(self.__options.config):
-                print "Config option needs to be a directory!"
-                sys.exit(1)
-
-            if not os.path.exists(self.__options.config):
-                # Try to create the config folder if it doesn't exist
-                try:
-                    os.makedirs(self.__options.config)
-                except Exception, e:
-                    pass
-        else:
-            if not os.path.exists(deluge.common.get_default_config_dir()):
-                os.makedirs(deluge.common.get_default_config_dir())
-
         # Setup the logger
         deluge.log.setupLogger(level=self.__options.loglevel, filename=self.__options.logfile)
-
-        version = deluge.common.get_version()
-
         log = deluge.log.LOG
-        log.info("Deluge ui %s", version)
+
+        if self.__options.config:
+            if not deluge.configmanager.set_config_dir(self.__options.config):
+                log.error("There was an error setting the config dir! Exiting..")
+                sys.exit(1)
+
+        log.info("Deluge ui %s", deluge.common.get_version())
         log.debug("options: %s", self.__options)
         log.debug("args: %s", self.__args)
         log.info("Starting ui..")