Merge pull request #24 from zweckj/fix/byte-counting

bugfixes

Author: zweckj

onedrive_personal_sdk/clients/large_file_upload.py

@@ -154,6 +154,8 @@ async def start_upload(
         retries = 0
         quick_xor_hash = QuickXorHash()
         result = {}
+        total_uploaded_bytes = 0
+        total_progress_bytes = 0
 
         async for chunk in self._file.content_stream:
             self._buffer.buffer += chunk
@@ -168,7 +170,6 @@ async def start_upload(
                         total_uploaded_bytes : total_uploaded_bytes
                         + current_chunk_size
                     ]
-                    quick_xor_hash.update(chunk_view)
                     try:
                         chunk_result = await self._async_upload_chunk(
                             upload_session.upload_url,
@@ -250,6 +251,7 @@ async def start_upload(
                         await asyncio.sleep(2**retries)
                         continue
                     else:
+                        quick_xor_hash.update(chunk_view)
                         if "file" in chunk_result:  # last chunk, no more ranges
                             result = chunk_result
                         else:
@@ -265,8 +267,9 @@ async def start_upload(
                     retries = 0
                     self._start += current_chunk_size
                     total_uploaded_bytes += current_chunk_size
+                    total_progress_bytes += current_chunk_size
                     if self._progress_callback:
-                        self._progress_callback(total_uploaded_bytes)
+                        self._progress_callback(total_progress_bytes)
 
                     # returned range is not what we expected, fix range
                     if self._start != (
@@ -292,9 +295,9 @@ async def start_upload(
                 self._buffer.buffer,
             )
             self._start += self._buffer.length
-            total_uploaded_bytes += self._buffer.length
+            total_progress_bytes += self._buffer.length
             if self._progress_callback:
-                self._progress_callback(total_uploaded_bytes)
+                self._progress_callback(total_progress_bytes)
             # except APIError:
             #     await self._commit_file(upload_session)
 

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "onedrive-personal-sdk"
-version = "0.1.6"
+version = "0.1.7"
 license = "MIT"
 description = "A package to interact with the Microsoft Graph API for personal OneDrives."
 readme = "README.md"