Moving function outside the primary function, and removing recursive not needed and other improvements

Author: SeqLaz

libqfieldsync/utils/file_utils.py

@@ -228,6 +228,37 @@ def is_valid_filepath(path: str) -> bool:
     return True
 
 
+def update_symbols_path_assets(symbol, new_path: Path) -> None:
+    """
+    Updates the path of a symbol layer.
+    Args:
+        symbol: The QGIS symbol (from a renderer).
+        new_path: The base path to which asset paths should be made relative to.
+    """
+    if symbol is None:
+        return
+
+    destination_dir = new_path / "assets"
+    destination_dir.mkdir(parents=True, exist_ok=True)
+
+    for symbol_layer in symbol.symbolLayers():
+        if isinstance(
+            symbol_layer, (QgsSvgMarkerSymbolLayer, QgsRasterMarkerSymbolLayer)
+        ):
+            source_path = Path(symbol_layer.path())
+
+            if not source_path.is_relative_to(new_path):
+                if source_path.exists():
+                    destination_path_file = destination_dir / source_path.name
+
+                    if not destination_path_file.exists():
+                        shutil.copy2(source_path, destination_path_file)
+
+                    symbol_layer.setPath(
+                        str(destination_path_file.relative_to(new_path))
+                    )
+
+
 def update_symbols_to_project_assets(
     layer: QgsVectorLayer, new_path: Optional[Path] = None
 ) -> None:
@@ -258,50 +289,17 @@ def update_symbols_to_project_assets(
         project_home = project.homePath()
         new_path = Path(project_home)
 
-    destination_dir = new_path / "assets"
-    destination_dir.mkdir(parents=True, exist_ok=True)
-
-    def update_symbols_path_assets(symbol):
-        """Updates the path of a symbol layer."""
-        if symbol is None:
-            return
-
-        for symbol_layer in symbol.symbolLayers():
-            if isinstance(
-                symbol_layer, (QgsSvgMarkerSymbolLayer, QgsRasterMarkerSymbolLayer)
-            ):
-                source_path = Path(symbol_layer.path())
-
-                try:
-                    source_path.relative_to(new_path)
-                    continue
-                except ValueError:
-                    # Proceed with copying
-                    pass
-
-                if source_path.exists():
-                    destination_path_file = destination_dir / source_path.name
-
-                    if not destination_path_file.exists():
-                        shutil.copy2(source_path, destination_path_file)
-
-                    symbol_layer.setPath(
-                        str(destination_path_file.relative_to(new_path))
-                    )
-
-            elif hasattr(symbol_layer, "subSymbol"):
-                # Recursively for nested symbology
-                update_symbols_path_assets(symbol_layer.subSymbol())
-
     if isinstance(renderer, QgsSingleSymbolRenderer):
         symbol = renderer.symbol()
         if symbol:
-            update_symbols_path_assets(symbol)
+            update_symbols_path_assets(symbol, new_path)
 
     elif isinstance(renderer, QgsRuleBasedRenderer):
         for rule in renderer.rootRule().children():
-            if rule.symbol():
-                update_symbols_path_assets(rule.symbol())
+            symbols = rule.symbols()
+            if symbols:
+                for symbol in symbols:
+                    update_symbols_path_assets(symbol, new_path)
 
     elif isinstance(renderer, QgsCategorizedSymbolRenderer):
         categories = renderer.categories()
@@ -311,7 +309,7 @@ def update_symbols_path_assets(symbol):
                 # if not the new symbol path is not updated.
                 category = renderer.categories()[index]
                 symbol = category.symbol().clone()
-                update_symbols_path_assets(symbol)
+                update_symbols_path_assets(symbol, new_path)
                 renderer.updateCategorySymbol(index, symbol)
 
     layer.setRenderer(renderer)