Exports #135
Merged
Exports #135
Conversation
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
Geometrically
requested changes
Jun 19, 2023
theseus/src/util/export.rs
Outdated
Comment on lines
69
to
104
| for path in path_list { | ||
| if let Some(ref loading_bar) = loading_bar { | ||
| emit_loading(loading_bar, 1.0, None).await?; | ||
| } | ||
|
|
||
| // Get local path of file, relative to profile folder | ||
| let name = path.strip_prefix(profile_base_path)?; | ||
|
|
||
| // Get highest level folder pair ('a/b' in 'a/b/c', 'a' in 'a') | ||
| // We only go one layer deep for the sake of not having a huge list of overrides | ||
| let topmost_two = name | ||
| .iter() | ||
| .take(2) | ||
| .map(|os| os.to_string_lossy().to_string()) | ||
| .collect::<Vec<_>>(); | ||
|
|
||
| // a,b => a/b | ||
| // a => a | ||
| let topmost = match topmost_two.len() { | ||
| 2 => topmost_two.join("/"), | ||
| 1 => topmost_two[0].clone(), | ||
| _ => { | ||
| return Err(crate::ErrorKind::OtherError( | ||
| "No topmost folder found".to_string(), | ||
| ) | ||
| .into()) | ||
| } | ||
| }; | ||
|
|
||
| if !included_overrides.contains(&topmost) { | ||
| continue; | ||
| } | ||
|
|
||
| let name: std::borrow::Cow<str> = name.to_string_lossy(); | ||
| let name = name.replace('\\', "/"); | ||
| let name = name.trim_start_matches('/').to_string(); |
There was a problem hiding this comment.
Wouldn't it be better to do a starts with check of the path instead of trying to get the first 2 components?
There was a problem hiding this comment.
I think there are several potential cases where that could cause trouble. if we had a file without an extension like Makefile and a folder called Makefile_helpers (or anything else where there can be ambiguity between files) the rule wanting to just get Makefile would get all subfolders+files in Makefile_helpers
We could add handling for that easily dont get me wrong but it wouldnt be any simpler than using the path splitting IMO, what do you think
Geometrically
approved these changes
Jun 26, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes MOD-438