MarkBase架构升级:Multi-Volume Virtual Tree + Dual-View Management + Git Remote修正
核心功能: - ✅ Categories/Series双视图管理(category_view.rs + import_markdown.rs) - ✅ FUSE Multi-Volume支持(tree_type参数) - ✅ SSH/SFTP/SCP/rsync协议完整实现(4042行) - ✅ NFS/SMB Module Phase 1-3完成 - ✅ Archive Module Phase 1-4完成(2916行) - ✅ Download Center API完整实现 - ✅ S3兼容API实现(560行) Git配置修正: - ✅ 删除错误origin(gitea.momentry.ddns.net) - ✅ 删除m5max128(指向机器名) - ✅ 设置origin = m5max128gitea.momentry.ddns.net/admin/markbase - ✅ 设置m4minigitea = m4minigitea.momentry.ddns.net/warren/markbase 数据清理: - ✅ 删除38个临时SQLite(保留accusys.sqlite、demo.sqlite) - ✅ 删除.bak、test_*.bin、调试脚本等临时文件 - ✅ 删除临时目录(build/、download files/、raid_test/等) - ✅ 更新.gitignore排除临时文件 架构优化: - 52个文件修改,2434行新增,4739行删除 - Workspace成员整合(16个crate) - 数据库状态:accusys.sqlite保留(主demo测试) 远程同步: - ✅ 准备推送到m5max128gitea(远程Gitea) - ✅ 准备推送到m4minigitea(本地Gitea)
This commit is contained in:
73
markbase-core/src/s3_xml.rs
Normal file
73
markbase-core/src/s3_xml.rs
Normal file
@@ -0,0 +1,73 @@
|
||||
use axum::http::HeaderMap;
|
||||
use serde_json::Value;
|
||||
|
||||
pub fn list_buckets_xml(buckets: &[String]) -> (HeaderMap, String) {
|
||||
let mut headers = HeaderMap::new();
|
||||
headers.insert("Content-Type", "application/xml".parse().unwrap());
|
||||
|
||||
let bucket_entries = buckets
|
||||
.iter()
|
||||
.map(|b| format!(
|
||||
"<Bucket><Name>{}</Name><CreationDate>2026-05-27T00:00:00Z</CreationDate></Bucket>",
|
||||
b
|
||||
))
|
||||
.collect::<Vec<_>>()
|
||||
.join("\n ");
|
||||
|
||||
let xml = format!(
|
||||
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>
|
||||
<ListAllMyBucketsResult xmlns=\"http://s3.amazonaws.com/doc/2006-03-01/\">
|
||||
<Owner>
|
||||
<ID>owner-id</ID>
|
||||
<DisplayName>MarkBase</DisplayName>
|
||||
</Owner>
|
||||
<Buckets>
|
||||
{}
|
||||
</Buckets>
|
||||
</ListAllMyBucketsResult>",
|
||||
bucket_entries
|
||||
);
|
||||
|
||||
(headers, xml)
|
||||
}
|
||||
|
||||
pub fn list_objects_xml(bucket_name: &str, objects: &[Value]) -> (HeaderMap, String) {
|
||||
let mut headers = HeaderMap::new();
|
||||
headers.insert("Content-Type", "application/xml".parse().unwrap());
|
||||
|
||||
let object_entries = objects
|
||||
.iter()
|
||||
.map(|obj| {
|
||||
let key = obj.get("Key").and_then(|k| k.as_str()).unwrap_or("");
|
||||
let last_modified = obj.get("LastModified").and_then(|l| l.as_str()).unwrap_or("");
|
||||
let etag = obj.get("ETag").and_then(|e| e.as_str()).unwrap_or("");
|
||||
let size = obj.get("Size").and_then(|s| s.as_i64()).unwrap_or(0);
|
||||
|
||||
format!(
|
||||
"<Contents>
|
||||
<Key>{}</Key>
|
||||
<LastModified>{}</LastModified>
|
||||
<ETag>{}</ETag>
|
||||
<Size>{}</Size>
|
||||
</Contents>",
|
||||
key, last_modified, etag, size
|
||||
)
|
||||
})
|
||||
.collect::<Vec<_>>()
|
||||
.join("\n ");
|
||||
|
||||
let xml = format!(
|
||||
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>
|
||||
<ListBucketResult xmlns=\"http://s3.amazonaws.com/doc/2006-03-01/\">
|
||||
<Name>{}</Name>
|
||||
<Prefix></Prefix>
|
||||
<Marker></Marker>
|
||||
<MaxKeys>1000</MaxKeys>
|
||||
<IsTruncated>false</IsTruncated>
|
||||
{}
|
||||
</ListBucketResult>",
|
||||
bucket_name, object_entries
|
||||
);
|
||||
|
||||
(headers, xml)
|
||||
}
|
||||
Reference in New Issue
Block a user