Merge pull request #853 from MerginMaps/dev-2026.1.0

Dev 2026.1.0

Author: MarcelGeo

Mergin/create_project_wizard.py

@@ -170,6 +170,7 @@ def check_input(self):
         if not self.project_workspace_cbo.currentData(Qt.ItemDataRole.UserRole):
             self.create_warning("You do not have permissions to create a project in this workspace!")
             return
+
         proj_name = self.project_name_ledit.text().strip()
         if not proj_name:
             self.create_warning("Project name missing!")
@@ -181,6 +182,7 @@ def check_input(self):
         path_text = self.path_ledit.text()
         if not path_text:
             return
+
         warn = ""
         if not os.path.exists(path_text):
             self.create_warning("The path does not exist")
@@ -191,6 +193,11 @@ def check_input(self):
         else:
             proj_dir = os.path.join(path_text, proj_name)
 
+        for part in Path(proj_dir).parts:
+            if part != part.rstrip():
+                self.create_warning(f"The folder name '{part}' cannot end with a space!")
+                return
+
         if os.path.exists(proj_dir):
             is_mergin = check_mergin_subdirs(proj_dir)
         else:
@@ -199,6 +206,7 @@ def check_input(self):
         if not self.for_current_proj:
             if os.path.exists(proj_dir):
                 warn = f"Selected directory:\n{proj_dir}\nalready exists."
+
         if not warn and not os.path.isabs(proj_dir):
             warn = "Incorrect project name!"
         if not warn and is_mergin:

Mergin/project_settings_widget.py

@@ -31,6 +31,7 @@
     invalid_filename_character,
     qvariant_to_string,
     escape_html_minimal,
+    sanitize_path,
 )
 
 ui_file = os.path.join(os.path.dirname(os.path.realpath(__file__)), "ui", "ui_project_config.ui")
@@ -177,14 +178,13 @@ def expression_changed(self, expression):
         field_name = None
         if index.isValid():
             item = self.attachments_model.item(index.row(), 1)
-            item.setData(
-                self.edit_photo_expression.expression(),
-                AttachmentFieldsModel.EXPRESSION,
-            )
+            expr = self.edit_photo_expression.expression()
+            clean_expr = sanitize_path(expr)
+            item.setData(clean_expr, AttachmentFieldsModel.EXPRESSION)
             layer = QgsProject.instance().mapLayer(item.data(AttachmentFieldsModel.LAYER_ID))
             field_name = item.data(AttachmentFieldsModel.FIELD_NAME)
 
-        self.update_preview(expression, layer, field_name)
+        self.update_preview(clean_expr, layer, field_name)
 
     def update_expression_edit(self, current, previous):
         item = self.attachments_model.item(current.row(), 1)
@@ -200,7 +200,7 @@ def update_expression_edit(self, current, previous):
         self.update_preview(exp, layer, field_name)
 
     def update_preview(self, expression, layer, field_name):
-        if expression == "":
+        if not expression:
             self.label_preview.setText("")
             return
 
@@ -219,12 +219,12 @@ def update_preview(self, expression, layer, field_name):
         exp = QgsExpression(expression)
         exp.prepare(context)
         if exp.hasParserError():
-            self.label_preview.setText(f"{exp.parserErrorString()}")
+            self.label_preview.setText(exp.parserErrorString())
             return
 
         val = exp.evaluate(context)
         if exp.hasEvalError():
-            self.label_preview.setText(f"{exp.evalErrorString()}")
+            self.label_preview.setText(exp.evalErrorString())
             return
 
         str_val = qvariant_to_string(val)
@@ -240,6 +240,7 @@ def update_preview(self, expression, layer, field_name):
                 f"The file name '{filename_display}.jpg' contains an invalid character. Do not use '{invalid_char_display}' character in the file name."
             )
             return
+
         config = layer.fields().field(field_name).editorWidgetSetup().config()
         target_dir = resolve_target_dir(layer, config)
         prefix = prefix_for_relative_path(

Mergin/projects_manager.py

@@ -5,6 +5,7 @@
 from urllib.parse import urlparse
 from pathlib import Path
 import posixpath
+import json
 
 from qgis.core import QgsProject, Qgis, QgsApplication
 from qgis.utils import iface, OverrideCursor
@@ -34,6 +35,7 @@
     UnsavedChangesStrategy,
     write_project_variables,
     bytes_to_human_size,
+    push_error_message,
 )
 from .utils_auth import get_stored_mergin_server_url
 
@@ -111,12 +113,31 @@ def create_project(self, project_name, project_dir, is_public, namespace):
                         "Please try renaming the project."
                     )
                 elif e.server_code == ErrorCode.ProjectsLimitHit.value:
