github
/
dufs
mirror of https://gh.cary.cc/https://github.com/sigoden/dufs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: incorrect dir size due to hidden files (#529)

pull/535/head
sigoden 2025-01-18 07:20:34 +08:00 committed by GitHub
parent 669c4f8811
commit d255f1376a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 17 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/server.rs
View File

@ -605,20 +605,9 @@ impl Server {
} }
let entry_path = entry.path(); let entry_path = entry.path();
let base_name = get_file_name(entry_path); let base_name = get_file_name(entry_path);
let file_type = entry.file_type(); let is_dir = entry.file_type().is_dir();
let mut is_dir_type: bool = file_type.is_dir(); if is_hidden(&hidden, base_name, is_dir) {
if file_type.is_symlink() { if is_dir {
match std::fs::symlink_metadata(entry_path) {
Ok(meta) => {
is_dir_type = meta.is_dir();
}
Err(_) => {
continue;
}
}
}
if is_hidden(&hidden, base_name, is_dir_type) {
if file_type.is_dir() {
it.skip_current_dir(); it.skip_current_dir();
} }
continue; continue;
@ -1377,7 +1366,17 @@ impl Server {
PathType::Dir | PathType::SymlinkDir => { PathType::Dir | PathType::SymlinkDir => {
let mut count = 0; let mut count = 0;
let mut entries = tokio::fs::read_dir(&path).await?; let mut entries = tokio::fs::read_dir(&path).await?;
while entries.next_entry().await?.is_some() { while let Some(entry) = entries.next_entry().await? {
let entry_path = entry.path();
let base_name = get_file_name(&entry_path);
let is_dir = entry
.file_type()
.await
.map(|v| v.is_dir())
.unwrap_or_default();
if is_hidden(&self.args.hidden, base_name, is_dir) {
continue;
}
count += 1; count += 1;
} }
count count
@ -1618,18 +1617,7 @@ async fn zip_dir<W: AsyncWrite + Unpin>(
let entry_path = entry.path(); let entry_path = entry.path();
let base_name = get_file_name(entry_path); let base_name = get_file_name(entry_path);
let file_type = entry.file_type(); let file_type = entry.file_type();
let mut is_dir_type: bool = file_type.is_dir(); if is_hidden(&hidden, base_name, file_type.is_dir()) {
if file_type.is_symlink() {
match std::fs::symlink_metadata(entry_path) {
Ok(meta) => {
is_dir_type = meta.is_dir();
}
Err(_) => {
continue;
}
}
}
if is_hidden(&hidden, base_name, is_dir_type) {
if file_type.is_dir() { if file_type.is_dir() {
it.skip_current_dir(); it.skip_current_dir();
} }
@ -1720,9 +1708,9 @@ fn set_content_disposition(res: &mut Response, inline: bool, filename: &str) ->
Ok(()) Ok(())
} }
fn is_hidden(hidden: &[String], file_name: &str, is_dir_type: bool) -> bool { fn is_hidden(hidden: &[String], file_name: &str, is_dir: bool) -> bool {
hidden.iter().any(|v| { hidden.iter().any(|v| {
if is_dir_type { if is_dir {
if let Some(x) = v.strip_suffix('/') { if let Some(x) = v.strip_suffix('/') {
return glob(x, file_name); return glob(x, file_name);
} }