style: cargo fmt
Test and Coverage / Test (push) Successful in 22s
Check and Lint / Check (pull_request) Successful in 32s
Check and Lint / Rustfmt (pull_request) Successful in 17s
Check and Lint / Clippy (pull_request) Successful in 32s
Test and Coverage / Coverage (push) Successful in 3m22s
Test and Coverage / Test (pull_request) Successful in 24s
Test and Coverage / Coverage (pull_request) Successful in 32s
Check and Lint / Build RPM (pull_request) Failing after 1m46s
Test and Coverage / Test (push) Successful in 22s
Check and Lint / Check (pull_request) Successful in 32s
Check and Lint / Rustfmt (pull_request) Successful in 17s
Check and Lint / Clippy (pull_request) Successful in 32s
Test and Coverage / Coverage (push) Successful in 3m22s
Test and Coverage / Test (pull_request) Successful in 24s
Test and Coverage / Coverage (pull_request) Successful in 32s
Check and Lint / Build RPM (pull_request) Failing after 1m46s
This commit is contained in:
+10
-4
@@ -81,8 +81,8 @@ impl RawLauncherEntry {
|
||||
/// Parse a `defaults.json` document into a resolved [`Config`].
|
||||
pub fn load_config(json: &str) -> Result<Config> {
|
||||
let deserializer = &mut serde_json::Deserializer::from_str(json);
|
||||
let raw: RawConfig = serde_path_to_error::deserialize(deserializer)
|
||||
.context("failed to parse config JSON")?;
|
||||
let raw: RawConfig =
|
||||
serde_path_to_error::deserialize(deserializer).context("failed to parse config JSON")?;
|
||||
|
||||
let entries = raw
|
||||
.map
|
||||
@@ -134,7 +134,10 @@ mod tests {
|
||||
|
||||
let entry = &config.entries["x10sa"];
|
||||
assert_eq!(entry.python, PathBuf::from("/venvs/pxii/bin/python"));
|
||||
assert_eq!(entry.gui_file, PathBuf::from("/apps/aaredaq-pxii/custom/gui.py"));
|
||||
assert_eq!(
|
||||
entry.gui_file,
|
||||
PathBuf::from("/apps/aaredaq-pxii/custom/gui.py")
|
||||
);
|
||||
assert_eq!(
|
||||
entry.server_file,
|
||||
PathBuf::from("/apps/aaredaq-pxii/custom/server.py")
|
||||
@@ -147,7 +150,10 @@ mod tests {
|
||||
|
||||
let entry = &config.entries["x06da"];
|
||||
assert_eq!(entry.python, PathBuf::from("/venvs/pxiii/bin/python"));
|
||||
assert_eq!(entry.gui_file, PathBuf::from("/apps/aaredaq-pxiii/src/gui.py"));
|
||||
assert_eq!(
|
||||
entry.gui_file,
|
||||
PathBuf::from("/apps/aaredaq-pxiii/src/gui.py")
|
||||
);
|
||||
assert_eq!(
|
||||
entry.server_file,
|
||||
PathBuf::from("/apps/aaredaq-pxiii/src/server.py")
|
||||
|
||||
+5
-1
@@ -117,7 +117,11 @@ impl<'a> EntriesTab<'a> {
|
||||
let [list_area, detail_area] =
|
||||
Layout::horizontal([Constraint::Percentage(30), Constraint::Min(0)]).areas(area);
|
||||
|
||||
let items: Vec<ListItem> = self.keys.iter().map(|k| ListItem::new(k.as_str())).collect();
|
||||
let items: Vec<ListItem> = self
|
||||
.keys
|
||||
.iter()
|
||||
.map(|k| ListItem::new(k.as_str()))
|
||||
.collect();
|
||||
let list = List::new(items)
|
||||
.block(Block::default().borders(Borders::ALL).title("Entries"))
|
||||
.highlight_style(Style::default().add_modifier(Modifier::BOLD | Modifier::REVERSED))
|
||||
|
||||
+2
-6
@@ -50,10 +50,7 @@ pub fn run(config: &Config) -> Result<Option<(PathBuf, PathBuf)>> {
|
||||
result
|
||||
}
|
||||
|
||||
fn run_app(
|
||||
terminal: &mut DefaultTerminal,
|
||||
config: &Config,
|
||||
) -> Result<Option<(PathBuf, PathBuf)>> {
|
||||
fn run_app(terminal: &mut DefaultTerminal, config: &Config) -> Result<Option<(PathBuf, PathBuf)>> {
|
||||
let mut app = App::new(config);
|
||||
|
||||
loop {
|
||||
@@ -129,8 +126,7 @@ fn draw(frame: &mut Frame, app: &mut App) {
|
||||
_ => app.custom.draw(frame, content_area),
|
||||
}
|
||||
|
||||
let footer = Paragraph::new(help_text(app))
|
||||
.style(Style::default().add_modifier(Modifier::DIM));
|
||||
let footer = Paragraph::new(help_text(app)).style(Style::default().add_modifier(Modifier::DIM));
|
||||
frame.render_widget(footer, footer_area);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user