Improving regex for adding future validation, and moving the validato…

…r to the correct location block
opengisch · Oct 4, 2024 · 3ab98ca · 3ab98ca
1 parent df9b740
commit 3ab98ca
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/qfieldsync/core/cloud_converter.py b/qfieldsync/core/cloud_converter.py
@@ -128,18 +128,18 @@ def convert(self) -> None:  # noqa: C901
                             )
                             self.project.removeMapLayer(layer)
                             continue
-                else:
-                    # Validate filenames and paths before copying
-                    if not is_valid_filepath(str(layer.filename)):
-                        self.warning.emit(
-                            self.tr("Cloud Converter"),
-                            self.tr(
-                                "The layer '{}' has an invalid filename or path and was therefore removed from the cloud project."
-                            ).format(layer.name()),
-                        )
-                        self.project.removeMapLayer(layer)
-                        continue
 
+                        # Validate filenames and paths before copying
+                        if not is_valid_filepath(layer_source.filename):
+                            self.warning.emit(
+                                self.tr("Cloud Converter"),
+                                self.tr(
+                                    "The layer '{}' has an invalid filename or path and was therefore removed from the cloud project."
+                                ).format(layer.name()),
+                            )
+                            self.project.removeMapLayer(layer)
+                            continue
+                else:
                     layer_source.copy(self.export_dirname, list())
                 layer.setCustomProperty(
                     "QFieldSync/cloud_action", layer_source.default_cloud_action

diff --git a/qfieldsync/utils/file_utils.py b/qfieldsync/utils/file_utils.py
@@ -69,7 +69,10 @@ def is_valid_filename(filename: str) -> bool:
     Check if the filename is valid.
     """
     pattern = re.compile(
-        r'\A(?!(?:COM[0-9]|CON|LPT[0-9]|NUL|PRN|AUX|com[0-9]|con|lpt[0-9]|nul|prn|aux)|\s|[\.]{2,})[^\\\/:*"?<>|]{1,254}(?<![\s\.])\z'
+        r'^(?!.*[<>:"/\\|?*])'
+        r"(?!(?:COM[0-9]|CON|LPT[0-9]|NUL|PRN|AUX|com[0-9]|con|lpt[0-9]|nul|prn|aux)$)"
+        r'[^\\\/:*"?<>|]{1,254}'
+        r"(?<![\s\.])$"
     )
     return bool(pattern.match(filename))