WIP

jhollowe · Apr 4, 2024 · 2b64c12 · 2b64c12
1 parent d7419ab
commit 2b64c12
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -13,7 +13,7 @@
   ],
   "[python]": {
     "editor.codeActionsOnSave": {
-      "source.organizeImports": true
+      "source.organizeImports": "explicit"
     }
   },
   "cSpell.words": [
@@ -31,7 +31,9 @@
     "rtype",
     "sess",
     "toolbelt",
+    "UPID",
     "vmid",
+    "vzdump",
     "vztmpl"
   ],
   "autoDocstring.docstringFormat": "sphinx",

diff --git a/proxmoxer/backends/https.py b/proxmoxer/backends/https.py
@@ -16,6 +16,8 @@
 
 logger = logging.getLogger(__name__)
 logger.setLevel(level=logging.WARNING)
+progress_logger = logging.getLogger(__name__ + "_progress")
+logger.setLevel(level=logging.WARNING)
 
 STREAMING_SIZE_THRESHOLD = 10 * 1024 * 1024  # 10 MiB
 SSL_OVERFLOW_THRESHOLD = 2147483135  # 2^31 - 1 - 512
@@ -228,6 +230,11 @@ def request(
                     logger.info(
                         "Installing 'requests_toolbelt' will decrease memory used during upload"
                     )
+                    progress_logger.info(
+                        "Multipart upload not possible. No progress will be reported."
+                    )
+        else:
+            progress_logger.info("Multipart upload not used. No progress will be reported.")
 
         return super().request(
             method,
@@ -247,6 +254,16 @@ def request(
             cert,
         )
 
+    def get_progress_cb(encoder):
+        full_size = encoder.len
+
+        def progress_callback(monitor):
+            sent_size = monitor.bytes_read
+            pct_done = 100 * sent_size / (1.0 * full_size)
+            progress_logger.debug(f"Upload progress: {sent_size}/{full_size} ({pct_done}%)")
+
+        return progress_callback
+
 
 class Backend:
     def __init__(

diff --git a/proxmoxer/tools/files.py b/proxmoxer/tools/files.py
@@ -46,8 +46,8 @@ class SupportedChecksums(Enum):
     # ordered by preference for longer/stronger checksums first
     SHA512 = ChecksumInfo("sha512", 128)
     SHA256 = ChecksumInfo("sha256", 64)
-    SHA224 = ChecksumInfo("sha224", 56)
     SHA384 = ChecksumInfo("sha384", 96)
+    SHA224 = ChecksumInfo("sha224", 56)
     MD5 = ChecksumInfo("md5", 32)
     SHA1 = ChecksumInfo("sha1", 40)