Skip to content

Commit 4b9c4ab

Browse files
ankddevankddev
committed
style: reformat code
1 parent 73a30d6 commit 4b9c4ab

File tree

5 files changed

+89
-78
lines changed

5 files changed

+89
-78
lines changed

‎src/config.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ mod tests {
166166
let non_existent_dir = PathBuf::from("/non/existent/dir/envfetch.toml");
167167
let mut buffer = Vec::new();
168168
let result = init_config(non_existent_dir, &mut buffer);
169-
assert!(result.is_err()); // This should fail on fs::write
169+
assert!(result.is_err()); // This should fail on fs::write
170170
Ok(())
171171
}
172172
}

‎src/interactive.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
pub mod state;
21
pub mod controller;
3-
pub mod view;
2+
pub mod state;
43
#[cfg(test)]
54
pub mod tests;
5+
pub mod view;
66

77
use crate::variables; // Function to get environment variables.
8-
use ratatui::{backend::Backend, Terminal};
8+
use ratatui::{Terminal, backend::Backend};
99
use std::io;
1010

1111
pub struct InteractiveApp {
@@ -19,7 +19,7 @@ impl InteractiveApp {
1919
}
2020
}
2121

22-
pub fn run<B>(&mut self, terminal: &mut Terminal<B>) -> io::Result<()>
22+
pub fn run<B>(&mut self, terminal: &mut Terminal<B>) -> io::Result<()>
2323
where
2424
B: Backend,
2525
{

‎src/interactive/controller.rs

+39-47
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::interactive::state::{AppState, Mode, InputFocus};
1+
use crate::interactive::state::{AppState, InputFocus, Mode};
22
use crossterm::event::{self, Event, KeyCode, KeyEvent, KeyEventKind, KeyModifiers};
33
use std::io;
44
use std::time::Duration;
@@ -99,62 +99,54 @@ fn handle_add_mode(state: &mut AppState, key: KeyEvent) {
9999
InputFocus::Value => InputFocus::Key,
100100
};
101101
}
102-
KeyCode::Left => {
103-
match state.input_focus {
104-
InputFocus::Key => {
105-
if state.input_cursor_key > 0 {
106-
state.input_cursor_key -= 1;
107-
}
108-
}
109-
InputFocus::Value => {
110-
if state.input_cursor_value > 0 {
111-
state.input_cursor_value -= 1;
112-
}
102+
KeyCode::Left => match state.input_focus {
103+
InputFocus::Key => {
104+
if state.input_cursor_key > 0 {
105+
state.input_cursor_key -= 1;
113106
}
114107
}
115-
}
116-
KeyCode::Right => {
117-
match state.input_focus {
118-
InputFocus::Key => {
119-
if state.input_cursor_key < state.input_key.len() {
120-
state.input_cursor_key += 1;
121-
}
122-
}
123-
InputFocus::Value => {
124-
if state.input_cursor_value < state.input_value.len() {
125-
state.input_cursor_value += 1;
126-
}
108+
InputFocus::Value => {
109+
if state.input_cursor_value > 0 {
110+
state.input_cursor_value -= 1;
127111
}
128112
}
129-
}
130-
KeyCode::Backspace => {
131-
match state.input_focus {
132-
InputFocus::Key => {
133-
if state.input_cursor_key > 0 {
134-
state.input_key.remove(state.input_cursor_key - 1);
135-
state.input_cursor_key -= 1;
136-
}
113+
},
114+
KeyCode::Right => match state.input_focus {
115+
InputFocus::Key => {
116+
if state.input_cursor_key < state.input_key.len() {
117+
state.input_cursor_key += 1;
137118
}
138-
InputFocus::Value => {
139-
if state.input_cursor_value > 0 {
140-
state.input_value.remove(state.input_cursor_value - 1);
141-
state.input_cursor_value -= 1;
142-
}
119+
}
120+
InputFocus::Value => {
121+
if state.input_cursor_value < state.input_value.len() {
122+
state.input_cursor_value += 1;
143123
}
144124
}
145-
}
146-
KeyCode::Char(c) => {
147-
match state.input_focus {
148-
InputFocus::Key => {
149-
state.input_key.insert(state.input_cursor_key, c);
150-
state.input_cursor_key += 1;
125+
},
126+
KeyCode::Backspace => match state.input_focus {
127+
InputFocus::Key => {
128+
if state.input_cursor_key > 0 {
129+
state.input_key.remove(state.input_cursor_key - 1);
130+
state.input_cursor_key -= 1;
151131
}
152-
InputFocus::Value => {
153-
state.input_value.insert(state.input_cursor_value, c);
154-
state.input_cursor_value += 1;
132+
}
133+
InputFocus::Value => {
134+
if state.input_cursor_value > 0 {
135+
state.input_value.remove(state.input_cursor_value - 1);
136+
state.input_cursor_value -= 1;
155137
}
156138
}
157-
}
139+
},
140+
KeyCode::Char(c) => match state.input_focus {
141+
InputFocus::Key => {
142+
state.input_key.insert(state.input_cursor_key, c);
143+
state.input_cursor_key += 1;
144+
}
145+
InputFocus::Value => {
146+
state.input_value.insert(state.input_cursor_value, c);
147+
state.input_cursor_value += 1;
148+
}
149+
},
158150
_ => {}
159151
}
160152
}

‎src/interactive/tests.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::interactive::state::{AppState, Mode, InputFocus};
1+
use crate::interactive::state::{AppState, InputFocus, Mode};
22
use std::time::Duration;
33

44
#[test]

‎src/interactive/view.rs

+44-25
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
use crate::interactive::state::{AppState, Mode, InputFocus};
1+
use crate::interactive::state::{AppState, InputFocus, Mode};
2+
use ratatui::Frame;
23
use ratatui::layout::{Constraint, Direction, Layout, Rect};
34
use ratatui::style::{Color, Modifier, Style};
45
use ratatui::text::{Line, Span};
5-
use ratatui::widgets::{Block, Borders, BorderType, List, ListItem, ListState, Paragraph, Wrap};
6-
use ratatui::Frame;
6+
use ratatui::widgets::{Block, BorderType, Borders, List, ListItem, ListState, Paragraph, Wrap};
77

88
pub fn render(state: &AppState, f: &mut Frame) {
99
let size = f.area();
@@ -15,33 +15,44 @@ pub fn render(state: &AppState, f: &mut Frame) {
1515

1616
match &state.mode {
1717
Mode::List => {
18-
let items: Vec<ListItem> = state.entries.iter().enumerate().map(|(i, (k, v))| {
19-
let marker = if i == state.current_index { "> " } else { " " };
20-
let key_field = format!("{:30}", k);
21-
let content = format!("{}{} {}", marker, key_field, v);
22-
let style = if i == state.current_index {
23-
Style::default().fg(Color::Green).add_modifier(Modifier::BOLD)
24-
} else {
25-
Style::default().fg(Color::White)
26-
};
27-
ListItem::new(Line::from(Span::styled(content, style)))
28-
}).collect();
18+
let items: Vec<ListItem> = state
19+
.entries
20+
.iter()
21+
.enumerate()
22+
.map(|(i, (k, v))| {
23+
let marker = if i == state.current_index { "> " } else { " " };
24+
let key_field = format!("{:30}", k);
25+
let content = format!("{}{} {}", marker, key_field, v);
26+
let style = if i == state.current_index {
27+
Style::default()
28+
.fg(Color::Green)
29+
.add_modifier(Modifier::BOLD)
30+
} else {
31+
Style::default().fg(Color::White)
32+
};
33+
ListItem::new(Line::from(Span::styled(content, style)))
34+
})
35+
.collect();
2936

30-
let list = List::new(items)
31-
.block(
32-
Block::default()
33-
.borders(Borders::ALL)
34-
.border_type(BorderType::Rounded)
35-
.border_style(Style::default().fg(Color::Blue))
36-
.title("Variables"),
37-
);
37+
let list = List::new(items).block(
38+
Block::default()
39+
.borders(Borders::ALL)
40+
.border_type(BorderType::Rounded)
41+
.border_style(Style::default().fg(Color::Blue))
42+
.title("Variables"),
43+
);
3844
let mut list_state = ListState::default();
3945
list_state.select(Some(state.current_index));
4046
f.render_stateful_widget(list, chunks[0], &mut list_state);
4147
}
4248
Mode::Add => {
4349
let modal = Paragraph::new(vec![
44-
Line::from(Span::styled("Add New Variable", Style::default().fg(Color::Yellow).add_modifier(Modifier::BOLD))),
50+
Line::from(Span::styled(
51+
"Add New Variable",
52+
Style::default()
53+
.fg(Color::Yellow)
54+
.add_modifier(Modifier::BOLD),
55+
)),
4556
Line::from(format!("Key: {}", state.input_key)),
4657
Line::from(format!("Value: {}", state.input_value)),
4758
Line::from("Enter=confirm, Esc=cancel, Tab=switch field, ←/→ move cursor"),
@@ -77,7 +88,12 @@ pub fn render(state: &AppState, f: &mut Frame) {
7788
}
7889
Mode::Edit(key) => {
7990
let modal = Paragraph::new(vec![
80-
Line::from(Span::styled(format!("Editing: {}", key), Style::default().fg(Color::Yellow).add_modifier(Modifier::BOLD))),
91+
Line::from(Span::styled(
92+
format!("Editing: {}", key),
93+
Style::default()
94+
.fg(Color::Yellow)
95+
.add_modifier(Modifier::BOLD),
96+
)),
8197
Line::from(format!("New Value: {}", state.input_value)),
8298
Line::from("Enter=confirm, Esc=cancel, ←/→ move cursor"),
8399
])
@@ -99,7 +115,10 @@ pub fn render(state: &AppState, f: &mut Frame) {
99115
}
100116
Mode::Delete(key) => {
101117
let modal = Paragraph::new(vec![
102-
Line::from(Span::styled(format!("Delete: {}", key), Style::default().fg(Color::Red).add_modifier(Modifier::BOLD))),
118+
Line::from(Span::styled(
119+
format!("Delete: {}", key),
120+
Style::default().fg(Color::Red).add_modifier(Modifier::BOLD),
121+
)),
103122
Line::from("Confirm deletion? [y]es / [n]o"),
104123
])
105124
.block(

0 commit comments

Comments
 (0)