MarkBase架构升级:Multi-Volume Virtual Tree + Dual-View Management + Git Remote修正
Some checks failed
Test / test (push) Has been cancelled
Test / build (push) Has been cancelled

核心功能:
-  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:
Warren
2026-06-12 12:59:54 +08:00
parent 4cb7e80568
commit 1300a4e223
4559 changed files with 195840 additions and 4244 deletions

View File

@@ -1,6 +1,6 @@
use std::sync::Arc;
use super::controller::RaidArray;
use super::{RaidAlgorithm, RaidLevel, RaidError, MemberStatus};
use super::{MemberStatus, RaidAlgorithm, RaidError, RaidLevel};
use std::sync::Arc;
pub struct Raid0 {
array: Arc<RaidArray>,
@@ -10,12 +10,13 @@ impl Raid0 {
pub fn new(array: Arc<RaidArray>) -> Self {
Raid0 { array }
}
fn locate_block(&self, block_offset: u64) -> (usize, u64) {
let stripe_index = block_offset / self.array.stripe_size;
let member_index = stripe_index % self.array.members.len() as u64;
let member_offset = (stripe_index / self.array.members.len() as u64) * self.array.stripe_size;
let member_offset =
(stripe_index / self.array.members.len() as u64) * self.array.stripe_size;
(member_index as usize, member_offset)
}
}
@@ -24,72 +25,71 @@ impl RaidAlgorithm for Raid0 {
fn read(&mut self, block_offset: u64, size: u64) -> Result<Vec<u8>, RaidError> {
let mut result = Vec::with_capacity(size as usize);
let mut current_offset = block_offset;
while result.len() < size as usize {
let (member_index, member_offset) = self.locate_block(current_offset);
let member = &self.array.members[member_index];
if member.status != MemberStatus::Online {
return Err("Member offline".into());
}
let chunk_size = std::cmp::min(
self.array.stripe_size,
size - result.len() as u64
);
let chunk_size = std::cmp::min(self.array.stripe_size, size - result.len() as u64);
let file = std::fs::File::open(&member.device_path)?;
use std::io::{Read, Seek};
let mut file = file;
file.seek(std::io::SeekFrom::Start(member_offset + current_offset % self.array.stripe_size))?;
file.seek(std::io::SeekFrom::Start(
member_offset + current_offset % self.array.stripe_size,
))?;
let mut chunk = vec![0u8; chunk_size as usize];
file.read_exact(&mut chunk)?;
result.extend_from_slice(&chunk);
current_offset += chunk_size;
}
Ok(result)
}
fn write(&mut self, block_offset: u64, data: &[u8]) -> Result<(), RaidError> {
let mut current_offset = block_offset;
let mut data_offset = 0;
while data_offset < data.len() {
let (member_index, member_offset) = self.locate_block(current_offset);
let member = &self.array.members[member_index];
if member.status != MemberStatus::Online {
return Err("Member offline".into());
}
let chunk_size = std::cmp::min(
self.array.stripe_size as usize,
data.len() - data_offset
);
let chunk_size =
std::cmp::min(self.array.stripe_size as usize, data.len() - data_offset);
let file = std::fs::OpenOptions::new()
.write(true)
.open(&member.device_path)?;
use std::io::{Write, Seek};
use std::io::{Seek, Write};
let mut file = file;
file.seek(std::io::SeekFrom::Start(member_offset + current_offset % self.array.stripe_size))?;
file.seek(std::io::SeekFrom::Start(
member_offset + current_offset % self.array.stripe_size,
))?;
file.write_all(&data[data_offset..data_offset + chunk_size])?;
current_offset += chunk_size as u64;
data_offset += chunk_size;
}
Ok(())
}
fn get_total_size(&self) -> u64 {
self.array.total_size
}
fn get_level(&self) -> RaidLevel {
RaidLevel::RAID0
}
}
}