JMLX42 commented on code in PR #7005: URL: https://github.com/apache/opendal/pull/7005#discussion_r2642865479
########## core/services/wasi-fs/src/lister.rs: ########## @@ -0,0 +1,94 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +use std::sync::Arc; + +use opendal_core::raw::*; +use opendal_core::*; +use wasi::filesystem::types::{DescriptorType, DirectoryEntryStream}; + +use super::core::WasiFsCore; +use super::error::parse_wasi_error; + +pub struct WasiFsLister { + stream: DirectoryEntryStream, + path: String, + returned_self: bool, +} + +impl WasiFsLister { + pub fn new(core: Arc<WasiFsCore>, path: &str) -> Result<Self> { + let stream = core.read_dir(path)?; + + Ok(Self { + stream, + path: path.to_string(), + returned_self: false, + }) + } +} + +/// # Safety +/// +/// WasiFsLister only accesses WASI resources which are single-threaded in WASM. +unsafe impl Sync for WasiFsLister {} + +impl oio::List for WasiFsLister { + async fn next(&mut self) -> Result<Option<oio::Entry>> { + if !self.returned_self { + self.returned_self = true; + let entry = oio::Entry::new(&self.path, Metadata::new(EntryMode::DIR)); + return Ok(Some(entry)); + } + + // Use a loop to skip . and .. entries instead of recursion + loop { + match self.stream.read_directory_entry() { + Ok(Some(entry)) => { + let name = entry.name; + + // Skip . and .. entries + if name == "." || name == ".." { Review Comment: Fixed in 681baa1b - removed the unnecessary check and simplified the match expression. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
