Merge pull request #673 from opengisch/QF-4976-shared_datasets

refactor(localized): rename localized_datasets project to `shared_datasets`

Author: suricactus

qfieldsync/core/cloud_api.py

@@ -56,6 +56,8 @@
 from qfieldsync.core.preferences import Preferences
 from qfieldsync.utils.qt_utils import strip_html
 
+LOCALIZED_DATASETS_PROJECT_NAME = "shared_datasets"
+
 
 class CloudException(Exception):
     def __init__(self, reply, exception: Optional[Exception] = None):
@@ -755,20 +757,26 @@ def get_or_create_localized_datasets_project(
         try:
             # Check if the project is already in the projects cache
             for project in self.projects_cache.projects:
-                if project.name == "localized_datasets" and project.owner == owner:
+                if (
+                    project.name == LOCALIZED_DATASETS_PROJECT_NAME
+                    and project.owner == owner
+                ):
                     return project
 
             # If not, refresh the projects cache and check again
             self.projects_cache.refresh_not_async()
             for project in self.projects_cache.projects:
-                if project.name == "localized_datasets" and project.owner == owner:
+                if (
+                    project.name == LOCALIZED_DATASETS_PROJECT_NAME
+                    and project.owner == owner
+                ):
                     return project
 
             # We're finally sure it's not present yet, create one
             reply = self.create_project(
-                name="localized_datasets",
+                name=LOCALIZED_DATASETS_PROJECT_NAME,
                 owner=owner,
-                description="Localized datasets",
+                description="",
                 private=True,
             )
             loop = QEventLoop()
@@ -777,7 +785,10 @@ def get_or_create_localized_datasets_project(
 
             self.projects_cache.refresh_not_async()
             for project in self.projects_cache.projects:
-                if project.name == "localized_datasets" and project.owner == owner:
+                if (
+                    project.name == LOCALIZED_DATASETS_PROJECT_NAME
+                    and project.owner == owner
+                ):
                     return project
 
         except Exception as err:

qfieldsync/core/cloud_transferrer.py

@@ -187,7 +187,7 @@ def sync(
         self.throttled_uploader_for_localized_datasets = ThrottledFileTransferrer(
             self.network_manager,
             self.localized_datasets_project,
-            self._files_to_upload_for_localized_datasets.values(),
+            list(self._files_to_upload_for_localized_datasets.values()),
             FileTransfer.Type.UPLOAD,
             use_file_local_dir=True,
         )
@@ -602,8 +602,11 @@ def _on_finished(self) -> None:
                 )
         except Exception as err:
             self.error = err
-            if self.fs_filename.is_file():
-                self.fs_filename.unlink()
+
+            # remove partially downloaded files
+            if self.type == FileTransfer.Type.DOWNLOAD:
+                if self.fs_filename.is_file():
+                    self.fs_filename.unlink()
 
         self.finished.emit()