added specific functions to AsyncFileReader trait so we know where we are wrt. caching

Author: feefladder

src/ifd.rs

@@ -779,7 +779,7 @@ impl ImageFileDirectory {
         let range = self
             .get_tile_byte_range(x, y)
             .ok_or(AsyncTiffError::General("Not a tiled TIFF".to_string()))?;
-        let compressed_bytes = reader.get_bytes(range).await?;
+        let compressed_bytes = reader.get_tile_bytes(range).await?;
         Ok(Tile {
             x,
             y,
@@ -810,7 +810,7 @@ impl ImageFileDirectory {
             .collect::<AsyncTiffResult<Vec<_>>>()?;
 
         // 2: Fetch using `get_ranges
-        let buffers = reader.get_byte_ranges(byte_ranges).await?;
+        let buffers = reader.get_tile_byte_ranges(byte_ranges).await?;
 
         // 3: Create tile objects
         let mut tiles = vec![];

src/reader.rs

@@ -35,10 +35,12 @@ use crate::error::{AsyncTiffError, AsyncTiffResult};
 #[cfg_attr(not(target_arch = "wasm32"), async_trait)]
 pub trait AsyncFileReader: Debug + Send + Sync {
     /// Retrieve the bytes in `range`
+    /// This function is called when reading in IFDs
     async fn get_bytes(&self, range: Range<u64>) -> AsyncTiffResult<Bytes>;
 
     /// Retrieve multiple byte ranges. The default implementation will call `get_bytes`
     /// sequentially
+    /// This function is called when reading in IFDs
     async fn get_byte_ranges(&self, ranges: Vec<Range<u64>>) -> AsyncTiffResult<Vec<Bytes>> {
         let mut result = Vec::with_capacity(ranges.len());
 
@@ -49,6 +51,18 @@ pub trait AsyncFileReader: Debug + Send + Sync {
 
         Ok(result)
     }
+
+    /// Same as [`get_bytes`], but this function is called when retrieving
+    /// compressed tile data
+    async fn get_tile_bytes(&self, range: Range<u64>) -> AsyncTiffResult<Bytes> {
+        self.get_bytes(range).await
+    }
+
+    /// Same as [`get_byte_ranges`], but this function is only called when retrieving
+    /// compressed tile data
+    async fn get_tile_byte_ranges(&self, ranges: Vec<Range<u64>>) -> AsyncTiffResult<Vec<Bytes>> {
+        self.get_byte_ranges(ranges).await
+    }
 }
 
 /// This allows Box<dyn AsyncFileReader + '_> to be used as an AsyncFileReader,