xfy/candy
1
0
Fork 0
mirror of https://github.com/DefectingCat/candy synced 2025-07-15 16:51:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(auto_index): file path render error

Browse Source
This commit is contained in:
xfy
2025-07-09 01:24:15 +08:00
parent 47d8482ba6
commit c4b7c9e0d2
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/http/serve.rs
View File

@ -160,7 +160,7 @@ pub async fn serve(
#[allow(clippy::unnecessary_to_owned)] #[allow(clippy::unnecessary_to_owned)]
let path = path.to_string(); let path = path.to_string();
if path.contains('.') { if path.contains('.') {
(root.into(), vec![format!("{}{}", root, path)]) (root.into(), vec![format!("{}/{}", root, path)])
} else { } else {
generate_default_index(&host_route, &format!("{root}/{path}")) generate_default_index(&host_route, &format!("{root}/{path}"))
} }
@ -173,20 +173,23 @@ pub async fn serve(
// - Return the first successfully streamed file. // - Return the first successfully streamed file.
// - If all fail, return a `RouteNotFound` error. // - If all fail, return a `RouteNotFound` error.
let mut path_exists = None; let mut path_exists = None;
// TODO: Check auto_index enable
for path in path_arr { for path in path_arr {
if fs::metadata(path.clone()).await.is_ok() { if fs::metadata(path.clone()).await.is_ok() {
path_exists = Some(path); path_exists = Some(path);
break; break;
} }
} }
debug!("path_exists: {:?}", path_exists);
// 检查路径是否存在 // 检查路径是否存在
// 不存时，检查是否开启自动生成目录索引 // 不存时，检查是否开启自动生成目录索引
let path_exists = match path_exists { let path_exists = match path_exists {
Some(path_exists) => path_exists, Some(path_exists) => path_exists,
None => { None => {
let uri_path = uri.path(); let uri_path = uri.path();
// 如果请求路径不以 / 结尾，则返回 301 Moved Permanently 状态码 debug!("uri_path: {:?}", uri_path);
if !uri_path.ends_with('/') { // 如果请求路径不是文件且不以 / 结尾，则返回 301 Moved Permanently 状态码
if !uri_path.ends_with('/') && !uri_path.contains('.') {
let mut response = Response::builder(); let mut response = Response::builder();
let stream = empty_stream().await?; let stream = empty_stream().await?;
let body = Body::from_stream(stream); let body = Body::from_stream(stream);
@ -575,7 +578,11 @@ async fn list_dir(host_root_str: &str, path: &PathBuf) -> anyhow::Result<Vec<Dir
.await .await
.with_context(|| format!("读取目录条目失败: {}", path.display()))? .with_context(|| format!("读取目录条目失败: {}", path.display()))?
{ {
let host_root_str = host_root_str.to_string(); let host_root_str = if host_root_str.ends_with('/') {
host_root_str.to_string()
} else {
format!("{host_root_str}/")
};
// 为每个条目创建异步任务，并行获取元数据 // 为每个条目创建异步任务，并行获取元数据
let task = tokio::task::spawn(async move { let task = tokio::task::spawn(async move {
// 获取文件元数据 // 获取文件元数据