Merge remote-tracking branch 'origin/dev-2025.4.1' into export_import_auth

Author: MarcelGeo

.github/workflows/packages.yml

@@ -13,7 +13,7 @@ on:
         default: '2.0.4'
         type: string
 env:
-  PYTHON_API_CLIENT_VER: ${{ inputs.REQUESTED_PYTHON_API_CLIENT_VER || '0.10.5' }}
+  PYTHON_API_CLIENT_VER: ${{ inputs.REQUESTED_PYTHON_API_CLIENT_VER || '0.11.0' }}
   GEODIFF_VER:  ${{ inputs.REQUESTED_GEODIFF_VER || '2.0.4' }}
   PYTHON_VER: "38"
   PLUGIN_NAME: Mergin  

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/metadata.txt

@@ -2,16 +2,32 @@
 [general]
 name=Mergin
 qgisMinimumVersion=3.22
-qgisMaximumVersion=3.99
+qgisMaximumVersion=4.99
 description=Handle Mergin Maps projects
-version=2025.3.3
+version=2025.4.0
 author=Lutra Consulting
 email=info@merginmaps.com
 about=Mergin Maps is a repository for storing and tracking changes to QGIS projects/data and has its mobile app for field geo-surveys. With this plugin, users can upload and sync their data to Mergin Maps service.
 ; end of mandatory metadata
 
 ; start of optional metadata
-changelog=2025.3.3
+changelog=2025.4.0
+  - Fix synchronisation issues when using OneDrive
+  - Show downloaded projects first in the browser
+  - Dropped support for out of date server version (< 2023)
+  - Improved link visibility on dark background
+  - Fixed deleting project locally on Windows
+  - Fixed cleanup of obsolete files remain in .mergin folder
+  - Fixed error when syncing newly created project
+  - Fixed local paths handling
+  - Fix handling of https prefix in custom mergin maps server url 
+  - Added better unhandled exception dialog during project sync
+  - Improved validations on forbidden characters, online basemaps and SVG rules
+  - Improved photo name preview 
+  <p>2025.3.4
+  - Introducing photo sketching for public use
+  - Added support for QGIS 4+
+  <p>2025.3.3
   - Fixed issue with the access token structure
   <p>2025.3.2
   - Added the ability to control layer sort order in the mobile app

Mergin/project_settings_widget.py

@@ -27,11 +27,11 @@
     create_tracking_layer,
     create_map_sketches_layer,
     set_tracking_layer_flags,
-    is_experimental_plugin_enabled,
     remove_prefix,
     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")
@@ -133,12 +133,6 @@ def __init__(self, parent=None):
         self.attachment_fields.selectionModel().currentChanged.connect(self.update_expression_edit)
         self.edit_photo_expression.expressionChanged.connect(self.expression_changed)
 
-        if is_experimental_plugin_enabled():
-            self.groupBox_photo_sketching.setTitle(self.groupBox_photo_sketching.title() + " (Experimental)")
-        else:
-            # Hide by default
-            self.groupBox_photo_sketching.setVisible(False)
-
     def get_sync_dir(self):
         abs_path = QFileDialog.getExistingDirectory(
             None,
@@ -184,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)
@@ -207,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
 
@@ -226,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)
@@ -247,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
@@ -29,6 +30,7 @@
     login_error_message,
     same_dir,
     send_logs,
+    storage_limit_fail,
     unhandled_exception_message,
     unsaved_project_check,
     UnsavedChangesStrategy,
@@ -37,6 +39,7 @@
     get_push_changes_batch,
     SYNC_ATTEMPTS,
     SYNC_ATTEMPT_WAIT,
+    push_error_message,
 )
 from .utils_auth import get_stored_mergin_server_url
 
@@ -114,12 +117,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,
@@ -176,18 +198,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:
@@ -302,32 +313,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:
@@ -445,7 +472,7 @@ def sync_project(self, project_dir, project_name=None):
                         # 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'])}"
+                        msg = storage_limit_fail(dlg.exception)
                     else:
                         msg = str(dlg.exception)
                     QMessageBox.critical(None, "Project sync", "Client error: \n" + msg)

Mergin/ui/ui_project_config.ui

@@ -474,7 +474,7 @@
        <item>
         <widget class="QGroupBox" name="groupBox_photo_sketching">
          <property name="title">
-          <string>Photo sketching</string>
+          <string>Photo sketching [Preview]</string>
          </property>
          <layout class="QGridLayout" name="gridLayout_7">
           <item row="1" column="0">
@@ -490,7 +490,10 @@
           <item row="0" column="0">
            <widget class="QLabel" name="label_13">
             <property name="text">
-             <string>Photo sketching lets mobile app users modify captured photos by adding freehand annotations</string>
+             <string>Photo sketching lets mobile app users draw freehand annotations directly on captured photos. This feature is in Preview: it works, but may still have some issues.</string>
+            </property>
+            <property name="wordWrap">
+              <bool>true</bool>
             </property>
            </widget>
           </item>