Homogenises directories names in configuration.

tracim/development.ini.base

@@ -34,8 +34,13 @@ use = egg:tracim
 full_stack = true
 # You can set french as default language by uncommenting next line
 # lang = fr
+
 cache_dir = %(here)s/data/cache
+# preview generator cache directory
 preview_cache_dir = %(here)s/data/cache/preview/
+# file depot storage directory
+depot_storage_dir = %(here)s/data/depot/
+
 beaker.session.key = tracim
 beaker.session.secret = 3283411b-1904-4554-b0e1-883863b53080
 
@@ -176,7 +181,7 @@ website.treeview.content = all
 website.base_url = http://127.0.0.1:8080
 # If config not provided, it will be extracted from website.base_url
 website.server_name = 127.0.0.1
-    
+
 email.notification.activated = False
 email.notification.from.email = noreply@trac.im
 email.notification.from.default_label = Tracim Notifications
@@ -222,9 +227,6 @@ wsgidav.config_path = wsgidav.conf
 ## Do not set http:// prefix.
 # wsgidav.client.base_url = 127.0.0.1:<WSGIDAV_PORT>
 
-## DEPOT
-depot_storage_path = %(here)s/data/depot/
-
 #####
 #
 # All configuration below is about logging.

tracim/tracim/config/app_cfg.py

@@ -131,7 +131,7 @@ def start_daemons(manager: DaemonsManager):
 def configure_depot():
     """Configure Depot."""
     depot_storage_name = 'default'
-    depot_storage_path = CFG.get_instance().DEPOT_STORAGE_PATH
+    depot_storage_path = CFG.get_instance().DEPOT_STORAGE_DIR
     depot_storage_settings = {'depot.storage_path': depot_storage_path}
     DepotManager.configure(depot_storage_name,
                            depot_storage_settings)
@@ -222,8 +222,8 @@ class CFG(object):
 
     def __init__(self):
         """Parse configuration file."""
-        self.DEPOT_STORAGE_PATH = tg.config.get('depot_storage_path')
-        self.PREVIEW_CACHE = tg.config.get('preview_cache_dir')
+        self.DEPOT_STORAGE_DIR = tg.config.get('depot_storage_dir')
+        self.PREVIEW_CACHE_DIR = tg.config.get('preview_cache_dir')
 
         self.DATA_UPDATE_ALLOWED_DURATION = \
             int(tg.config.get('content.update.allowed.duration', 0))

tracim/tracim/controllers/content.py

@@ -194,7 +194,7 @@ class UserWorkspaceFolderFileRestController(TIMWorkspaceContentRestController):
     @tg.expose('tracim.templates.file.getone')
     def get_one(self, file_id, revision_id=None):
         file_id = int(file_id)
-        cache_path = CFG.get_instance().PREVIEW_CACHE
+        cache_path = CFG.get_instance().PREVIEW_CACHE_DIR
         preview_manager = PreviewManager(cache_path, create_folder=True)
         user = tmpl_context.current_user
         workspace = tmpl_context.workspace

tracim/tracim/controllers/page.py

@@ -32,7 +32,7 @@ class PagesController(TIMRestController):
         file_id = int(tg.request.controller_state.routing_args.get('file_id'))
         page = int(page_id)
         revision_id = int(revision_id) if revision_id != 'latest' else None
-        cache_path = CFG.get_instance().PREVIEW_CACHE
+        cache_path = CFG.get_instance().PREVIEW_CACHE_DIR
         preview_manager = PreviewManager(cache_path, create_folder=True)
         user = tmpl_context.current_user
         content_api = ContentApi(user,
@@ -81,7 +81,7 @@ class PagesController(TIMRestController):
         file_id = int(tg.request.controller_state.routing_args.get('file_id'))
         revision_id = int(revision_id) if revision_id != 'latest' else None
         page = int(page_id)
-        cache_path = CFG.get_instance().PREVIEW_CACHE
+        cache_path = CFG.get_instance().PREVIEW_CACHE_DIR
         preview_manager = PreviewManager(cache_path, create_folder=True)
         user = tmpl_context.current_user
         content_api = ContentApi(user,