1 files changed, 33 insertions, 59 deletions

diff --git a/dodai/__init__.py b/dodai/__init__.py
index f1e90bc..87155db 100644
--- a/dodai/__init__.py
+++ b/dodai/__init__.py
@@ -20,23 +20,43 @@
 import os
 import sys
 from dodai.config import Config
-from dodai.config.db import ConfigDbFile
-
+from dodai.tools import config_directories
 
 class Configure(Config):
 
-    CONFIG_FILES = ['config', 'configs', 'configure', 'connect', 'connections',
-                    'connection']
+    CONFIG_FILES = ['config', 'configs', 'configure', 'connect',
+                    'connections', 'connection', 'setup']
+    CONFIG_EXTENSIONS = ['cfg', 'txt', 'ini']
+
 
     def __init__(self, project_name, config_files=None):
-        self.config_files = []
         self.project_name = project_name
-        self.home_directory = self._home_directory()
-        self._default_files()
+        self._load_config_files()
         self._add_files(config_files)
-        self._add_config_files()
+        self._add_config_files_to_database_handler()
+
+    def _config_files(self):
+        # Returns a list of possible config file names
+        out = []
+        for name in self.CONFIG_FILES:
+            out.append(name)
+            for ext in self.CONFIG_EXTENSIONS:
+                name = "{0}.{1}".format(name, ext)
+                out.append(name)
+        return out
+
+    def _load_config_files(self):
+        # Adds any default config file if it exists
+        out = []
+        directories = config_directories(self.project_name)
+        for dir in directories:
+            if os.path.isdir(dir):
+                for name in self._config_files():
+                    path = os.path.join(dir, name)
+                    self._add_file(path)
 
     def _add_files(self, filenames):
+        # Adds a list or tuple of filenames
         if filenames:
             if isinstance(filenames, list) or isinstance(filenames, tuple):
                 for filename in filenames:
@@ -45,56 +65,10 @@ class Configure(Config):
                 self._add_file(filenames)
 
     def _add_file(self, filename):
+        # Adds the given filename to the dodai.config.files object
         if os.path.isfile(filename):
-            if not filename in self.config_files:
-                self.config_files.append(filename)
-
-    def _default_files(self):
-        dirs = []
-        dirs.append(self._construct_system_config_directory())
-        dirs.append(self._construct_user_config_directory())
-        dirs.append(self._construct_project_config_directory())
-        files = []
-        for dir in dirs:
-            for name in self.CONFIG_FILES:
-                files.append(os.path.join(dir, name))
-        for filename in files:
-            self._add_file(filename)
-
-    def _home_directory(self):
-        out = None
-        try:
-            from win32com.shell import shellcon, shell
-            out = shell.SHGetFolderPath(0, shellcon.CSIDL_APPDATA, 0, 0)
-        except ImportError:
-            out = os.path.expanduser("~")
-        return out
-
-    def _construct_system_config_directory(self):
-        out = os.path.join('etc', self.project_name.lower())
-        return out
-
-    def _construct_user_config_directory(self):
-        project_directory = ".{dir}".format(dir=self.project_name.lower())
-        out = os.path.join(self.home_directory, project_directory)
-        return out
-
-    def _construct_project_config_directory(self):
-        dir = os.path.dirname(os.path.abspath(sys.argv[0]))
-        out = os.path.join(dir, 'config')
-        return out
-
-    def _add_config_files(self):
-        if self.config_files:
-            self.files().add_file(self.config_files)
-            config = self.files().parser()
-            if self._has_connections(config):
-                self.dbs().add_config(config)
+            self.files.add(filename)
 
-    def _has_connections(self, config):
-        obj = ConfigDbFile(config)
-        connections = obj()
-        if connections:
-            return True
-        else:
-            return False
+    def _add_config_files_to_database_handler(self):
+        sections = self.files.load()
+        self.databases.add(sections)