wip python mutable

Author: kylebarron

python/src/reader.rs

@@ -1,5 +1,4 @@
 use std::ops::Range;
-use std::sync::Arc;
 
 use async_tiff::error::{AsyncTiffError, AsyncTiffResult};
 use async_tiff::reader::{AsyncFileReader, ObjectReader};
@@ -21,12 +20,12 @@ pub(crate) enum StoreInput {
 }
 
 impl StoreInput {
-    pub(crate) fn into_async_file_reader(self, path: String) -> Arc<dyn AsyncFileReader> {
+    pub(crate) fn into_async_file_reader(self, path: String) -> Box<dyn AsyncFileReader> {
         match self {
             Self::ObjectStore(store) => {
-                Arc::new(ObjectReader::new(store.into_inner(), path.into()))
+                Box::new(ObjectReader::new(store.into_inner(), path.into()))
             }
-            Self::ObspecBackend(backend) => Arc::new(ObspecReader { backend, path }),
+            Self::ObspecBackend(backend) => Box::new(ObspecReader { backend, path }),
         }
     }
 }
@@ -115,12 +114,12 @@ struct ObspecReader {
 }
 
 impl AsyncFileReader for ObspecReader {
-    fn get_bytes(&self, range: Range<u64>) -> BoxFuture<'_, AsyncTiffResult<Bytes>> {
+    fn get_bytes(&mut self, range: Range<u64>) -> BoxFuture<'_, AsyncTiffResult<Bytes>> {
         self.backend.get_range_wrapper(&self.path, range).boxed()
     }
 
     fn get_byte_ranges(
-        &self,
+        &mut self,
         ranges: Vec<Range<u64>>,
     ) -> BoxFuture<'_, AsyncTiffResult<Vec<Bytes>>> {
         self.backend.get_ranges_wrapper(&self.path, ranges).boxed()

python/src/tiff.rs

@@ -15,7 +15,7 @@ use crate::PyImageFileDirectory;
 #[pyclass(name = "TIFF", frozen)]
 pub(crate) struct PyTIFF {
     tiff: TIFF,
-    reader: Arc<dyn AsyncFileReader>,
+    reader: Box<dyn AsyncFileReader>,
 }
 
 #[pymethods]
@@ -29,13 +29,15 @@ impl PyTIFF {
         store: StoreInput,
         prefetch: u64,
     ) -> PyResult<Bound<'py, PyAny>> {
-        let reader = store.into_async_file_reader(path);
+        let mut reader = store.into_async_file_reader(path);
 
         let cog_reader = future_into_py(py, async move {
-            let metadata_fetch = PrefetchBuffer::new(reader.clone(), prefetch).await.unwrap();
-            let mut metadata_reader = TiffMetadataReader::try_open(&metadata_fetch).await.unwrap();
+            let mut metadata_fetch = PrefetchBuffer::new(&mut reader, prefetch).await.unwrap();
+            let mut metadata_reader = TiffMetadataReader::try_open(&mut metadata_fetch)
+                .await
+                .unwrap();
             let ifds = metadata_reader
-                .read_all_ifds(&metadata_fetch)
+                .read_all_ifds(&mut metadata_fetch)
                 .await
                 .unwrap();
             let tiff = TIFF::new(ifds);
@@ -57,7 +59,7 @@ impl PyTIFF {
         y: usize,
         z: usize,
     ) -> PyResult<Bound<'py, PyAny>> {
-        let reader = self.reader.clone();
+        let reader = &self.reader;
         let ifd = self
             .tiff
             .ifds()
@@ -67,7 +69,7 @@ impl PyTIFF {
             // TODO: avoid this clone; add Arc to underlying rust code?
             .clone();
         future_into_py(py, async move {
-            let tile = ifd.fetch_tile(x, y, reader.as_ref()).await.unwrap();
+            let tile = ifd.fetch_tile(x, y, reader.as_mut()).await.unwrap();
             Ok(PyTile::new(tile))
         })
     }