Skip to content

Commit 37996ef

Browse files
djberubedjberube
committed
style: format code with consistent spacing and line length
No functional changes.
1 parent a2c1336 commit 37996ef

3 files changed

Lines changed: 36 additions & 30 deletions

File tree

‎src/bin/dplw.rs‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ use std::{io, io::stdout, time::Duration};
2222

2323
use dprs::shared::config::Config;
2424
use dprs::shared::display::log_tabs::{render_log_tabs, LogTabs};
25-
use dprs::shared::docker::docker_log_watcher::DockerLogManager;
2625
use dprs::shared::display::log_view::{render_log_view, LogLevel, LogView};
26+
use dprs::shared::docker::docker_log_watcher::DockerLogManager;
2727

2828
fn main() -> Result<(), io::Error> {
2929
// Load configuration
@@ -37,7 +37,7 @@ fn main() -> Result<(), io::Error> {
3737

3838
let mut log_manager = DockerLogManager::new();
3939
log_manager.start_watching_all_containers()?;
40-
40+
4141
// Ensure cleanup happens even if there's a panic
4242
let result = std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| {
4343
run_app(&mut terminal, &mut log_manager, &config)
@@ -72,7 +72,7 @@ fn run_app<B: Backend>(
7272

7373
// Create log views for each container (one per container)
7474
let mut log_views: Vec<LogView> = Vec::new();
75-
75+
7676
// Create tabs for container selection
7777
let container_names: Vec<String> = (0..log_manager.watcher_count())
7878
.filter_map(|i| {
@@ -120,17 +120,17 @@ fn run_app<B: Backend>(
120120
// Update logs for current container if needed
121121
let current_log_view = &mut log_views[active_tab];
122122
let current_logs = watcher.get_logs();
123-
123+
124124
// Only update if we have a different number of logs
125125
if current_log_view.get_log_count() != current_logs.len() {
126126
// Preserve scroll position
127127
let scroll_pos = current_log_view.get_scroll_position();
128128
*current_log_view = LogView::new(1000);
129-
129+
130130
for log_line in current_logs {
131131
current_log_view.add_log(log_line, LogLevel::Info);
132132
}
133-
133+
134134
// Restore scroll position if it's still valid
135135
if scroll_pos < current_log_view.get_log_count() {
136136
current_log_view.set_scroll_position(scroll_pos);
@@ -196,42 +196,42 @@ fn run_app<B: Backend>(
196196
log_views[active_tab].scroll_up();
197197
}
198198
}
199-
},
199+
}
200200
KeyCode::Down => {
201201
if let Some(active_tab) = log_tabs.index.checked_sub(0) {
202202
if active_tab < log_views.len() {
203203
log_views[active_tab].scroll_down();
204204
}
205205
}
206-
},
206+
}
207207
KeyCode::Home => {
208208
if let Some(active_tab) = log_tabs.index.checked_sub(0) {
209209
if active_tab < log_views.len() {
210210
log_views[active_tab].scroll_to_top();
211211
}
212212
}
213-
},
213+
}
214214
KeyCode::End => {
215215
if let Some(active_tab) = log_tabs.index.checked_sub(0) {
216216
if active_tab < log_views.len() {
217217
log_views[active_tab].scroll_to_bottom();
218218
}
219219
}
220-
},
220+
}
221221
KeyCode::PageUp => {
222222
if let Some(active_tab) = log_tabs.index.checked_sub(0) {
223223
if active_tab < log_views.len() {
224224
log_views[active_tab].page_up(visible_height);
225225
}
226226
}
227-
},
227+
}
228228
KeyCode::PageDown => {
229229
if let Some(active_tab) = log_tabs.index.checked_sub(0) {
230230
if active_tab < log_views.len() {
231231
log_views[active_tab].page_down(visible_height);
232232
}
233233
}
234-
},
234+
}
235235
KeyCode::Char('r') => {
236236
log_manager.refresh()?;
237237
// Update tabs with new container names
@@ -243,7 +243,7 @@ fn run_app<B: Backend>(
243243
})
244244
.collect();
245245
log_tabs = LogTabs::new(container_names.clone());
246-
246+
247247
// Recreate log views for the new containers
248248
log_views.clear();
249249
for _ in 0..container_names.len() {

‎src/dprs/app/actions/copy_ip/tests.rs‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,7 @@ fn test_extract_first_ip_from_comma_separated() {
7979
extract_first_ip("192.168.1.100, 172.17.0.2"),
8080
"192.168.1.100"
8181
);
82-
assert_eq!(
83-
extract_first_ip("10.0.0.1, 10.0.0.2, 10.0.0.3"),
84-
"10.0.0.1"
85-
);
82+
assert_eq!(extract_first_ip("10.0.0.1, 10.0.0.2, 10.0.0.3"), "10.0.0.1");
8683
}
8784

8885
#[test]
@@ -97,10 +94,7 @@ fn test_extract_first_ip_from_space_separated() {
9794
#[test]
9895
fn test_extract_first_ip_from_concatenated() {
9996
// Test with concatenated IPs (no separator)
100-
assert_eq!(
101-
extract_first_ip("192.168.1.100172.17.0.2"),
102-
"192.168.1.100"
103-
);
97+
assert_eq!(extract_first_ip("192.168.1.100172.17.0.2"), "192.168.1.100");
10498
}
10599

106100
#[test]

‎src/shared/display/log_view.rs‎

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -146,12 +146,17 @@ fn parse_log_with_tailspin(message: &str, config: &Config) -> Vec<Line<'static>>
146146
match highlighted_message.as_ref().into_text() {
147147
Ok(text) => {
148148
// Convert borrowed spans to owned spans
149-
text.lines.into_iter().map(|line| {
150-
let owned_spans: Vec<Span<'static>> = line.spans.into_iter().map(|span| {
151-
Span::styled(span.content.into_owned(), span.style)
152-
}).collect();
153-
Line::from(owned_spans)
154-
}).collect()
149+
text.lines
150+
.into_iter()
151+
.map(|line| {
152+
let owned_spans: Vec<Span<'static>> = line
153+
.spans
154+
.into_iter()
155+
.map(|span| Span::styled(span.content.into_owned(), span.style))
156+
.collect();
157+
Line::from(owned_spans)
158+
})
159+
.collect()
155160
}
156161
Err(_) => {
157162
// Fallback to plain text if conversion fails
@@ -165,7 +170,12 @@ fn parse_log_with_tailspin(message: &str, config: &Config) -> Vec<Line<'static>>
165170
}
166171
}
167172

