Organize workspace app by org mviewer#161

Author: Gaetanbrl

srv/python/mviewerstudio_backend/route.py

@@ -93,7 +93,7 @@ def update_mviewer_config(id) -> Response:
     # get config as class model data
     config_data = config.as_data()
     # clean preview space if not empty
-    clean_preview(current_app, config_data.id)
+    clean_preview(current_app, config_data.url)
 
     current_config = current_app.register.read_json(config_data.id)
 
@@ -139,7 +139,7 @@ def publish_mviewer_config(id) -> Response:
     if not publish_dir or not path.exists(publish_dir):
         return BadRequest("Publish directory does not exists !")
 
-    workspace = path.join(current_app.config["EXPORT_CONF_FOLDER"], id)
+    workspace = path.join(current_app.config["EXPORT_CONF_FOLDER"], current_user.organisation, id)
 
     if not path.exists(workspace):
         return BadRequest("Application does not exists !")
@@ -197,7 +197,7 @@ def delete_config_workspace(id = None) -> Response:
         raise BadRequest("Empty list : no value to delete !")
 
     logger.debug("START DELETE CONFIG : %s" % id)
-    workspace = path.join(current_app.config["EXPORT_CONF_FOLDER"], id)
+    workspace = path.join(current_app.config["EXPORT_CONF_FOLDER"], current_user.organisation, id)
     # update json
     config = current_app.register.read_json(id)
     if not config or not path.exists(workspace):
@@ -233,7 +233,8 @@ def get_all_app_versions(id) -> Response:
     if not config:
         raise BadRequest("This config doesn't exists !")
     config = config[0]
-    workspace = path.join(current_app.config["EXPORT_CONF_FOLDER"], config["id"])
+    org = current_user.organisation if current_user else current_app.config["DEFAULT_ORG"]
+    workspace = path.join(current_app.config["EXPORT_CONF_FOLDER"], org, config["id"])
     git = Git_manager(workspace)
     versions = git.get_versions()
     return jsonify({"versions": versions, "config": config})
@@ -258,13 +259,13 @@ def switch_app_version(id, version="1") -> Response:
     if not config:
         raise BadRequest("This config doesn't exists !")
     config = config[0]
-    workspace = path.join(current_app.config["EXPORT_CONF_FOLDER"], config["id"])
+    workspace = path.join(current_app.config["EXPORT_CONF_FOLDER"], current_user.organisation, config["id"])
     git = Git_manager(workspace)
     git.switch_version(version, as_new)
     # Update register
     current_app.register.update_from_id(config["id"])
     # clean previews
