added index directory to the setup scripts

2 files changed, 22 insertions, 3 deletions

diff --git a/lib/d2/bin/d2_setup.py b/lib/d2/bin/d2_setup.py
index f36c199..d201333 100644
--- a/lib/d2/bin/d2_setup.py
+++ b/lib/d2/bin/d2_setup.py
@@ -33,6 +33,7 @@ class Args(object):
     def __call__(self):
         self._config_directory()
         self._data_directory()
+        self._index_directory()
         self._log_directory()
         self._log_level()
         self._webserver_port()
@@ -71,6 +72,15 @@ class Args(object):
                      'files: (default: %(default)s)'
         )
 
+    def _index_directory(self):
+        self.parser.add_argument(
+                '--index-directory',
+                type=str,
+                default=self.locations.index_directory,
+                help='The directory that will contain the index (search) '\
+                     'files: (default: %(default)s)'
+        )
+
     def _log_directory(self):
         self.parser.add_argument(
                 '--log-directory',
@@ -306,9 +316,9 @@ class ConfigFile(BaseFilesystem):
         sec = 'directories'
         config.add_section(sec)
         config.set(sec, 'data', args.data_directory)
+        config.set(sec, 'index', args.index_directory)
 
     def _build_log_section(self, config, args):
-
         filename = LogFile.filename(args)
         sec = 'log'
         config.add_section(sec)
diff --git a/lib/d2/config/locations.py b/lib/d2/config/locations.py
index 925cf17..7967d0d 100644
--- a/lib/d2/config/locations.py
+++ b/lib/d2/config/locations.py
@@ -10,7 +10,8 @@ class Locations(object):
     LOG_FILE = '{project}.log'
     CONFIG_FILE = 'config'
     TEMPLATES = 'templates'
-    STATIC= 'static'
+    STATIC = 'static'
+    INDEX = 'index'
 
     def __init__(self, project):
         self.project = project
@@ -22,6 +23,7 @@ class Locations(object):
         self._config_file_ = None
         self._log_file_ = None
         self._static_directory_ = None
+        self._index_directory_ = None
 
     @property
     def home_directory(self):
@@ -64,6 +66,13 @@ class Locations(object):
         return self._data_directory_
 
     @property
+    def index_directory(self):
+        if not self._index_directory_:
+            self._index_directory_ = os.path.join(self.data_directory,
+                                                  self.INDEX)
+        return self._index_directory_
+
+    @property
     def template_directory(self):
         """The directory that holds the html templates used by tornado
         """
@@ -118,4 +127,4 @@ class Locations(object):
     def load(cls, project=None):
         if not project:
             project = 'd2'
-        return cls(project)
\ No newline at end of file
+        return cls(project)