cleanup

Author: harminius

server/mergin/sync/files.py

@@ -212,20 +212,20 @@ def validate(self, data, **kwargs):
 
             if not is_valid_path(file_path):
                 raise ValidationError(
-                    f"Unsupported file name detected: {file_path}. Please remove the invalid characters."
+                    f"Unsupported file name detected: '{file_path}'. Please remove the invalid characters."
                 )
 
             if not is_supported_extension(file_path):
                 raise ValidationError(
-                    f"Unsupported file type detected: {file_path}. "
+                    f"Unsupported file type detected: '{file_path}'. "
                     f"Please remove the file or try compressing it into a ZIP file before uploading.",
                 )
         # new checks must restrict only new files not to block existing projects
         for file in data["added"]:
             file_path = file["path"]
             if has_trailing_space(file_path):
                 raise ValidationError(
-                    f"Folder name contains a trailing space. Please remove the space in: {file_path}"
+                    f"Folder name contains a trailing space. Please remove the space in: '{file_path}'."
                 )
 
 

server/mergin/sync/utils.py

@@ -101,11 +101,6 @@ def is_qgis(path: str) -> bool:
     return ext.lower() in [".qgs", ".qgz"]
 
 
-def int_version(version):
-    """Convert v<n> format of version to integer representation."""
-    return int(version.lstrip("v")) if re.match(r"v\d", version) else None
-
-
 def is_versioned_file(file):
     """Check if file is compatible with geodiff lib and hence suitable for versioning."""
     diff_extensions = [".gpkg", ".sqlite"]