use new metadata getters

MerginMaps · Nov 27, 2023 · 1f19abe · 1f19abe
1 parent 429563b
commit 1f19abe
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/Mergin/plugin.py b/Mergin/plugin.py
@@ -313,7 +313,7 @@ def configure_db_sync(self):
 
         mp = MerginProject(project_path)
         try:
-            project_name = mp.metadata["name"]
+            project_name = mp.project_full_name()
         except InvalidProject as e:
             iface.messageBar().pushMessage(
                 "Mergin", "Current project is not a Mergin project. Please open a Mergin project first.", Qgis.Warning

diff --git a/Mergin/project_selection_dialog.py b/Mergin/project_selection_dialog.py
@@ -104,7 +104,7 @@ def status(project):
             local_changes = mp.get_push_changes()
             if local_changes["added"] or local_changes["removed"] or local_changes["updated"]:
                 return SyncStatus.LOCAL_CHANGES
-            elif compare_versions(project["version"], mp.metadata["version"]) > 0:
+            elif compare_versions(project["version"], mp.version()) > 0:
                 return SyncStatus.REMOTE_CHANGES
             else:
                 return SyncStatus.UP_TO_DATE

diff --git a/Mergin/projects_manager.py b/Mergin/projects_manager.py
@@ -157,7 +157,7 @@ def project_status(self, project_dir):
 
         try:
             mp = MerginProject(project_dir)
-            project_name = mp.metadata["name"]
+            project_name = mp.project_full_name()
         except InvalidProject as e:
             msg = f"Failed to get project status:\n\n{str(e)}"
             QMessageBox.critical(None, "Project status", msg, QMessageBox.Close)
@@ -223,7 +223,7 @@ def sync_project(self, project_dir, project_name=None):
         if project_name is None:
             mp = MerginProject(project_dir)
             try:
-                project_name = mp.metadata["name"]
+                project_name = mp.project_full_name()
             except InvalidProject as e:
                 msg = f"Failed to sync project:\n\n{str(e)}"
                 QMessageBox.critical(None, "Project syncing", msg, QMessageBox.Close)

diff --git a/Mergin/utils.py b/Mergin/utils.py
@@ -988,9 +988,8 @@ def set_qgis_project_mergin_variables():
         if same_dir(path, qgis_project_path):
             try:
                 mp = MerginProject(path)
-                metadata = mp.metadata
-                write_project_variables(owner, name, metadata.get("name"), metadata.get("version"), server)
-                return metadata.get("name")
+                write_project_variables(owner, name, mp.project_full_name(), mp.version(), server)
+                return mp.project_full_name()
             except InvalidProject:
                 remove_project_variables()
     return None