From 0ada033bacf5bd7a718c8e2aad0486a147ff9837 Mon Sep 17 00:00:00 2001 From: Johnny Sequeira Date: Wed, 2 Oct 2024 06:01:01 -0600 Subject: [PATCH 1/3] Fixing the files path issue on windows users --- libqfieldsync/utils/qgis.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libqfieldsync/utils/qgis.py b/libqfieldsync/utils/qgis.py index f109a63..dbf260d 100644 --- a/libqfieldsync/utils/qgis.py +++ b/libqfieldsync/utils/qgis.py @@ -52,7 +52,8 @@ def make_temp_qgis_file(project: QgsProject) -> str: project_backup_dir = tempfile.mkdtemp() original_filename = project.fileName() backup_filename = os.path.join(project_backup_dir, f"{project.baseName()}.qgs") - project.write(backup_filename) + # NOTE: This makes the conversion of the project mess with the datasource on Windows + # project.write(backup_filename) project.setFileName(original_filename) return backup_filename From e15a317e8327b44c9e3ae5d2a2bf423affb71078 Mon Sep 17 00:00:00 2001 From: Johnny Sequeira Date: Wed, 2 Oct 2024 06:19:42 -0600 Subject: [PATCH 2/3] Ensuring the Original project is read first --- libqfieldsync/utils/qgis.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libqfieldsync/utils/qgis.py b/libqfieldsync/utils/qgis.py index dbf260d..dab082d 100644 --- a/libqfieldsync/utils/qgis.py +++ b/libqfieldsync/utils/qgis.py @@ -42,7 +42,7 @@ def open_project(filename: str, filename_to_read: Optional[str] = None) -> bool: project = QgsProject.instance() project.clear() - is_success = project.read(filename_to_read or filename) + is_success = project.read(filename or filename_to_read) project.setFileName(filename) return is_success From 5f6c200faea6e35acbdf8a07a7c6880349bdb42f Mon Sep 17 00:00:00 2001 From: Johnny Sequeira Date: Thu, 3 Oct 2024 16:30:26 -0600 Subject: [PATCH 3/3] Removing commented code --- libqfieldsync/utils/qgis.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libqfieldsync/utils/qgis.py b/libqfieldsync/utils/qgis.py index dab082d..ea91ac3 100644 --- a/libqfieldsync/utils/qgis.py +++ b/libqfieldsync/utils/qgis.py @@ -52,8 +52,7 @@ def make_temp_qgis_file(project: QgsProject) -> str: project_backup_dir = tempfile.mkdtemp() original_filename = project.fileName() backup_filename = os.path.join(project_backup_dir, f"{project.baseName()}.qgs") - # NOTE: This makes the conversion of the project mess with the datasource on Windows - # project.write(backup_filename) + project.write(backup_filename) project.setFileName(original_filename) return backup_filename