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:
@@ -1,7 +1,7 @@
|
||||
use std::path::PathBuf;
|
||||
use std::fs::{File, OpenOptions};
|
||||
use std::io::{Read, Write, Seek, SeekFrom};
|
||||
use super::{RaidController, RaidError};
|
||||
use std::fs::{File, OpenOptions};
|
||||
use std::io::{Read, Seek, SeekFrom, Write};
|
||||
use std::path::PathBuf;
|
||||
|
||||
pub struct RaidExporter {
|
||||
controller: RaidController,
|
||||
@@ -11,85 +11,89 @@ impl RaidExporter {
|
||||
pub fn new(controller: RaidController) -> Self {
|
||||
RaidExporter { controller }
|
||||
}
|
||||
|
||||
|
||||
pub fn export_to_vdisk(
|
||||
&self,
|
||||
array_id: &str,
|
||||
output_path: &PathBuf,
|
||||
block_size: u64,
|
||||
) -> Result<u64, RaidError> {
|
||||
let array = self.controller.get_array(array_id)
|
||||
let array = self
|
||||
.controller
|
||||
.get_array(array_id)
|
||||
.ok_or("RAID array not found")?;
|
||||
|
||||
|
||||
let total_size = array.total_size;
|
||||
|
||||
|
||||
if total_size == 0 {
|
||||
return Err("RAID array has zero size".into());
|
||||
}
|
||||
|
||||
|
||||
let mut output_file = OpenOptions::new()
|
||||
.write(true)
|
||||
.create(true)
|
||||
.truncate(true)
|
||||
.open(output_path)?;
|
||||
|
||||
|
||||
output_file.set_len(total_size)?;
|
||||
|
||||
|
||||
let mut exported_bytes = 0u64;
|
||||
let mut current_offset = 0u64;
|
||||
|
||||
|
||||
while current_offset < total_size {
|
||||
let chunk_size = std::cmp::min(block_size, total_size - current_offset);
|
||||
|
||||
|
||||
let data = match self.controller.read(array_id, current_offset, chunk_size) {
|
||||
Ok(d) => d,
|
||||
Err(_) => {
|
||||
let zeros = vec![0u8; chunk_size as usize];
|
||||
zeros
|
||||
},
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
output_file.seek(SeekFrom::Start(current_offset))?;
|
||||
output_file.write_all(&data)?;
|
||||
|
||||
|
||||
exported_bytes += chunk_size;
|
||||
current_offset += chunk_size;
|
||||
}
|
||||
|
||||
|
||||
output_file.sync_all()?;
|
||||
|
||||
|
||||
Ok(exported_bytes)
|
||||
}
|
||||
|
||||
|
||||
pub fn import_from_vdisk(
|
||||
&self,
|
||||
array_id: &str,
|
||||
input_path: &PathBuf,
|
||||
block_size: u64,
|
||||
) -> Result<u64, RaidError> {
|
||||
let array = self.controller.get_array(array_id)
|
||||
let array = self
|
||||
.controller
|
||||
.get_array(array_id)
|
||||
.ok_or("RAID array not found")?;
|
||||
|
||||
|
||||
let total_size = array.total_size;
|
||||
|
||||
|
||||
let mut input_file = File::open(input_path)?;
|
||||
|
||||
|
||||
let mut imported_bytes = 0u64;
|
||||
let mut current_offset = 0u64;
|
||||
|
||||
|
||||
while current_offset < total_size {
|
||||
let chunk_size = std::cmp::min(block_size, total_size - current_offset);
|
||||
|
||||
|
||||
input_file.seek(SeekFrom::Start(current_offset))?;
|
||||
let mut buffer = vec![0u8; chunk_size as usize];
|
||||
input_file.read_exact(&mut buffer)?;
|
||||
|
||||
|
||||
self.controller.write(array_id, current_offset, &buffer)?;
|
||||
|
||||
|
||||
imported_bytes += chunk_size;
|
||||
current_offset += chunk_size;
|
||||
}
|
||||
|
||||
|
||||
Ok(imported_bytes)
|
||||
}
|
||||
}
|
||||
@@ -98,11 +102,11 @@ impl RaidExporter {
|
||||
mod tests {
|
||||
use super::*;
|
||||
use std::path::PathBuf;
|
||||
|
||||
|
||||
#[test]
|
||||
fn test_exporter_creation() {
|
||||
let controller = RaidController::new();
|
||||
let exporter = RaidExporter::new(controller);
|
||||
assert!(true);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user