normalize xml name mviewer#161 (comment)

Author: Gaetanbrl

index.html

@@ -245,7 +245,7 @@ <h1>
                                             </span>
 
                                         </label>
-                                        <input class="form-control" id="uniqNameApp" type="text" name="textinput" placeholder="ex: lycee_de_bretagnes">
+                                        <input class="form-control" maxlength="20" id="uniqNameApp" type="text" name="textinput" placeholder="ex: lycee_de_bretagnes">
                                     </div>
                                 </div>
                                 <div class="col-md-12">

srv/python/mviewerstudio_backend/models/config.py

@@ -22,6 +22,7 @@ class ConfigModel:
     subject: str
     date: str
     publish: bool
+    relation: str
 
     def as_dict(self):
         return {
@@ -35,5 +36,6 @@ def as_dict(self):
             "url": self.url,
             "subject": self.subject,
             "date": self.date,
-            "publish": self.publish
+            "publish": self.publish,
+            "relation": self.relation
         }

srv/python/mviewerstudio_backend/route.py

@@ -151,8 +151,10 @@ def publish_mviewer_config(id) -> Response:
 
     copy_file = current_app.config["EXPORT_CONF_FOLDER"] + config[0]["url"]
     config = from_xml_path(current_app, copy_file)
-
-    past_file = path.join(current_app.publish_path, "%s.xml" % id)
+    org_publish_dir = path.join(current_app.publish_path, config.get("publisher"))
+    if not path.exists(org_publish_dir):
+        mkdir(org_publish_dir)
+    past_file = path.join(org_publish_dir, "%s.xml" % config.get("relation"))
 
     # add publish info in XML
     if request.method == "GET":

srv/python/mviewerstudio_backend/utils/config_utils.py

@@ -109,9 +109,10 @@ def _get_xml_describe(self, xml):
         if current_user and current_user.organisation:
             edit_xml_string(meta_root, "publisher", current_user.organisation)
         if meta_root.find(".//{*}relation") is not None:
-            decode_file_name = unidecode(meta_root.find(".//{*}relation").text)
-            normalize_file_name = re.sub('[^a-zA-Z0-9  \n\.]', "_", decode_file_name).replace(" ", "_")
-            edit_xml_string(meta_root, "relation", normalize_file_name)
+            brut_file_name = unidecode(meta_root.find(".//{*}relation").text)[:20]
+            normalize_file_name = re.sub('[^a-zA-Z0-9  \n\.]', "_", brut_file_name).replace(" ", "_")
+            lower_file_name = normalize_file_name.lower()
+            edit_xml_string(meta_root, "relation", lower_file_name)
         return meta_root
 
     def write(self):
@@ -159,11 +160,19 @@ def as_data(self):
             publisher = self.meta.find("{*}publisher").text,
             url = url,
             subject = subject,
-            publish = self.xml.get("publish")
+            publish = self.xml.get("publish"),
+            relation = self.meta.find("{*}relation").text
         )
 
     def as_dict(self):
         '''
         Get config as dict.
         '''
-        return self.as_data().as_dict()
+        return self.as_data().as_dict()
+
+    def get(self, prop = ""):
+        data = self.as_dict()
+        if not prop in data:
+            return ""
+        else :
+            return data[prop]