fix(oay): add some error handle (#2879)

* some error handle * split `map_or_else` into `map` & `map_err` * update
apache · Aug 19, 2023 · 2048ee9 · 2048ee9
1 parent f4cd502
commit 2048ee9
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 14 deletions.
diff --git a/bin/oay/src/services/webdav/webdav_dir_entry.rs b/bin/oay/src/services/webdav/webdav_dir_entry.rs
@@ -16,11 +16,11 @@
 // under the License.
 
 use dav_server::fs::DavDirEntry;
-use dav_server::fs::DavMetaData;
 use futures::FutureExt;
 use opendal::Entry;
 use opendal::Operator;
 
+use super::webdav_file::convert_error;
 use super::webdav_metadata::WebdavMetaData;
 
 pub struct WebDAVDirEntry {
@@ -35,8 +35,13 @@ impl DavDirEntry for WebDAVDirEntry {
 
     fn metadata(&self) -> dav_server::fs::FsFuture<Box<dyn dav_server::fs::DavMetaData>> {
         async move {
-            let metedata = self.op.stat(self.dir_entry.path()).await.unwrap();
-            Ok(Box::new(WebdavMetaData::new(metedata)) as Box<dyn DavMetaData>)
+            self.op
+                .stat(self.dir_entry.path())
+                .await
+                .map(|metadata| {
+                    Box::new(WebdavMetaData::new(metadata)) as Box<dyn dav_server::fs::DavMetaData>
+                })
+                .map_err(convert_error)
         }
         .boxed()
     }

diff --git a/bin/oay/src/services/webdav/webdav_file.rs b/bin/oay/src/services/webdav/webdav_file.rs
@@ -39,25 +39,24 @@ impl DavFile for WebdavFile {
     fn read_bytes(&mut self, count: usize) -> FsFuture<Bytes> {
         async move {
             let file_path = self.path.as_url_string();
-            let content = self
-                .op
+            self.op
                 .range_read(&file_path, 0..count as u64)
                 .await
-                .unwrap();
-            //error handle ?
-            Ok(Bytes::from(content))
+                .map(Bytes::from)
+                .map_err(convert_error)
         }
         .boxed()
     }
 
     fn metadata(&mut self) -> FsFuture<Box<dyn DavMetaData>> {
         async move {
-            let opendal_metadata = self
-                .op
+            self.op
                 .stat(self.path.as_url_string().as_str())
                 .await
-                .unwrap();
-            Ok(Box::new(WebdavMetaData::new(opendal_metadata)) as Box<dyn DavMetaData>)
+                .map(|opendal_metadata| {
+                    Box::new(WebdavMetaData::new(opendal_metadata)) as Box<dyn DavMetaData>
+                })
+                .map_err(convert_error)
         }
         .boxed()
     }

diff --git a/bin/oay/src/services/webdav/webdavfs.rs b/bin/oay/src/services/webdav/webdavfs.rs
@@ -65,8 +65,11 @@ impl DavFileSystem for WebdavFs {
     ) -> dav_server::fs::FsFuture<dav_server::fs::FsStream<Box<dyn dav_server::fs::DavDirEntry>>>
     {
         async move {
-            let lister = self.op.lister(path.as_url_string().as_str()).await.unwrap();
-            Ok(DavStream::new(self.op.clone(), lister).boxed())
+            self.op
+                .lister(path.as_url_string().as_str())
+                .await
+                .map(|lister| DavStream::new(self.op.clone(), lister).boxed())
+                .map_err(convert_error)
         }
         .boxed()
     }