rclone-api 1.1.98__tar.gz → 1.2.0__tar.gz

{rclone_api-1.1.98 → rclone_api-1.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: rclone_api
-Version: 1.1.98
+Version: 1.2.0
 Summary: rclone api in python
 Home-page: https://github.com/zackees/rclone-api
 License: BSD 3-Clause License

{rclone_api-1.1.98 → rclone_api-1.2.0}/pyproject.toml

@@ -23,7 +23,7 @@ dependencies = [
 ]
 
 # Change this with the version number bump.
-version = "1.1.98"
+version = "1.2.0"
 
 [tool.setuptools]
 package-dir = {"" = "src"}

{rclone_api-1.1.98 → rclone_api-1.2.0}/src/rclone_api/mount.py

@@ -4,6 +4,7 @@ import platform
 import shutil
 import subprocess
 import time
+import traceback
 import warnings
 import weakref
 from concurrent.futures import Future, ThreadPoolExecutor
@@ -366,8 +367,10 @@ class MultiMountFileChunker:
                         _thread.interrupt_main()
                         return Exception(e)
                     except Exception as e:
-                        stack_trace = e.__traceback__
-                        warnings.warn(f"Error fetching file chunk: {e}\n{stack_trace}")
+                        stack_trace = traceback.format_exc()
+                        warnings.warn(
+                            f"Error fetching file chunk at offset{offset} + {size}: {e}\n{stack_trace}"
+                        )
                         return e
                     finally:
                         with self.lock:

{rclone_api-1.1.98 → rclone_api-1.2.0}/src/rclone_api/s3/chunk_file.py

@@ -36,9 +36,6 @@ def file_chunker(
 ) -> None:
     count = 0
 
-    if False:
-        print(chunk_fetcher)
-
     def should_stop() -> bool:
         nonlocal count
 
@@ -128,7 +125,8 @@ def file_chunker(
                 done_part_numbers.add(part_number)
                 output.put(file_chunk)
 
-            fut = chunk_fetcher(curr_parth_num, chunk_size)
+            offset = (curr_parth_num - 1) * chunk_size
+            fut = chunk_fetcher(offset, chunk_size)
             fut.add_done_callback(on_complete)
             # wait until the output queue can accept the next chunk
             while output.full():

{rclone_api-1.1.98 → rclone_api-1.2.0}/src/rclone_api.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: rclone_api
-Version: 1.1.98
+Version: 1.2.0
 Summary: rclone api in python
 Home-page: https://github.com/zackees/rclone-api
 License: BSD 3-Clause License

{rclone_api-1.1.98 → rclone_api-1.2.0}/tests/test_s3.py

@@ -18,7 +18,7 @@ class RcloneS3Tester(unittest.TestCase):
     """Test rclone functionality."""
 
     # @unittest.skipIf(not _ENABLED, "Test not enabled")
-    @unittest.skipIf(True, "Test not enabled")
+    # @unittest.skipIf(True, "Test not enabled")
     def test_upload_chunks(self) -> None:
         """Test basic Webdav serve functionality."""
 
@@ -67,14 +67,13 @@ class RcloneS3Tester(unittest.TestCase):
             state_json = Path(tempdir) / "state.json"
 
             def simple_fetcher(
-                chunk_id: int, chunk_size: int
+                offset: int, chunk_size: int
             ) -> Future[bytes | Exception]:
                 with ThreadPoolExecutor() as executor:
 
                     def task() -> bytes | Exception:
                         with open(str(tmpfile), "rb") as f:
-                            idx = (chunk_id - 1) * chunk_size
-                            f.seek(idx * chunk_size)
+                            f.seek(offset)
                             return f.read(chunk_size)
 
                     fut = executor.submit(task)