From bc4de8f1de3aafabdf3cba6e99f0ec45536cf3dd Mon Sep 17 00:00:00 2001 From: Etienne Trimaille Date: Fri, 24 Jan 2025 16:59:25 +0100 Subject: [PATCH] Copy sidecar files by default, add some logs --- dynamic_layers/core/generate_projects.py | 23 ++++++++++++++++++----- dynamic_layers/generate_projects.py | 2 ++ 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/dynamic_layers/core/generate_projects.py b/dynamic_layers/core/generate_projects.py index 75aded8..5e4ed8b 100644 --- a/dynamic_layers/core/generate_projects.py +++ b/dynamic_layers/core/generate_projects.py @@ -60,6 +60,8 @@ def process(self) -> bool: if not self.destination.exists(): self.destination.mkdir() + log_message(tr('Copying side-car files : {}').format(self.copy_side_car_files), Qgis.Info, self.feedback) + log_message(tr('Starting the loop over features'), Qgis.Info, self.feedback) total = 100.0 / self.coverage.featureCount() if self.coverage.featureCount() else 0 @@ -127,6 +129,11 @@ def process(self) -> bool: if self.copy_side_car_files: base_path_obj = Path(base_path) files = side_car_files(base_path_obj) + log_message( + tr('List of side-car files 1/2 : {}').format(str([str(f) for f in files])), + Qgis.Info, + self.feedback, + ) for a_file in files: destination = str(new_path) + a_file.suffix copyfile(a_file, destination) @@ -136,6 +143,11 @@ def process(self) -> bool: try: from lizmap.toolbelt.lizmap import sidecar_media_dirs dirs = sidecar_media_dirs(base_path_obj) + log_message( + tr('List of side-car files 2/2 : {}').format(str([str(f) for f in files])), + Qgis.Info, + self.feedback + ) for a_dir in dirs: rel_path = a_dir.relative_to(base_path_obj.parent) @@ -144,11 +156,11 @@ def process(self) -> bool: copytree(a_dir, new_dir_path.parent.joinpath(a_dir.stem), dirs_exist_ok=True) - log_message( - tr('Copy of directory : {}').format(str(rel_path)), - Qgis.Info, - self.feedback, - ) + # log_message( + # tr('Copy of directory : {}').format(str(rel_path)), + # Qgis.Info, + # self.feedback, + # ) except ImportError: log_message( tr('No latest Lizmap plugin installed, if it is needed in your case.'), @@ -156,6 +168,7 @@ def process(self) -> bool: self.feedback, ) + log_message(tr('Project written to new file name {}').format(new_path.name), Qgis.Info, self.feedback) self.project.setFileName(str(new_path)) self.project.write() diff --git a/dynamic_layers/generate_projects.py b/dynamic_layers/generate_projects.py index 1331ad2..2499228 100644 --- a/dynamic_layers/generate_projects.py +++ b/dynamic_layers/generate_projects.py @@ -56,6 +56,8 @@ def __init__(self, parent: QDialog = None): self.coverage.setFilters(QgsMapLayerProxyModel.Filter.VectorLayer) self.coverage.layerChanged.connect(self.layer_changed) + self.copy_side_care_files.setChecked(True) + self.destination.setStorageMode(QgsFileWidget.StorageMode.GetDirectory) self.field.setAllowEmptyFieldName(False) self.layer_changed()