rclone-api 1.3.28__py2.py3-none-any.whl → 1.4.1__py2.py3-none-any.whl

rclone_api/http_server.py

@@ -5,30 +5,19 @@ Unit test file for testing rclone mount functionality.
 import tempfile
 import warnings
 from concurrent.futures import Future, ThreadPoolExecutor
-from dataclasses import dataclass
 from pathlib import Path
+from threading import Semaphore
 from typing import Any
 
 import httpx
 
+from rclone_api.file_part import FilePart
 from rclone_api.process import Process
-from rclone_api.types import FilePart, SizeSuffix, get_chunk_tmpdir
+from rclone_api.types import Range, SizeSuffix, get_chunk_tmpdir
 
 _TIMEOUT = 10 * 60  # 10 minutes
 
 
-@dataclass
-class Range:
-    start: int
-    end: int
-
-    def to_header(self) -> dict[str, str]:
-        val = f"bytes={self.start}-{self.end-1}"
-        return {
-            "Range": val,
-        }
-
-
 _range = range
 
 
@@ -49,10 +38,10 @@ class HttpServer:
     def get_fetcher(self, path: str, n_threads: int = 16) -> "HttpFetcher":
         return HttpFetcher(self, path, n_threads=n_threads)
 
-    def get(self, path: str) -> bytes | Exception:
+    def get(self, path: str, range: Range | None = None) -> bytes | Exception:
         """Get bytes from the server."""
         with tempfile.TemporaryFile() as file:
-            self.download(path, Path(file.name), None)
+            self.download(path, Path(file.name), range)
             file.seek(0)
             return file.read()
 
@@ -124,8 +113,13 @@ class HttpServer:
         with ThreadPoolExecutor(max_workers=n_threads) as executor:
             try:
                 futures: list[Future[Path | Exception]] = []
-                for start in _range(range.start, range.end, chunk_size):
-                    end = min(start + chunk_size, range.end)
+                start: int
+                for start in _range(
+                    range.start.as_int(), range.end.as_int(), chunk_size
+                ):
+                    end = min(
+                        SizeSuffix(start + chunk_size).as_int(), range.end.as_int()
+                    )
                     r = Range(start=start, end=end)
 
                     def task(r: Range = r) -> Path | Exception:
@@ -200,11 +194,11 @@ class HttpFetcher:
         self.server = server
         self.path = path
         self.executor = ThreadPoolExecutor(max_workers=n_threads)
-        from threading import Semaphore
-
+        # Semaphore throttles the number of concurrent fetches
+        # TODO this is kind of a hack.
         self.semaphore = Semaphore(n_threads)
 
-    def fetch(
+    def bytes_fetcher(
         self, offset: int | SizeSuffix, size: int | SizeSuffix, extra: Any
     ) -> Future[FilePart]:
         if isinstance(offset, SizeSuffix):