-    clean_preview(current_app, config["id"])
+    clean_preview(current_app, config["url"])
     return (
         jsonify(
             {
@@ -293,14 +294,14 @@ def preview_app_version(id, version) -> Response:
     # create preview space
     config = config[0]
     init_preview(current_app, config["id"])
-    workspace = path.join(current_app.config["EXPORT_CONF_FOLDER"], config["id"])
+    workspace = path.join(current_app.config["EXPORT_CONF_FOLDER"], current_user.organisation, config["id"])
     git = Git_manager(workspace)
     git.switch_version(version, False)
     # copy past file to preview folder
     app_config = current_app.config
     src_file = app_config["EXPORT_CONF_FOLDER"] + config["url"]
     preview_file = path.join(config["id"], "preview", "%s.xml" % version)
-    path_preview_file = path.join(app_config["EXPORT_CONF_FOLDER"], preview_file)
+    path_preview_file = path.join(app_config["EXPORT_CONF_FOLDER"], config["organisation"], preview_file)
     copyfile(src_file, path_preview_file)
     # restor branch
     git.repo.git.checkout("master")
@@ -309,7 +310,7 @@ def preview_app_version(id, version) -> Response:
         jsonify(
             {
                 "success": True,
-                "file": path.join(app_config["CONF_PATH_FROM_MVIEWER"], preview_file),
+                "file": path.join(app_config["CONF_PATH_FROM_MVIEWER"], config["organisation"], preview_file),
             }
         ),
         200,
@@ -336,8 +337,8 @@ def preview_uncommited_app(id) -> Response:
     # get file name and path
     file_name = uuid.uuid1()
     preview_file = path.join(id, "preview", "%s.xml" % file_name)
-    system_path = path.join(app_config["EXPORT_CONF_FOLDER"], preview_file)
-
+    system_path = path.join(app_config["EXPORT_CONF_FOLDER"], current_user.organisation, preview_file)
+    clean_preview(current_app, path.join(current_user.organisation, id))
     # store file to preview folder
     with open(system_path, "w") as file:
         file.write(xml)
@@ -347,7 +348,7 @@ def preview_uncommited_app(id) -> Response:
         jsonify(
             {
                 "success": True,
-                "file": path.join(app_config["CONF_PATH_FROM_MVIEWER"], preview_file),
+                "file": path.join(app_config["CONF_PATH_FROM_MVIEWER"], current_user.organisation, preview_file),
             }
         ),
         200,

srv/python/mviewerstudio_backend/utils/commons.py

@@ -1,11 +1,12 @@
 from os import walk, remove, path, mkdir
-def clean_preview(app, id):
+def clean_preview(app, app_dir):
     '''
     Will remove each XML files in config preview directory
     '''
-    if not app or not id:
+    if not app_dir:
         return
-    preview_dir = path.join(app.config["EXPORT_CONF_FOLDER"], id, "preview")
+    
+    preview_dir = path.join(app.config["EXPORT_CONF_FOLDER"], app_dir, "preview")
     for (root, dirs, files) in walk(preview_dir):
         if not files:
             break

srv/python/mviewerstudio_backend/utils/config_utils.py

@@ -1,4 +1,5 @@
-from os import path, mkdir, remove
+from os import path, makedirs
+from unidecode import unidecode
 import logging
 import xml.etree.ElementTree as ET
 import re
@@ -11,6 +12,9 @@
 logger = logging.getLogger(__name__)  
 
 
+def getWorkspace(app, path_id = ""):
+    return path.join(app.config["EXPORT_CONF_FOLDER"], path_id)
+
 def edit_xml_string(root, attribute, value):
     attr = root.find(".//{*}%s" % attribute)
     attr.text = value
@@ -44,9 +48,13 @@ def __init__(self, data = "", app = None, xml = None) -> None:
             self.xml = self._read_xml(xml)
         if self.xml is not None and app.register:
             self.register = app.register
-
+            # read org
+            if not current_user and xml:
+                org = self.meta.find("{*}organisation").text
+            else :
+                org = current_user.organisation if current_user else app.config["DEFAULT_ORG"]
             # target workspace path
-            self.workspace = path.join(self.app.config["EXPORT_CONF_FOLDER"], self.uuid)
+            self.workspace = unidecode(getWorkspace(app, path.join(org, self.uuid)))
             # create or update workspace
             self.create_workspace()
             # init or get repo
@@ -86,8 +94,8 @@ def create_workspace(self):
         '''
         if not path.exists(self.workspace):
             # create directory
-            mkdir(self.workspace)
-            mkdir(path.join(self.workspace, "preview"))
+            makedirs(self.workspace)
+            makedirs(path.join(self.workspace, "preview"))
 
     def _get_xml_describe(self, xml):
         '''
@@ -121,18 +129,13 @@ def create_or_update_config(self, file):
                 self.uuid = self.meta.find(".//{*}identifier").text
             file_name = self.meta.find("{*}title").text
             # save file
-            normalize_file_name = re.sub('[^a-zA-Z0-9  \n\.]', "_", file_name).replace(" ", "_")
+            decode_file_name = unidecode(file_name)
+            normalize_file_name = re.sub('[^a-zA-Z0-9  \n\.]', "_", decode_file_name).replace(" ", "_")
             self.full_xml_path = path.join(self.workspace, "%s.xml" % normalize_file_name)
+            
         # write file
         self.write()
 
-    def clean_all_workspace_configs(self):
-        '''
-        Remove each XML found in app workspace
-        '''
-        for file in glob.glob("%s/*.xml" % self.workspace):
-            remove(file)
-
     def as_data(self):
         '''
         Index config metadata in register.

srv/python/mviewerstudio_backend/utils/register_utils.py

@@ -72,13 +72,19 @@ def _configs_files_to_register(self):
         '''
         Will parse all app configs workspace to init class config for each.
         '''
-        publish_path = self.app.config["MVIEWERSTUDIO_PUBLISH_PATH"]
-        dirs = [
-            dir for dir in listdir(self.store_directory) if isdir(path.join(self.store_directory, dir)) and dir != publish_path and glob.glob("%s/*.xml" % path.join(self.store_directory, dir))
+        sub_store_dirs = [
+            path.join(self.store_directory, dir) for dir in listdir(self.store_directory) if isdir(path.join(self.store_directory, dir)) and dir not in ["styles"]
         ]
+        # and glob.glob("%s/*.xml" % path.join(self.store_directory, dir))
+        xml_dirs = []
+        for sub_dir in sub_store_dirs:
+            app_dirs = [
+                path.join(sub_dir, dir) for dir in listdir(sub_dir) if isdir(path.join(sub_dir, dir)) and glob.glob("%s/*.xml" % path.join(sub_dir, dir))
+            ]
+            print(app_dirs)
+            xml_dirs = [*xml_dirs, *app_dirs]
 
-        for dir in dirs:
-            app_path = path.join(self.store_directory, dir)
+        for app_path in xml_dirs:
             for xml in glob.glob("%s/*.xml" % app_path):
                 repo = init_or_get_repo(app_path)
                 # to be sur each app is in master branch

srv/python/requirements.txt

@@ -4,3 +4,4 @@ sentry-sdk[flask]>=0.13,<1
 lxml>=4.4,<4.5
 GitPython>=3
 requests
+Unidecode