168-
pub fn render_log_view<B: Backend>(f: &mut Frame, log_view: &mut LogView, area: Rect, config: &Config) {
173+
pub fn render_log_view<B: Backend>(
174+
f: &mut Frame,
175+
log_view: &mut LogView,
176+
area: Rect,
177+
config: &Config,
178+
) {
169179
let logs = &log_view.logs;
170180
let now = Instant::now();
171181
let should_recolor = now.duration_since(log_view.last_recolor_time).as_millis() >= 100;
@@ -199,7 +209,8 @@ pub fn render_log_view<B: Backend>(f: &mut Frame, log_view: &mut LogView, area:
199209
cached_lines[0].clone()
200210
} else {
201211
// Flatten multiple lines into one
202-
let all_spans: Vec<Span> = cached_lines.iter()
212+
let all_spans: Vec<Span> = cached_lines
213+
.iter()
203214
.flat_map(|line| line.spans.clone())
204215
.collect();
205216
Line::from(all_spans)
@@ -235,7 +246,8 @@ pub fn render_log_view<B: Backend>(f: &mut Frame, log_view: &mut LogView, area:
235246
let line_to_measure = if let Some(Some(cached_lines)) = log_view.parsed_cache.get(idx) {
236247
if !cached_lines.is_empty() {
237248
// Calculate width from all spans
238-
cached_lines.iter()
249+
cached_lines
250+
.iter()
239251
.flat_map(|line| line.spans.iter())
240252
.map(|span| span.content.chars().count())
241253
.sum()

0 commit comments

Comments
 (0)