fromost/sus-manager
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor code to remove Any

Browse Source
This commit is contained in:
fromost
2025-11-10 02:02:14 +08:00
parent 2538049f4a
commit fcb9297fdc
14 changed files with 98 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/app.rs
View File

@@ -1,13 +1,11 @@
use crate::config::types::ApplicationConfig;
use crate::event::{AppEvent, EventHandler};
use crate::widgets::views::MainView;
use crate::widgets::views::{AppView, MainView};
use crate::widgets::views::View;
use color_eyre::Result;
use crossterm::event::Event as CrosstermEvent;
use crossterm::event::{Event, KeyEvent};
use crossterm::event::{Event};
use rat_cursor::HasScreenCursor;
use ratatui::{DefaultTerminal, Frame};
use std::any::Any;
use std::time::Duration;
pub(crate) struct App {
@@ -16,14 +14,14 @@ pub(crate) struct App {
}
struct AppState {
view: Option<Box<dyn Any>>,
view: Option<AppView>,
}
impl App {
pub async fn create() -> Result<Self> {
let config = ApplicationConfig::get_config()?;
let state = AppState {
view: Some(Box::new(MainView::new())),
view: Some(AppView::MainView(MainView::new())),
};
let app = Self {
events: EventHandler::new(Duration::from_millis(config.basic_config.tick_rate)),
@@ -38,7 +36,7 @@ impl App {
let event = self.events.next().await?;
self.update(event)?;
if let Some(view) = self.state.view.as_mut()
&& let Some(main_view) = view.downcast_ref::<MainView>()
&& let AppView::MainView(main_view) = view
&& !main_view.is_running()
{
break Ok(());
@@ -49,27 +47,17 @@ impl App {
fn update(&mut self, event: AppEvent) -> Result<()> {
if let AppEvent::Raw(cross_event) = event {
self.handle_event(&cross_event)?;
if let CrosstermEvent::Key(key) = cross_event {
self.handle_key_event(&key)?;
}
}
Ok(())
}
fn handle_key_event(&mut self, key: &KeyEvent) -> Result<()> {
if let Some(any) = self.state.view.as_mut() {
if let Some(main_view) = any.downcast_mut::<MainView>() {
main_view.handle_key_input(key)?;
}
}
Ok(())
}
fn handle_event(&mut self, key: &Event) -> Result<()> {
if let Some(any) = self.state.view.as_mut() {
if let Some(main_view) = any.downcast_mut::<MainView>() {
main_view.handle_input(key)?;
if let Some(current_view) = self.state.view.as_mut() {
match current_view {
AppView::MainView(main_view) => {
main_view.handle_input(key)?
}
}
}
Ok(())
@@ -77,14 +65,16 @@ impl App {
fn draw(&mut self, frame: &mut Frame) {
if let Some(view) = self.state.view.as_mut() {
if let Some(main_view) = view.downcast_mut::<MainView>() {
frame.render_stateful_widget(
MainView::new(),
frame.area(),
&mut main_view.state,
);
if let Some(pos) = main_view.screen_cursor() {
frame.set_cursor_position(pos);
match view {
AppView::MainView(main_view) => {
frame.render_stateful_widget(
MainView::new(),
frame.area(),
&mut main_view.state,
);
if let Some(pos) = main_view.screen_cursor() {
frame.set_cursor_position(pos);
}
}
}
}