move file size to consts

Author: MarcelGeo

mergin/client_push.py

@@ -495,6 +495,6 @@ def get_push_changes_batch(mc, mp: MerginProject) -> Tuple[LocalProjectChanges,
         )
     except ChangesValidationError as e:
         raise ClientError(
-            f"Some files exceeded maximum upload size. Files: {', '.join([c.path for c in e.invalid_changes])}. Maximum size for media files is {e.max_media_upload_size / (1024**3)} GB and for geopackage files {e.max_versioned_upload_size / (1024**3)} GB."
+            f"Some files exceeded maximum upload size. Files: {', '.join([c.path for c in e.invalid_changes])}. Maximum size for media files is {MAX_UPLOAD_MEDIA_SIZE / (1024**3)} GB and for geopackage files {MAX_UPLOAD_VERSIONED_SIZE / (1024**3)} GB."
         )
     return local_changes, sum(len(v) for v in changes.values())

mergin/local_changes.py

@@ -10,11 +10,9 @@
 
 # The custom exception
 class ChangesValidationError(Exception):
-    def __init__(self, message, invalid_changes=[], max_media_upload_size=None, max_versioned_upload_size=None):
+    def __init__(self, message, invalid_changes=[]):
         super().__init__(message)
         self.invalid_changes = invalid_changes if invalid_changes is not None else []
-        self.max_media_upload_size = max_media_upload_size
-        self.max_versioned_upload_size = max_versioned_upload_size
 
 
 @dataclass
@@ -96,8 +94,6 @@ def __post_init__(self):
                 oversize_changes.append(change)
         if oversize_changes:
             error = ChangesValidationError("Some files exceed the maximum upload size", oversize_changes)
-            error.max_media_upload_size = MAX_UPLOAD_MEDIA_SIZE
-            error.max_versioned_upload_size = MAX_UPLOAD_VERSIONED_SIZE
             raise error
 
         if total_changes > MAX_UPLOAD_CHANGES:

mergin/merginproject.py

@@ -21,7 +21,7 @@
     conflicted_copy_file_name,
     edit_conflict_file_name,
 )
-from .local_changes import LocalChange
+from .local_changes import FileChange
 
 this_dir = os.path.dirname(os.path.realpath(__file__))
 
@@ -470,7 +470,7 @@ def get_push_changes(self):
         changes["updated"] = [f for f in changes["updated"] if f not in not_updated]
         return changes
 
-    def copy_versioned_file_for_upload(self, f: LocalChange, tmp_dir: str) -> str:
+    def copy_versioned_file_for_upload(self, f: FileChange, tmp_dir: str) -> str:
         """
         Make a temporary copy of the versioned file using geodiff, to make sure that we have full
         content in a single file (nothing left in WAL journal)