PR-09 - VirtualFS
This commit is contained in:
@@ -0,0 +1,112 @@
|
||||
use std::path::PathBuf;
|
||||
use std::fs;
|
||||
use prometeu_core::fs::{FsBackend, FsEntry, FsError};
|
||||
|
||||
pub struct HostDirBackend {
|
||||
root: PathBuf,
|
||||
}
|
||||
|
||||
impl HostDirBackend {
|
||||
pub fn new(root: impl Into<PathBuf>) -> Self {
|
||||
Self { root: root.into() }
|
||||
}
|
||||
|
||||
fn resolve(&self, path: &str) -> PathBuf {
|
||||
let path = path.trim_start_matches('/');
|
||||
self.root.join(path)
|
||||
}
|
||||
}
|
||||
|
||||
impl FsBackend for HostDirBackend {
|
||||
fn mount(&mut self) -> Result<(), FsError> {
|
||||
if !self.root.exists() {
|
||||
return Err(FsError::NotFound);
|
||||
}
|
||||
|
||||
for dir in &["system", "apps", "media", "user"] {
|
||||
let path = self.root.join(dir);
|
||||
if !path.exists() {
|
||||
fs::create_dir_all(&path).map_err(|e| FsError::IOError(e.to_string()))?;
|
||||
}
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn unmount(&mut self) {}
|
||||
|
||||
fn list_dir(&self, path: &str) -> Result<Vec<FsEntry>, FsError> {
|
||||
let full_path = self.resolve(path);
|
||||
let entries = fs::read_dir(full_path).map_err(|e| FsError::IOError(e.to_string()))?;
|
||||
|
||||
let mut result = Vec::new();
|
||||
for entry in entries {
|
||||
let entry = entry.map_err(|e| FsError::IOError(e.to_string()))?;
|
||||
let metadata = entry.metadata().map_err(|e| FsError::IOError(e.to_string()))?;
|
||||
result.push(FsEntry {
|
||||
name: entry.file_name().to_string_lossy().into_owned(),
|
||||
is_dir: metadata.is_dir(),
|
||||
size: metadata.len(),
|
||||
});
|
||||
}
|
||||
Ok(result)
|
||||
}
|
||||
|
||||
fn read_file(&self, path: &str) -> Result<Vec<u8>, FsError> {
|
||||
let full_path = self.resolve(path);
|
||||
fs::read(full_path).map_err(|e| match e.kind() {
|
||||
std::io::ErrorKind::NotFound => FsError::NotFound,
|
||||
_ => FsError::IOError(e.to_string()),
|
||||
})
|
||||
}
|
||||
|
||||
fn write_file(&mut self, path: &str, data: &[u8]) -> Result<(), FsError> {
|
||||
let full_path = self.resolve(path);
|
||||
if let Some(parent) = full_path.parent() {
|
||||
fs::create_dir_all(parent).map_err(|e| FsError::IOError(e.to_string()))?;
|
||||
}
|
||||
fs::write(full_path, data).map_err(|e| FsError::IOError(e.to_string()))
|
||||
}
|
||||
|
||||
fn delete(&mut self, path: &str) -> Result<(), FsError> {
|
||||
let full_path = self.resolve(path);
|
||||
if full_path.is_dir() {
|
||||
fs::remove_dir_all(full_path).map_err(|e| FsError::IOError(e.to_string()))
|
||||
} else {
|
||||
fs::remove_file(full_path).map_err(|e| FsError::IOError(e.to_string()))
|
||||
}
|
||||
}
|
||||
|
||||
fn exists(&self, path: &str) -> bool {
|
||||
self.resolve(path).exists()
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use std::fs;
|
||||
use std::env;
|
||||
|
||||
fn get_temp_dir(name: &str) -> PathBuf {
|
||||
let mut path = env::temp_dir();
|
||||
path.push(format!("prometeu_host_test_{}_{}", name, std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap().as_nanos()));
|
||||
fs::create_dir_all(&path).unwrap();
|
||||
path
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_host_dir_backend_mount_and_dirs() {
|
||||
let root = get_temp_dir("mount");
|
||||
let mut backend = HostDirBackend::new(root.clone());
|
||||
|
||||
backend.mount().unwrap();
|
||||
|
||||
assert!(root.join("system").is_dir());
|
||||
assert!(root.join("apps").is_dir());
|
||||
assert!(root.join("media").is_dir());
|
||||
assert!(root.join("user").is_dir());
|
||||
|
||||
let _ = fs::remove_dir_all(root);
|
||||
}
|
||||
}
|
||||
@@ -1,13 +1,25 @@
|
||||
mod audio_mixer;
|
||||
mod prometeu_runner;
|
||||
mod fs_desktop_backend;
|
||||
|
||||
use crate::prometeu_runner::PrometeuRunner;
|
||||
use winit::event_loop::EventLoop;
|
||||
|
||||
fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||
let args: Vec<String> = std::env::args().collect();
|
||||
let mut fs_root = None;
|
||||
let mut i = 0;
|
||||
while i < args.len() {
|
||||
if args[i] == "--fs-root" && i + 1 < args.len() {
|
||||
fs_root = Some(args[i + 1].clone());
|
||||
i += 1;
|
||||
}
|
||||
i += 1;
|
||||
}
|
||||
|
||||
let event_loop = EventLoop::new()?;
|
||||
|
||||
let mut runner = PrometeuRunner::new();
|
||||
let mut runner = PrometeuRunner::new(fs_root);
|
||||
event_loop.run_app(&mut runner)?;
|
||||
|
||||
Ok(())
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
use crate::audio_mixer::AudioMixer;
|
||||
use crate::fs_desktop_backend::HostDirBackend;
|
||||
use cpal::traits::{DeviceTrait, HostTrait, StreamTrait};
|
||||
use pixels::{Pixels, SurfaceTexture};
|
||||
use prometeu_core::firmware::Firmware;
|
||||
@@ -23,6 +24,7 @@ pub struct PrometeuRunner {
|
||||
firmware: Firmware,
|
||||
|
||||
input_signals: InputSignals,
|
||||
fs_root: Option<String>,
|
||||
|
||||
frame_target_dt: Duration,
|
||||
last_frame_time: Instant,
|
||||
@@ -39,15 +41,22 @@ pub struct PrometeuRunner {
|
||||
}
|
||||
|
||||
impl PrometeuRunner {
|
||||
pub(crate) fn new() -> Self {
|
||||
pub(crate) fn new(fs_root: Option<String>) -> Self {
|
||||
let target_fps = 60;
|
||||
|
||||
let mut firmware = Firmware::new();
|
||||
if let Some(root) = &fs_root {
|
||||
let backend = HostDirBackend::new(root);
|
||||
firmware.os.mount_fs(Box::new(backend));
|
||||
}
|
||||
|
||||
Self {
|
||||
window: None,
|
||||
pixels: None,
|
||||
hardware: Hardware::new(),
|
||||
firmware: Firmware::new(),
|
||||
firmware,
|
||||
input_signals: InputSignals::default(),
|
||||
fs_root,
|
||||
frame_target_dt: Duration::from_nanos(1_000_000_000 / target_fps),
|
||||
last_frame_time: Instant::now(),
|
||||
accumulator: Duration::ZERO,
|
||||
@@ -243,6 +252,17 @@ impl ApplicationHandler for PrometeuRunner {
|
||||
}
|
||||
|
||||
fn about_to_wait(&mut self, _event_loop: &ActiveEventLoop) {
|
||||
// Atualiza estado do Filesystem no OS (específico do host-desktop)
|
||||
if let Some(root) = &self.fs_root {
|
||||
use prometeu_core::fs::FsState;
|
||||
if matches!(self.firmware.os.fs_state, FsState::Unmounted | FsState::Error(_)) {
|
||||
if std::path::Path::new(root).exists() {
|
||||
let backend = HostDirBackend::new(root);
|
||||
self.firmware.os.mount_fs(Box::new(backend));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
let now = Instant::now();
|
||||
let mut frame_delta = now.duration_since(self.last_frame_time);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user