Extract storage_limit_fail and push_error_message helpers to avoid duplicated error handling logic

Author: DanChov

Mergin/projects_manager.py

@@ -35,6 +35,7 @@
     UnsavedChangesStrategy,
     write_project_variables,
     bytes_to_human_size,
+    push_error_message,
 )
 from .utils_auth import get_stored_mergin_server_url
 
@@ -192,34 +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):
-                exc = dlg.exception
-                msg = str(exc)
-
-                if exc.server_code == ErrorCode.StorageLimitHit.value:
-                    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"
-
-                    msg = f"{exc.detail}\nCurrent limit: {human_limit}"
-
-                QMessageBox.critical(None, "Project sync", "Client error: " + msg)
-            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:
@@ -481,35 +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:
-                    data = dlg.exception.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"{dlg.exception.detail}\nCurrent limit: {human_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

@@ -77,7 +77,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,
@@ -1733,3 +1733,38 @@ def sanitize_path(expr: str) -> str:
     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,
+        )