fix: validate CSV before logger startup
Rust CI tiny-wb passed CI.
Gitea/tiny-wb/pipeline/head This commit looks good Details

This commit is contained in:
Dandaedre 2026-10-07 16:48:26 +02:00
parent 96b4bfb13a
commit 8a0e7bd9b1
4 changed files with 33 additions and 24 deletions

View File

@ -84,7 +84,8 @@ boundary can grow into a tabbed collection without coupling CSV parsing or
acquisition to Ratatui. acquisition to Ratatui.
The terminal guard restores terminal modes on ordinary returns and unwinding. The terminal guard restores terminal modes on ordinary returns and unwinding.
Configuration, logging and enumeration errors occur before terminal takeover. Configuration and direct-view CSV errors occur before logger initialization;
logging and enumeration errors occur before terminal takeover.
Process termination or release-mode panic abort cannot be recovered by a guard. Process termination or release-mode panic abort cannot be recovered by a guard.
## Acquisition and protocol boundary ## Acquisition and protocol boundary

View File

@ -162,7 +162,7 @@ frequency-label convention explicitly after reviewing the
[frequency assignment notes](usb-protocol.md#frequency-assignment). [frequency assignment notes](usb-protocol.md#frequency-assignment).
The direct renderer accepts this header or headerless files, ignores blank The direct renderer accepts this header or headerless files, ignores blank
lines, and reports malformed, non-finite, empty, or decreasing-frequency data lines, and reports malformed, non-finite, empty, or decreasing-frequency data
with its CSV line number before taking over the terminal. with its CSV line number before initializing logging or taking over the terminal.
### Logs ### Logs

View File

@ -59,6 +59,25 @@ fn main() -> Result<(), AppError> {
eprintln!("Cannot load {}: {error}", config_path.display()); eprintln!("Cannot load {}: {error}", config_path.display());
error error
})?; })?;
let loaded_plot = if let StartMode::View(path) = &mode {
let file = File::open(path).map_err(|source| AppError::Csv {
path: path.clone(),
source,
})?;
let samples =
tiny_wb::export::read_csv(BufReader::new(file)).map_err(|source| AppError::Csv {
path: path.clone(),
source,
})?;
Some(
samples
.into_iter()
.map(|sample| (sample.frequency_mhz, sample.level_dbm))
.collect(),
)
} else {
None
};
let _logger = Logger::try_with_str(&config.logging.filter)? let _logger = Logger::try_with_str(&config.logging.filter)?
.log_to_file(FileSpec::default().directory(&config.logging.directory)) .log_to_file(FileSpec::default().directory(&config.logging.directory))
.write_mode(WriteMode::BufferAndFlush) .write_mode(WriteMode::BufferAndFlush)
@ -74,26 +93,11 @@ fn main() -> Result<(), AppError> {
}; };
ui::App::new(ports, config, config_path) ui::App::new(ports, config, config_path)
} }
StartMode::View(path) => { StartMode::View(path) => ui::App::viewer(
let file = File::open(&path).map_err(|source| AppError::Csv { config,
path: path.clone(), path,
source, loaded_plot.expect("viewer data was loaded for view mode"),
})?; ),
let samples = tiny_wb::export::read_csv(BufReader::new(file)).map_err(|source| {
AppError::Csv {
path: path.clone(),
source,
}
})?;
ui::App::viewer(
config,
path,
samples
.into_iter()
.map(|sample| (sample.frequency_mhz, sample.level_dbm))
.collect(),
)
}
StartMode::Help => unreachable!("help returned before configuration loading"), StartMode::Help => unreachable!("help returned before configuration loading"),
}; };
let _session = TerminalSession; let _session = TerminalSession;

View File

@ -29,16 +29,20 @@ fn malformed_csv_exits_without_entering_the_terminal_or_enumerating_ports() {
fs::create_dir_all(&directory).unwrap(); fs::create_dir_all(&directory).unwrap();
let path = directory.join("broken.csv"); let path = directory.join("broken.csv");
fs::write(&path, "frequency_MHz,level_dBm\n240,not-a-level\n").unwrap(); fs::write(&path, "frequency_MHz,level_dBm\n240,not-a-level\n").unwrap();
let config_path = directory.join("viewer.toml");
fs::write(&config_path, "[logging]\ndirectory = 'not-a-directory'\n").unwrap();
fs::write(directory.join("not-a-directory"), "ordinary file").unwrap();
let result = Command::new(env!("CARGO_BIN_EXE_tiny-wb")) let result = Command::new(env!("CARGO_BIN_EXE_tiny-wb"))
.current_dir(&directory) .current_dir(&directory)
.env("TINY_WB_CONFIG", config_path)
.arg("--view") .arg("--view")
.arg(&path) .arg(&path)
.output() .output()
.unwrap(); .unwrap();
assert!(!result.status.success()); assert!(!result.status.success());
let error = String::from_utf8_lossy(&result.stderr); let error = String::from_utf8_lossy(&result.stderr);
assert!(error.contains("broken.csv")); assert!(error.contains("broken.csv"), "unexpected stderr: {error}");
assert!(error.contains("line 2")); assert!(error.contains("line 2"), "unexpected stderr: {error}");
assert!(!result.stdout.windows(2).any(|bytes| bytes == b"\x1b[")); assert!(!result.stdout.windows(2).any(|bytes| bytes == b"\x1b["));
fs::remove_dir_all(directory).unwrap(); fs::remove_dir_all(directory).unwrap();
} }