Don't allow trailing space for new files

Author: harminius

server/mergin/sync/files.py

@@ -13,10 +13,10 @@
 
 from .utils import (
     is_file_name_blacklisted,
-    is_qgis,
     is_supported_extension,
     is_valid_path,
     is_versioned_file,
+    has_trailing_space,
 )
 from ..app import DateTimeWithZ, ma
 
@@ -221,6 +221,14 @@ def validate(self, data, **kwargs):
                     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}"
+                )
+
 
 class ProjectFileSchema(FileSchema):
     mtime = DateTimeWithZ()

server/mergin/sync/utils.py

@@ -347,6 +347,11 @@ def is_valid_path(filepath: str) -> bool:
     )
 
 
+def has_trailing_space(filepath: str) -> bool:
+    """Check filepath for trailing spaces that makes the project impossible to download on Windows"""
+    return all(part == part.rstrip() for part in Path(filepath).parts)
+
+
 def is_supported_extension(filepath) -> bool:
     """Check whether file's extension is supported."""
     ext = os.path.splitext(filepath)[1].lower()

server/mergin/tests/test_utils.py

@@ -5,7 +5,6 @@
 import base64
 from datetime import datetime
 import json
-import os
 import pytest
 from flask import url_for, current_app
 from sqlalchemy import desc
@@ -24,6 +23,7 @@
     is_valid_path,
     get_x_accel_uri,
     wkb2wkt,
+    has_trailing_space,
 )
 from ..auth.models import LoginHistory, User
 from . import json_headers
@@ -228,6 +228,10 @@ def test_is_valid_path(client, filepath, allow):
     assert is_valid_path(filepath) == allow
 
 
+def test_has_trailing_space():
+    assert has_trailing_space("photos /lutraHQ.jpg") is False
+
+
 def test_get_x_accell_uri(client):
     """Test get_x_accell_uri"""
     client.application.config["LOCAL_PROJECTS"] = "/data/"