Merge pull request #313 from tracim/fix/311/set_depot_from_config

tracim/development.ini.base

@@ -33,12 +33,13 @@ cookie_secret = 3283411b-1904-4554-b0e1-883863b53080
 use = egg:tracim
 full_stack = true
 # You can set french as default language by uncommenting next line
-# lang = fr
+# i18n.lang = fr
 
 cache_dir = %(here)s/data
 # preview generator cache directory
 preview_cache_dir = /tmp/tracim/preview/
-# file depot storage directory
+# file depot storage
+depot_storage_name = tracim
 depot_storage_dir = %(here)s/depot/
 
 beaker.session.key = tracim

tracim/migration/versions/913efdf409e5_all_files_also_on_disk.py

@@ -8,6 +8,7 @@ Create Date: 2017-07-12 15:44:20.568447
 
 import shutil
 
+from alembic import context
 from alembic import op
 from depot.fields.sqlalchemy import UploadedFileField
 from depot.fields.upload import UploadedFile
@@ -34,6 +35,17 @@ revision_helper = sa.Table(
 )
 
 
+def configure_depot():
+    """Configure Depot."""
+    depot_storage_name = context.config.get_main_option('depot_storage_name')
+    depot_storage_path = context.config.get_main_option('depot_storage_dir')
+    depot_storage_settings = {'depot.storage_path': depot_storage_path}
+    DepotManager.configure(
+        depot_storage_name,
+        depot_storage_settings,
+    )
+
+
 def delete_files_on_disk(connection: sa.engine.Connection):
     """Deletes files from disk and their references in database."""
     delete_query = revision_helper.update() \
@@ -41,7 +53,8 @@ def delete_files_on_disk(connection: sa.engine.Connection):
         .where(revision_helper.c.depot_file.isnot(None)) \
         .values(depot_file=None)
     connection.execute(delete_query)
-    shutil.rmtree('depot/', ignore_errors=True)
+    depot_storage_path = context.config.get_main_option('depot_storage_dir')
+    shutil.rmtree(depot_storage_path, ignore_errors=True)
 
 
 def upgrade():
@@ -55,9 +68,7 @@ def upgrade():
     - create all files on disk from database.
     """
     # Creates files depot used in this migration
-    DepotManager.configure(
-        'tracim', {'depot.storage_path': 'depot/'},
-    )
+    configure_depot()
     connection = op.get_bind()
     delete_files_on_disk(connection=connection)
     select_query = revision_helper.select() \
@@ -78,8 +89,7 @@ def upgrade():
         depot_file_field = UploadedFile(depot_file_intent, 'tracim')
         update_query = revision_helper.update() \
             .where(revision_helper.c.revision_id == file.revision_id) \
-            .values(depot_file=depot_file_field) \
-            .return_defaults()
+            .values(depot_file=depot_file_field)
         connection.execute(update_query)
 
 

tracim/tracim/config/app_cfg.py

@@ -129,7 +129,7 @@ def start_daemons(manager: DaemonsManager):
 
 def configure_depot():
     """Configure Depot."""
-    depot_storage_name = 'tracim'
+    depot_storage_name = CFG.get_instance().DEPOT_STORAGE_NAME
     depot_storage_path = CFG.get_instance().DEPOT_STORAGE_DIR
     depot_storage_settings = {'depot.storage_path': depot_storage_path}
     DepotManager.configure(
@@ -219,6 +219,14 @@ class CFG(object):
                 'ERROR: depot_storage_dir configuration is mandatory. '
                 'Set it before continuing.'
             )
+        self.DEPOT_STORAGE_NAME = tg.config.get(
+            'depot_storage_name',
+        )
+        if not self.DEPOT_STORAGE_NAME:
+            raise Exception(
+                'ERROR: depot_storage_name configuration is mandatory. '
+                'Set it before continuing.'
+            )
         self.PREVIEW_CACHE_DIR = tg.config.get(
             'preview_cache_dir',
         )