Remove blocking flag

Author: harminius

mergin/client_push.py

@@ -125,11 +125,9 @@ def _split_by_type(self, changes: Dict[str, List[dict]]) -> List[Dict[str, List[
         Split raw filtered changes into two batches:
         1. Blocking: updated/removed and added files that are blocking
         2. Non-blocking: added files that are not blocking
-
-        Adds blocking key with a boolean value for each group
         """
-        blocking_changes = {"added": [], "updated": [], "removed": [], "blocking": True}
-        non_blocking_changes = {"added": [], "updated": [], "removed": [], "blocking": False}
+        blocking_changes = {"added": [], "updated": [], "removed": []}
+        non_blocking_changes = {"added": [], "updated": [], "removed": []}
 
         for f in changes.get("added", []):
             if self.is_blocking_file(f):
@@ -144,9 +142,9 @@ def _split_by_type(self, changes: Dict[str, List[dict]]) -> List[Dict[str, List[
             blocking_changes["removed"].append(f)
 
         result = []
-        if any(blocking_changes[k] for k in ("added", "updated", "removed")):
+        if any(len(v) for v in blocking_changes.values()):
             result.append(blocking_changes)
-        if any(non_blocking_changes["added"]):
+        if any(len(v) for v in non_blocking_changes.values()):
             result.append(non_blocking_changes)
 
         return result

mergin/common.py

@@ -15,7 +15,7 @@
 this_dir = os.path.dirname(os.path.realpath(__file__))
 
 
-# Error code from the public API, add to the end of enum as we handle more eror
+# Error code from the public API, add to the end of enum as we handle more error
 class ErrorCode(Enum):
     ProjectsLimitHit = "ProjectsLimitHit"
     StorageLimitHit = "StorageLimitHit"

mergin/merginproject.py

@@ -686,7 +686,7 @@ def apply_push_changes(self, changes):
         """
         For geodiff files update basefiles according to changes pushed to server.
 
-        :param changes: metadata for pulled files
+        :param changes: metadata for pushed files
         :type changes: dict[str, list[dict]]
         """
         for k, v in changes.items():