+                    data = e.server_response
+                    if isinstance(data, str):
+                        try:
+                            data = json.loads(data)  # convert string to json
+                        except json.JSONDecodeError:
+                            data = {}
+
+                    quota = data.get("projects_quota", "unknown")
+
                     msg = (
                         "Maximum number of projects reached. Please upgrade your subscription to create new projects.\n"
-                        f"Projects quota: {e.server_response['projects_quota']}"
+                        f"Projects quota: {quota}"
                     )
                 elif e.server_code == ErrorCode.StorageLimitHit.value:
-                    msg = f"{e.detail}\nCurrent limit: {bytes_to_human_size(e.server_response['storage_limit'])}"
+                    data = e.server_response
+                    if isinstance(data, str):
+                        try:
+                            data = json.loads(data)
+                        except json.JSONDecodeError:
+                            data = {}
+
+                    storage_limit = data.get("storage_limit")
+                    human_limit = bytes_to_human_size(storage_limit) if storage_limit is not None else "unknown"
+
+                    msg = f"{e.detail}\nCurrent limit: {human_limit}"
 
                 QMessageBox.critical(
                     None,
@@ -172,18 +193,7 @@ def create_project(self, project_name, project_dir, is_public, namespace):
         dlg.exec()  # blocks until success, failure or cancellation
 
         if dlg.exception:
-            # push failed for some reason
-            if isinstance(dlg.exception, LoginError):
-                login_error_message(dlg.exception)
-            elif isinstance(dlg.exception, ClientError):
-                QMessageBox.critical(None, "Project sync", "Client error: " + str(dlg.exception))
-            else:
-                unhandled_exception_message(
-                    dlg.exception_details(),
-                    "Project sync",
-                    f"Something went wrong while synchronising your project {project_name}.",
-                    self.mc,
-                )
+            push_error_message(dlg, project_name, self.plugin, self.mc)
             return True
 
         if not dlg.is_complete:
@@ -298,32 +308,48 @@ def reset_local_changes(self, project_dir: str, files_to_reset=None):
 
         current_project_filename = os.path.normpath(QgsProject.instance().fileName())
         current_project_path = os.path.normpath(QgsProject.instance().absolutePath())
+
+        # Windows-specific behavior:
+        # When a project is opened from this directory, QGIS may keep GPKG file handles
+        # for a short time after closing the project. The same workaround is used in
+        # `close_project_and_fix_pull()` (unfinished pull handling).
+        delay = 0
         if current_project_path == os.path.normpath(project_dir):
             QgsProject.instance().clear()
+            QApplication.processEvents()
+            delay = 2500  # allow OS to release locked GPKG handles
 
-        try:
-            self.mc.reset_local_changes(project_dir, files_to_reset)
-            if files_to_reset:
-                msg = f"File {files_to_reset} was successfully reset"
-            else:
-                msg = "Project local changes were successfully reset"
-            QMessageBox.information(
-                None,
-                "Project reset local changes",
-                msg,
-                QMessageBox.StandardButton.Close,
-            )
+        def do_reset():
+            try:
+                self.mc.reset_local_changes(project_dir, files_to_reset)
 
-        except Exception as e:
-            msg = f"Failed to reset local changes:\n\n{str(e)}"
-            QMessageBox.critical(
-                None,
-                "Project reset local changes",
-                msg,
-                QMessageBox.StandardButton.Close,
-            )
+                if files_to_reset:
+                    msg = f"File {files_to_reset} was successfully reset"
+                else:
+                    msg = "Project local changes were successfully reset"
+
+                QMessageBox.information(
+                    None,
+                    "Project reset local changes",
+                    msg,
+                    QMessageBox.StandardButton.Close,
+                )
+
+            except Exception as e:
+                msg = f"Failed to reset local changes:\n\n{str(e)}"
+                QMessageBox.critical(
+                    None,
+                    "Project reset local changes",
+                    msg,
+                    QMessageBox.StandardButton.Close,
+                )
+
+            # Reopen the project after successful or failed reset
+            self.open_project(os.path.dirname(current_project_filename))
 
-        self.open_project(os.path.dirname(current_project_filename))
+        # Run the reset after delay (0 ms on Linux/macOS, 2500 ms on Windows)
+        # This mirrors the pattern from unfinished pull resolution.
+        QTimer.singleShot(delay, do_reset)
 
     def sync_project(self, project_dir, project_name=None):
         if not project_dir:
@@ -429,27 +455,7 @@ def sync_project(self, project_dir, project_name=None):
             self.open_project(project_dir)
 
         if dlg.exception:
-            # push failed for some reason
-            if isinstance(dlg.exception, LoginError):
-                login_error_message(dlg.exception)
-            elif isinstance(dlg.exception, ClientError):
-                if dlg.exception.http_error == 400 and "Another process" in dlg.exception.detail:
-                    # To note we check for a string since error in flask doesn't return server error code
-                    msg = "Somebody else is syncing, please try again later"
-                elif dlg.exception.server_code == ErrorCode.StorageLimitHit.value:
-                    msg = f"{dlg.exception.detail}\nCurrent limit: {bytes_to_human_size(dlg.exception.server_response['storage_limit'])}"
-                else:
-                    msg = str(dlg.exception)
-                QMessageBox.critical(None, "Project sync", "Client error: \n" + msg)
-            elif isinstance(dlg.exception, AuthTokenExpiredError):
-                self.plugin.auth_token_expired()
-            else:
-                unhandled_exception_message(
-                    dlg.exception_details(),
-                    "Project sync",
-                    f"Something went wrong while synchronising your project {project_name}.",
-                    self.mc,
-                )
+            push_error_message(dlg, project_name, self.plugin, self.mc)
             return
 
         if dlg.is_complete:

Mergin/utils.py

@@ -76,7 +76,7 @@
 
 try:
     from .mergin.common import ClientError, ErrorCode, LoginError, InvalidProject
-    from .mergin.client import MerginClient, ServerType
+    from .mergin.client import MerginClient, ServerType, AuthTokenExpiredError
     from .mergin.client_pull import (
         download_project_async,
         download_project_is_running,
@@ -1312,7 +1312,16 @@ def is_valid_name(name):
     """
     return (
         re.match(
-            r".*[\@\#\$\%\^\&\*\(\)\{\}\[\]\?\'\"`,;\:\+\=\~\\\/\|\<\>].*|^[\s^\.].*$|^CON$|^PRN$|^AUX$|^NUL$|^COM\d$|^LPT\d|^support$|^helpdesk$|^merginmaps$|^lutraconsulting$|^mergin$|^lutra$|^input$|^admin$|^sales$|^$",
+            r".*[@#$%\^&\*\(\)\{\}\[\]\?\'\"`,;:\+\=\~\\\/\|<>].*"
+            r"|^[\s^\.].*$"
+            r"|\.+$"
+            r"|\s+$"
+            r"|[\x00-\x1F]"
+            r"|^\.$|^\.\.$"
+            r"|^CON$|^PRN$|^AUX$|^NUL$"
+            r"|^COM\d$|^LPT\d$"
+            r"|^support$|^helpdesk$|^merginmaps$|^lutraconsulting$"
+            r"|^mergin$|^lutra$|^input$|^admin$|^sales$|^$",
             name,
             re.IGNORECASE,
         )
@@ -1715,3 +1724,48 @@ def escape_html_minimal(s: str) -> str:
     for char, escaped in replacements.items():
         s = s.replace(char, escaped)
     return s
+
+
+def sanitize_path(expr: str) -> str:
+    if not expr:
+        return expr
+    parts = expr.split("/")
+    cleaned = [p.rstrip() for p in parts]
+    return "/".join(cleaned)
+
+
+def storage_limit_fail(exc):
+    data = exc.server_response
+    if isinstance(data, str):
+        try:
+            data = json.loads(data)
+        except json.JSONDecodeError:
+            data = {}
+    storage_limit = data.get("storage_limit")
+    human_limit = bytes_to_human_size(storage_limit) if storage_limit is not None else "unknown"
+    return f"{exc.detail}\nCurrent limit: {human_limit}"
+
+
+def push_error_message(dlg, project_name, plugin, mc):
+    if isinstance(dlg.exception, LoginError):
+        login_error_message(dlg.exception)
+    elif isinstance(dlg.exception, ClientError):
+        exc = dlg.exception
+
+        if exc.http_error == 400 and "Another process" in exc.detail:
+            msg = "Somebody else is syncing, please try again later"
+        elif exc.server_code == ErrorCode.StorageLimitHit.value:
+            msg = storage_limit_fail(exc)
+        else:
+            msg = str(exc)
+
+        QMessageBox.critical(None, "Project sync", "Client error: \n" + msg)
+    elif isinstance(dlg.exception, AuthTokenExpiredError):
+        plugin.auth_token_expired()
+    else:
+        unhandled_exception_message(
+            dlg.exception_details(),
+            "Project sync",
+            f"Something went wrong while synchronising your project {project_name}.",
+            mc,
+        )

Mergin/validation.py

@@ -299,7 +299,6 @@ def check_project_relations(self):
 
             # check fields are unique
             self._check_field_unique(parent_layer, parent_fields)
-            self._check_field_unique(child_layer, child_fields)
 
             # check that fields used in relation are not primary keys
             if parent_layer.dataProvider().storageType() == "GPKG":
@@ -330,7 +329,6 @@ def check_value_relation(self):
                     # and is not a primary key
                     if child_layer.dataProvider().storageType() == "GPKG":
                         idx = child_layer.fields().indexFromName(str(cfg["Key"]))
-                        self._check_field_unique(child_layer, [idx])
                         self._check_primary_keys(child_layer, [idx])
 
     def _check_field_unique(self, layer, fields):