databutton 0.38.0__py3-none-any.whl → 0.38.1__py3-none-any.whl

databutton/experimental/folder/folder.py

@@ -1,44 +1,47 @@
-import io
-import os
-import zipfile
+from io import BytesIO
+from pathlib import Path
+from zipfile import ZIP_DEFLATED, ZipFile
 
 import databutton as db
 
 
+def normalize_path(path: str) -> Path:
+    """Normalize and return the absolute path."""
+    return Path(path).resolve()
+
+
 def zip_folder_to_bytes(folder_path: str) -> bytes:
     """Zip the contents of a folder and return as bytes."""
-    zip_bytes = io.BytesIO()  # Use BytesIO as a buffer
-    with zipfile.ZipFile(zip_bytes, "w", zipfile.ZIP_DEFLATED) as zipf:
-        for root, _, files in os.walk(folder_path):
-            for file in files:
-                file_path = os.path.join(root, file)
-                zipf.write(
-                    file_path,
-                    os.path.relpath(file_path, os.path.join(folder_path, "..")),
-                )
+    normalized_folder_path = normalize_path(folder_path)
+    zip_bytes = BytesIO()  # Use BytesIO as a buffer
+    with ZipFile(zip_bytes, "w", ZIP_DEFLATED) as zipf:
+        for file_path in normalized_folder_path.rglob("*"):
+            if file_path.is_file():
+                archive_name = file_path.relative_to(normalized_folder_path).as_posix()
+                zipf.write(file_path, archive_name)
     zip_bytes.seek(0)  # Go to the start of the BytesIO buffer
     return zip_bytes.getvalue()
 
 
 def unzip_bytes_to_folder(bytes_data: bytes, extract_path: str):
     """Unzip bytes into a folder."""
-    # Ensure the extraction path exists
-    os.makedirs(extract_path, exist_ok=True)
-    zip_bytes = io.BytesIO(bytes_data)
-    with zipfile.ZipFile(zip_bytes, "r") as zip_ref:
-        zip_ref.extractall(extract_path)
+    normalized_extract_path = normalize_path(extract_path)
+    normalized_extract_path.mkdir(parents=True, exist_ok=True)
+    zip_bytes = BytesIO(bytes_data)
+    with ZipFile(zip_bytes, "r") as zip_ref:
+        zip_ref.extractall(normalized_extract_path)
 
 
 def upload(key: str, folder_path: str):
     """Zip and upload a folder to blob storage."""
-    zipped_bytes = zip_folder_to_bytes(folder_path)
+    normalized_folder_path = normalize_path(folder_path)
+    zipped_bytes = zip_folder_to_bytes(normalized_folder_path.as_posix())
     db.storage.binary.put(key, zipped_bytes)
 
 
 def download(key: str, folder_path: str):
     """Download and unzip a folder from blob storage."""
+    normalized_folder_path = normalize_path(folder_path)
     zipped_bytes = db.storage.binary.get(key)
     if zipped_bytes is not None:
-        # Ensure the target folder exists before extraction
-        os.makedirs(folder_path, exist_ok=True)
-        unzip_bytes_to_folder(zipped_bytes, folder_path)
+        unzip_bytes_to_folder(zipped_bytes, normalized_folder_path.as_posix())

databutton/version.py

@@ -5,4 +5,4 @@ This module contains project version information.
 .. moduleauthor:: Databutton <support@databutton.com>
 """
 
-__version__ = "0.38.0"
+__version__ = "0.38.1"

{databutton-0.38.0.dist-info → databutton-0.38.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: databutton
-Version: 0.38.0
+Version: 0.38.1
 Summary: The CLI for databutton.com
 License: Databutton
 Author: Databutton

{databutton-0.38.0.dist-info → databutton-0.38.1.dist-info}/RECORD

@@ -4,7 +4,7 @@ databutton/experimental/__init__.py,sha256=S5AFlCNuvWf5HR2BUs_uzNd-GmjbpVm6eA__D
 databutton/experimental/auth/__init__.py,sha256=hqMbUs9GIVW-bJrayhWzdmSLkmU1wvFHDp6jMKwQrWc,73
 databutton/experimental/auth/get_user.py,sha256=qi6nkG35PRgeljV4J-cHdEE4nhfwJHOYv93tBXR5A9I,3314
 databutton/experimental/folder/__init__.py,sha256=27dUyREJ-08xP4OmQUtAyWWz7_hWEat6ajqiJ2xgyeo,71
-databutton/experimental/folder/folder.py,sha256=LjzUZiE4nbvk2164s0dKY-hssCuJz5rWdUSsiw-rmRA,1548
+databutton/experimental/folder/folder.py,sha256=Qr-Uo-QITVADxh22Da635HXBRdHmkfb7vQMa4NMEYOA,1793
 databutton/internal/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 databutton/internal/auth.py,sha256=MY4S7Gvb6xufmZ0SssZka0eY_18lJbxHW61cHrisnro,3182
 databutton/internal/byteutils.py,sha256=2SYQxhbK1Kj__u_ap01kPpeb1b_bcZAXSz6aqWwetUA,740
@@ -24,8 +24,8 @@ databutton/secrets/__init__.py,sha256=sI0okrfRBs2l5tcLTrKc9uUfPVVRMM9D7WED8p226t
 databutton/secrets/secrets.py,sha256=pehXsD09iKTxHaNQJ6awvIHXgRXBJrf4Xhrc11ZUeOk,3427
 databutton/storage/__init__.py,sha256=7ZNd4eQQ7lYYIe1MqCuFbFF1aAVCuj2c_zmJfaPVlDY,252
 databutton/storage/storage.py,sha256=x9LTyoAfLTWFCoy7XhA0tVUTkjldx8gYax09RkhMR1Q,20369
-databutton/version.py,sha256=nxbdNEKRX8YnlQvq3y9BsGGdJQZVOcowtLGPv4Q6zrw,175
-databutton-0.38.0.dist-info/LICENSE,sha256=c7h4pcVZapFEmqWoRTRv_S1P_aibrtDobqmlR-QtMUk,45
-databutton-0.38.0.dist-info/METADATA,sha256=30xJ0gxIGDrkcAq-m4lHtEE5YWrSc6Hch6DaDeO_nwU,2753
-databutton-0.38.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-databutton-0.38.0.dist-info/RECORD,,
+databutton/version.py,sha256=JqDMA3jkMCNbd9Wfecx-3HRU9BYk9SnrACKSZwM4D4U,175
+databutton-0.38.1.dist-info/LICENSE,sha256=c7h4pcVZapFEmqWoRTRv_S1P_aibrtDobqmlR-QtMUk,45
+databutton-0.38.1.dist-info/METADATA,sha256=6sesx89PFsYmeTsEEVoXG67lpCEy-_kDHiL4KX36_Ws,2753
+databutton-0.38.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+databutton-0.38.1.dist-info/RECORD,,