bootandy/archived-dust
1
0
Fork 0
mirror of https://github.com/bootandy/dust.git synced 2026-06-08 11:29:05 +03:00
Code Issues 21 Packages Projects Releases 10 Wiki Activity

Fix issues from running on root directory

Browse Source 
clean up: 80338f4

Fixes -d flag to work again. Add test to stop regression
This commit is contained in:
Bob
2019-10-01 21:51:34 +01:00
parent 2ca2cebdad
commit 2f7a88e8dc
3 changed files with 26 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/utils/mod.rs
+2 -3
View File
@@ -56,7 +56,6 @@ pub fn ensure_end_slash(s: &str) -> String {
new_name + "/"
}
// TODO fairly sure we shouldn't need this func
pub fn strip_end_slash(s: &str) -> String {
let mut new_name = String::from(s);
while (new_name.ends_with('/') || new_name.ends_with("/.")) && new_name.len() > 1 {
@@ -134,11 +133,11 @@ pub fn trim_deep_ones(
let mut result: Vec<(String, u64)> = vec![];
for name in top_level_names {
let my_max_depth = name.matches('/').count() - 1 + max_depth as usize;
let my_max_depth = name.matches('/').count() + max_depth as usize;
let name_ref: &str = name.as_ref();
for &(ref k, ref v) in input.iter() {
if k.starts_with(name_ref) && k.matches('/').count() - 1 <= my_max_depth {
if k.starts_with(name_ref) && k.matches('/').count() <= my_max_depth {
result.push((k.clone(), *v));
}
}