Cleanup and fix getting diff from dictionary to be more safe

Author: MarcelGeo

mergin/local_changes.py

@@ -13,7 +13,7 @@ class BaseLocalChange:
 class LocalChange(BaseLocalChange):
     origin_checksum: Optional[str] = None
     chunks: List[str] = field(default_factory=list)
-    diff: dict = field(default_factory=dict)  # Assuming diff is a dict with relevant data
+    diff: Optional[dict] = None 
     upload_file: Optional[str] = None
 
     def get_diff(self) -> Optional[BaseLocalChange]:

mergin/merginproject.py

@@ -439,7 +439,6 @@ def get_push_changes(self):
             diff_id = str(uuid.uuid4())
             diff_name = path + "-diff-" + diff_id
             diff_file = self.fpath_meta(diff_name)
-            print(f"Creating changeset for {path} - {diff_name}")
             try:
                 self.geodiff.create_changeset(origin_file, current_file, diff_file)
                 if self.geodiff.has_changes(diff_file):
@@ -704,13 +703,14 @@ def apply_push_changes(self, changes):
                     self.geodiff.make_copy_sqlite(self.fpath(path), basefile)
                 elif k == "updated":
                     # in case for geopackage cannot be created diff (e.g. forced update with committed changes from wal file)
-                    if "diff" not in item:
+                    diff = item.get("diff")
+                    if not diff:
                         self.log.info("updating basefile (copy) for: " + path)
                         self.geodiff.make_copy_sqlite(self.fpath(path), basefile)
                     else:
                         self.log.info("updating basefile (diff) for: " + path)
                         # better to apply diff to previous basefile to avoid issues with geodiff tmp files
-                        changeset = self.fpath_meta(item["diff"]["path"])
+                        changeset = self.fpath_meta(diff["path"])
                         patch_error = self.apply_diffs(basefile, [changeset])
                         if patch_error:
                             # in case of local sync issues it is safier to remove basefile, next time it will be downloaded from server