Improve logger and filter condition

hotosm · Mar 4, 2024 · c5c5719 · c5c5719
1 parent 8be8db0
commit c5c5719
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/API/api_worker.py b/API/api_worker.py
@@ -95,22 +95,24 @@ def zip_binding(
     logging.debug("Total %s to be zipped", humanize.naturalsize(inside_file_size))
 
     system_ram = psutil.virtual_memory().total  # system RAM in bytes
-    if inside_file_size < 0.8 * system_ram:  # if less than 80%
-        logging.debug(
-            "System RAM : %s , Using default zipfile module for zipping",
-            humanize.naturalsize(system_ram),
-        )
+    if (
+        inside_file_size < 0.8 * system_ram and inside_file_size < 5 * 1024**3
+    ):  # if less than 80% or less than 5 gb
+        logging.debug("Using default zipfile module for zipping")
         with zipfile.ZipFile(
-            upload_file_path, "w", compression=zipfile.ZIP_DEFLATED, compresslevel=8
+            upload_file_path,
+            "w",
+            compression=zipfile.ZIP_DEFLATED,
+            compresslevel=9,
+            allowZip64=True,
         ) as zf:
             for file_path in pathlib.Path(working_dir).iterdir():
                 if file_path.is_file():
                     zf.write(file_path, arcname=file_path.name)
 
     else:
         logging.debug(
-            "System RAM %s is not enough for default zipfile approach hence falling to memory optimized zip",
-            humanize.naturalsize(system_ram),
+            "Using memory optimized zip",
         )
 
         paths = [