fixed errors/warnings for all features: Added std::fs::File AsyncFileReader impl

Author: feefladder

Cargo.toml

@@ -33,9 +33,8 @@ reqwest = ["dep:reqwest"]
 object_store = ["dep:object_store"]
 
 [package.metadata.cargo-all-features]
-
 # If your crate has a large number of optional dependencies, skip them for speed
-skip_optional_dependencies = true
+# skip_optional_dependencies = true
 
 # Exclude certain features from the build matrix
 denylist = ["default"]

src/reader.rs

@@ -1,14 +1,16 @@
 //! Abstractions for network reading.
 
 use std::fmt::Debug;
-use std::io::Read;
+use std::io::{Read, Seek};
 use std::ops::Range;
 use std::sync::Arc;
 
 use byteorder::{BigEndian, LittleEndian, ReadBytesExt};
 use bytes::buf::Reader;
 use bytes::{Buf, Bytes};
-use futures::future::{BoxFuture, FutureExt, TryFutureExt};
+use futures::future::{BoxFuture, FutureExt};
+#[cfg(feature = "object_store")]
+use futures::TryFutureExt;
 #[cfg(feature = "object_store")]
 use object_store::ObjectStore;
 
@@ -68,6 +70,21 @@ impl AsyncFileReader for Box<dyn AsyncFileReader + '_> {
     }
 }
 
+impl AsyncFileReader for std::fs::File {
+    fn get_bytes(&self, range: Range<u64>) -> BoxFuture<'_, AsyncTiffResult<Bytes>> {
+        async move {
+            let mut file = self.try_clone()?;
+            file.seek(std::io::SeekFrom::Start(range.start))?;
+            let len = (range.end - range.start) as usize;
+            let mut buf = vec![0u8; len];
+            file.read_exact(&mut buf)?;
+            let res = Bytes::copy_from_slice(&buf);
+            Ok(res)
+        }
+        .boxed()
+    }
+}
+
 // #[cfg(feature = "tokio")]
 // impl<T: tokio::io::AsyncRead + tokio::io::AsyncSeek + Unpin + Debug + Send + Sync> AsyncFileReader
 //     for T

tests/image_tiff/util.rs

@@ -1,15 +1,26 @@
-use std::env::current_dir;
-use std::sync::Arc;
-
+#[cfg(feature = "object_store")]
 use async_tiff::reader::ObjectReader;
 use async_tiff::TIFF;
+#[cfg(feature = "object_store")]
 use object_store::local::LocalFileSystem;
+#[cfg(feature = "object_store")]
+use std::env::current_dir;
+use std::sync::Arc;
 
 const TEST_IMAGE_DIR: &str = "tests/image_tiff/images/";
 
+#[cfg(feature = "object_store")]
 pub(crate) async fn open_tiff(filename: &str) -> TIFF {
     let store = Arc::new(LocalFileSystem::new_with_prefix(current_dir().unwrap()).unwrap());
     let path = format!("{TEST_IMAGE_DIR}/{filename}");
     let reader = Arc::new(ObjectReader::new(store.clone(), path.as_str().into()));
     TIFF::try_open(reader).await.unwrap()
 }
+
+#[cfg(not(feature = "object_store"))]
+pub(crate) async fn open_tiff(filename: &str) -> TIFF {
+    // let store = Arc::new(LocalFileSystem::new_with_prefix(current_dir().unwrap()).unwrap());
+    let path = format!("{TEST_IMAGE_DIR}/{filename}");
+    let reader = Arc::new(std::fs::File::open(path).expect("could not open file"));
+    TIFF::try_open(reader).await.unwrap()
+}