tyler.durden/bottom
1
0
Fork 0
mirror of https://github.com/ClementTsang/bottom.git synced 2025-07-27 07:34:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor: remove outdated collection thread code (#1190)

Browse Source 
This was going to be used for in-app config, but it's so old that it's
probably better to just rip it out and start anew in that regard.
This commit is contained in:
Clement Tsang 2023-06-08 02:48:29 -04:00 committed by GitHub
parent f0121e6af4
commit 1cc0e910b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/lib.rs
View File

@ -89,10 +89,8 @@ pub enum BottomEvent {
/// Events sent to the collection thread. /// Events sent to the collection thread.
#[derive(Debug)] #[derive(Debug)]
pub enum ThreadEvent { pub enum CollectionThreadEvent {
Reset, Reset,
UpdateConfig(Box<AppConfigFields>),
UpdateUsedWidgets(Box<UsedWidgets>),
} }
pub fn handle_mouse_event(event: MouseEvent, app: &mut App) { pub fn handle_mouse_event(event: MouseEvent, app: &mut App) {
@ -117,7 +115,7 @@ pub fn handle_mouse_event(event: MouseEvent, app: &mut App) {
} }
pub fn handle_key_event_or_break( pub fn handle_key_event_or_break(
event: KeyEvent, app: &mut App, reset_sender: &Sender<ThreadEvent>, event: KeyEvent, app: &mut App, reset_sender: &Sender<CollectionThreadEvent>,
) -> bool { ) -> bool {
// debug!("KeyEvent: {:?}", event); // debug!("KeyEvent: {:?}", event);
@ -174,7 +172,7 @@ pub fn handle_key_event_or_break(
KeyCode::Up => app.move_widget_selection(&WidgetDirection::Up), KeyCode::Up => app.move_widget_selection(&WidgetDirection::Up),
KeyCode::Down => app.move_widget_selection(&WidgetDirection::Down), KeyCode::Down => app.move_widget_selection(&WidgetDirection::Down),
KeyCode::Char('r') => { KeyCode::Char('r') => {
if reset_sender.send(ThreadEvent::Reset).is_ok() { if reset_sender.send(CollectionThreadEvent::Reset).is_ok() {
app.reset(); app.reset();
} }
} }
@ -487,7 +485,7 @@ pub fn create_input_thread(
} }
pub fn create_collection_thread( pub fn create_collection_thread(
sender: Sender<BottomEvent>, control_receiver: Receiver<ThreadEvent>, sender: Sender<BottomEvent>, control_receiver: Receiver<CollectionThreadEvent>,
termination_lock: Arc<Mutex<bool>>, termination_cvar: Arc<Condvar>, termination_lock: Arc<Mutex<bool>>, termination_cvar: Arc<Condvar>,
app_config_fields: &AppConfigFields, filters: DataFilters, used_widget_set: UsedWidgets, app_config_fields: &AppConfigFields, filters: DataFilters, used_widget_set: UsedWidgets,
) -> JoinHandle<()> { ) -> JoinHandle<()> {
@ -520,19 +518,9 @@ pub fn create_collection_thread(
if let Ok(message) = control_receiver.try_recv() { if let Ok(message) = control_receiver.try_recv() {
// trace!("Received message in collection thread: {:?}", message); // trace!("Received message in collection thread: {:?}", message);
match message { match message {
ThreadEvent::Reset => { CollectionThreadEvent::Reset => {
data_state.data.cleanup(); data_state.data.cleanup();
} }
ThreadEvent::UpdateConfig(app_config_fields) => {
data_state.set_temperature_type(app_config_fields.temperature_type);
data_state
.set_use_current_cpu_total(app_config_fields.use_current_cpu_total);
data_state.set_unnormalized_cpu(unnormalized_cpu);
data_state.set_show_average_cpu(app_config_fields.show_average_cpu);
}
ThreadEvent::UpdateUsedWidgets(used_widget_set) => {
data_state.set_data_collection(*used_widget_set);
}
} }
} }