Move the datasource value to be calculated before the dict

opengisch · Jul 5, 2023 · 422d6a8 · 422d6a8
1 parent 86337a2
commit 422d6a8
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/docker-qgis/utils.py b/docker-qgis/utils.py
@@ -582,6 +582,11 @@ def get_layers_data(project: QgsProject) -> Dict[str, Dict]:
         error = layer.error()
         layer_id = layer.id()
         layer_source = LayerSource(layer)
+        datasource = None
+
+        if layer.dataProvider():
+            datasource = layer.dataProvider().uri().uri()
+
         layers_by_id[layer_id] = {
             "id": layer_id,
             "name": layer.name(),
@@ -600,9 +605,7 @@ def get_layers_data(project: QgsProject) -> Dict[str, Dict]:
                 "QFieldSync/unsupported_source_pk"
             ),
             "is_valid": layer.isValid(),
-            "datasource": layer.dataProvider().uri().uri()
-            if layer.dataProvider()
-            else None,
+            "datasource": datasource,
             "type": layer.type(),
             "type_name": layer.type().name,
             "error_code": "no_error",