rclone-api 1.2.6__py2.py3-none-any.whl → 1.2.8__py2.py3-none-any.whl

rclone_api/mount.py

@@ -288,6 +288,32 @@ def _cache_dir_delete_on_exit(cache_dir: Path) -> None:
             warnings.warn(f"Error removing cache directory {cache_dir}: {e}")
 
 
+def _read_from_mount_task(
+    offset: int, size: int, path: Path, verbose: bool
+) -> bytes | Exception:
+    if verbose or True:
+        print(f"Fetching chunk: offset={offset}, size={size}, path={path}")
+    try:
+        with path.open("rb") as f:
+            f.seek(offset)
+            sz = f.read(size)
+            assert len(sz) == size, f"Invalid read size: {len(sz)}"
+            return sz
+    except KeyboardInterrupt as e:
+        import _thread
+
+        warnings.warn(f"Error fetching file chunk: {e}")
+
+        _thread.interrupt_main()
+        return Exception(e)
+    except Exception as e:
+        stack_trace = traceback.format_exc()
+        warnings.warn(
+            f"Error fetching file chunk at offset {offset} + {size}: {e}\n{stack_trace}"
+        )
+        return e
+
+
 class MultiMountFileChunker:
     def __init__(
         self,
@@ -319,89 +345,34 @@ class MultiMountFileChunker:
     def fetch(self, offset: int, size: int) -> Future[bytes | Exception]:
         if self.verbose:
             print(f"Fetching data range: offset={offset}, size={size}")
+
+        assert size > 0, f"Invalid size: {size}"
+        assert offset >= 0, f"Invalid offset: {offset}"
+        assert (
+            offset + size <= self.filesize
+        ), f"Invalid offset + size: {offset} + {size} ({offset+size}) <= {self.filesize}"
+
         try:
-            try:
-                if offset + size > self.filesize:
-                    size = self.filesize - offset
-                assert (
-                    offset + size <= self.filesize
-                ), f"Invalid offset + size: {offset + size}, it is beyond the end of the file."
-                assert size > 0, f"Invalid size: {size}"
-                assert offset >= 0, f"Invalid offset: {offset}"
-            except AssertionError as e:
-                warnings.warn(f"Invalid chunk request: {e}")
-                # return ValueError(e)
-                # return self.executor.submit(lambda: Exception(e))
-                err = Exception(e)
-                return self.executor.submit(lambda: err)
-
-            chunks: list[tuple[int, int]] = []
-            start = offset
-            end = offset + size
-            while start < end:
-                chunk_size = min(self.chunk_size.as_int(), end - start)
-                chunks.append((start, chunk_size))
-                start += chunk_size
-
-            futures: list[Future[bytes | Exception]] = []
-            for start, chunk_size in chunks:
-                self.semaphore.acquire()
+            self.semaphore.acquire()
+            with self.lock:
+                mount = self.mounts_availabe.pop()
+                self.mounts_processing.append(mount)
+
+            path = mount.mount_path / self.filename
+
+            def task(
+                offset=offset, size=size, path=path, mount=mount, verbose=self.verbose
+            ) -> bytes | Exception:
+                out = _read_from_mount_task(
+                    offset=offset, size=size, path=path, verbose=verbose
+                )
                 with self.lock:
-                    mount = self.mounts_availabe.pop()
-                    self.mounts_processing.append(mount)
-
-                path = mount.mount_path / self.filename
+                    self.mounts_processing.remove(mount)
+                    self.mounts_availabe.append(mount)
+                    self.semaphore.release()
+                return out
 
-                def task(
-                    offset=start, size=chunk_size, path=path, mount=mount
-                ) -> bytes | Exception:
-                    if self.verbose:
-                        print(
-                            f"Fetching chunk: offset={offset}, size={size}, path={path}"
-                        )
-                    try:
-                        # make sure we don't overflow the file size
-                        # assert (
-                        #     offset + size <= self.chunk_size.as_int()
-                        # ), f"Invalid offset + size: {offset + size}, it is beyond the end of the file."
-                        if offset + size > self.filesize:
-                            size = self.filesize - offset
-                        with path.open("rb") as f:
-                            f.seek(offset)
-                            return f.read(size)
-                    except KeyboardInterrupt as e:
-                        import _thread
-
-                        warnings.warn(f"Error fetching file chunk: {e}")
-
-                        _thread.interrupt_main()
-                        return Exception(e)
-                    except Exception as e:
-                        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:
-                            self.mounts_processing.remove(mount)
-                            self.mounts_availabe.append(mount)
-                            self.semaphore.release()
-
-                fut = self.executor.submit(task)
-                futures.append(fut)
-
-            def combine(futs: list[Future[bytes | Exception]]) -> bytes | Exception:
-                finished_list: list[bytes | Exception] = [f.result() for f in futs]
-                bytes_list = [f for f in finished_list if isinstance(f, bytes)]
-                if len(bytes_list) != len(finished_list):
-                    exceptions = [f for f in finished_list if isinstance(f, Exception)]
-                    return Exception(f"Error fetching file chunk: {exceptions}")
-                return b"".join(bytes_list)
-
-            if len(futures) == 1:
-                return futures[0]
-            fut = self.executor.submit(combine, futures)
+            fut = self.executor.submit(task)
             return fut
         except Exception as e:
             warnings.warn(f"Error fetching file chunk: {e}")

{rclone_api-1.2.6.dist-info → rclone_api-1.2.8.dist-info}/METADATA

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

{rclone_api-1.2.6.dist-info → rclone_api-1.2.8.dist-info}/RECORD

@@ -11,7 +11,7 @@ rclone_api/exec.py,sha256=Pd7pUBd8ib5MzqvMybG2DQISPRbDRu20VjVRL2mLAVY,1076
 rclone_api/file.py,sha256=EP5yT2dZ0H2p7CY5n0y5k5pHhIliV25pm8KOwBklUTk,1863
 rclone_api/filelist.py,sha256=xbiusvNgaB_b_kQOZoHMJJxn6TWGtPrWd2J042BI28o,767
 rclone_api/group_files.py,sha256=H92xPW9lQnbNw5KbtZCl00bD6iRh9yRbCuxku4j_3dg,8036
-rclone_api/mount.py,sha256=yklGrFzqADpxE8oK6PQCt78ZryK4JmU8lqv4S8cgroA,15234
+rclone_api/mount.py,sha256=qdfPatPKGAAaNexJQCvunq_MdBJL6NSlGmin8cHCXGg,13255
 rclone_api/process.py,sha256=rBj_S86jC6nqCYop-jq8r9eMSteKeObxUrJMgH8LZvI,5084
 rclone_api/rclone.py,sha256=V4oeepsleic2llCA7JekMw1iOwN7uYE3ktJ-gEA7wcw,49277
 rclone_api/remote.py,sha256=O9WDUFQy9f6oT1HdUbTixK2eg0xtBBm8k4Xl6aa6K00,431
@@ -33,9 +33,9 @@ rclone_api/s3/chunk_types.py,sha256=2n9U1BZ_5mcpoLLbSqkhvzgKj814jtSMnih9CWKcChU,
 rclone_api/s3/create.py,sha256=wgfkapv_j904CfKuWyiBIWJVxfAx_ftemFSUV14aT68,3149
 rclone_api/s3/types.py,sha256=ZUw9s164wljCEMTS4CoHXNzFIhYJEgKD6NDAu-RXyr8,1551
 rclone_api/s3/upload_file_multipart.py,sha256=aDaLF2FWSvU_jurxiFphGZBncvkPqWN47VFNzYSSTWM,10906
-rclone_api-1.2.6.dist-info/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
-rclone_api-1.2.6.dist-info/METADATA,sha256=zYEyLONtUobgqIBRwPN_iQ1y0rmKFzfT-JKbtt2wXLg,4536
-rclone_api-1.2.6.dist-info/WHEEL,sha256=rF4EZyR2XVS6irmOHQIJx2SUqXLZKRMUrjsg8UwN-XQ,109
-rclone_api-1.2.6.dist-info/entry_points.txt,sha256=TV8kwP3FRzYwUEr0RLC7aJh0W03SAefIJNXTJ-FdMIQ,200
-rclone_api-1.2.6.dist-info/top_level.txt,sha256=EvZ7uuruUpe9RiUyEp25d1Keq7PWYNT0O_-mr8FCG5g,11
-rclone_api-1.2.6.dist-info/RECORD,,
+rclone_api-1.2.8.dist-info/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
+rclone_api-1.2.8.dist-info/METADATA,sha256=eWhq_lLs9m_Vp01kxODo85kaTye0kNaizIDMFXeIlmY,4536
+rclone_api-1.2.8.dist-info/WHEEL,sha256=rF4EZyR2XVS6irmOHQIJx2SUqXLZKRMUrjsg8UwN-XQ,109
+rclone_api-1.2.8.dist-info/entry_points.txt,sha256=TV8kwP3FRzYwUEr0RLC7aJh0W03SAefIJNXTJ-FdMIQ,200
+rclone_api-1.2.8.dist-info/top_level.txt,sha256=EvZ7uuruUpe9RiUyEp25d1Keq7PWYNT0O_-mr8FCG5g,11
+rclone_api-1.2.8.dist-info/RECORD,,