-
Notifications
You must be signed in to change notification settings - Fork 373
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Load folders filled with whatever. Go nuts. The loader has no particular semantics (e.g. HIVE partitioning): it just loads everything in a folder using the appropriate loader(s) for each file. Checks: - [x] `cargo r -p rerun-cli --no-default-features --features native_viewer -- examples/assets` - [x] Native: `File > Open > examples/assets/` - [x] Native: `Drag-n-drop > examples/assets/` --- Part of a series of PRs to make it possible to load _any_ file from the local filesystem, by any means, on web and native: - #4516 - #4517 - #4518 - #4519 - #4520 - #4521 - TODO: register custom loaders - TODO: high level docs and guides for everything related to loading files
- Loading branch information
Showing
3 changed files
with
86 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,79 @@ | ||
/// Recursively oads entire directories, using the appropriate [`crate::DataLoader`]:s for each | ||
/// files within. | ||
// | ||
// TODO(cmc): There are a lot more things than can be done be done when it comes to the semantics | ||
// of a folder, e.g.: HIVE-like partitioning, similarly named files with different indices and/or | ||
// timestamps (e.g. a folder of video frames), etc. | ||
// We could support some of those at some point, or at least add examples to show users how. | ||
pub struct DirectoryLoader; | ||
|
||
impl crate::DataLoader for DirectoryLoader { | ||
#[inline] | ||
fn name(&self) -> String { | ||
"rerun.data_loaders.Directory".into() | ||
} | ||
|
||
#[cfg(not(target_arch = "wasm32"))] | ||
fn load_from_path( | ||
&self, | ||
store_id: re_log_types::StoreId, | ||
dirpath: std::path::PathBuf, | ||
tx: std::sync::mpsc::Sender<crate::LoadedData>, | ||
) -> Result<(), crate::DataLoaderError> { | ||
if dirpath.is_file() { | ||
return Ok(()); // simply not interested | ||
} | ||
|
||
re_tracing::profile_function!(dirpath.display().to_string()); | ||
|
||
re_log::debug!(?dirpath, loader = self.name(), "Loading directory…",); | ||
|
||
for entry in walkdir::WalkDir::new(&dirpath) { | ||
let entry = match entry { | ||
Ok(entry) => entry, | ||
Err(err) => { | ||
re_log::error!(loader = self.name(), ?dirpath, %err, "Failed to open filesystem entry"); | ||
continue; | ||
} | ||
}; | ||
|
||
let filepath = entry.path(); | ||
if filepath.is_file() { | ||
let store_id = store_id.clone(); | ||
let filepath = filepath.to_owned(); | ||
let tx = tx.clone(); | ||
|
||
// NOTE: spawn is fine, this whole function is native-only. | ||
rayon::spawn(move || { | ||
let data = match crate::load_file::load(&store_id, &filepath, false, None) { | ||
Ok(data) => data, | ||
Err(err) => { | ||
re_log::error!(?filepath, %err, "Failed to load directory entry"); | ||
return; | ||
} | ||
}; | ||
|
||
for datum in data { | ||
if tx.send(datum).is_err() { | ||
break; | ||
} | ||
} | ||
}); | ||
} | ||
} | ||
|
||
Ok(()) | ||
} | ||
|
||
#[inline] | ||
fn load_from_file_contents( | ||
&self, | ||
_store_id: re_log_types::StoreId, | ||
_path: std::path::PathBuf, | ||
_contents: std::borrow::Cow<'_, [u8]>, | ||
_tx: std::sync::mpsc::Sender<crate::LoadedData>, | ||
) -> Result<(), crate::DataLoaderError> { | ||
// TODO(cmc): This could make sense to implement for e.g. archive formats (zip, tar, …) | ||
Ok(()) // simply not interested | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters