Skip to content

Commit

Permalink
Merge pull request #623 from a-kenji/feature/dump-layout
Browse files Browse the repository at this point in the history
Add cmd to dump `layout` to stdout
  • Loading branch information
a-kenji authored Jul 22, 2021
2 parents d74a1bd + 903cb68 commit e2d086d
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 3 deletions.
10 changes: 8 additions & 2 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,14 @@ pub fn main() {
let config_options = Options::from_cli(&config.options, opts.command.clone());

if let Some(Command::Setup(ref setup)) = opts.command {
Setup::from_cli(setup, &opts, &config_options).expect("Failed to print to stdout");
}
Setup::from_cli(setup, &opts, &config_options).map_or_else(
|e| {
eprintln!("{:?}", e);
process::exit(1);
},
|_| {},
);
};

atomic_create_dir(&*ZELLIJ_TMP_DIR).unwrap();
atomic_create_dir(&*ZELLIJ_TMP_LOG_DIR).unwrap();
Expand Down
22 changes: 21 additions & 1 deletion zellij-utils/src/setup.rs
Original file line number Diff line number Diff line change
Expand Up @@ -96,13 +96,25 @@ pub const STRIDER_LAYOUT: &[u8] = include_bytes!(concat!(
pub const NO_STATUS_LAYOUT: &[u8] = include_bytes!(concat!(
env!("CARGO_MANIFEST_DIR"),
"/",
"assets/layouts/default.yaml"
"assets/layouts/disable-status-bar.yaml"
));

pub fn dump_default_config() -> std::io::Result<()> {
dump_asset(DEFAULT_CONFIG)
}

pub fn dump_specified_layout(layout: &str) -> std::io::Result<()> {
match layout {
"strider" => dump_asset(STRIDER_LAYOUT),
"default" => dump_asset(DEFAULT_LAYOUT),
"disable-status" => dump_asset(NO_STATUS_LAYOUT),
not_found => Err(std::io::Error::new(
std::io::ErrorKind::Other,
format!("Layout: {} not found", not_found),
)),
}
}

#[derive(Debug, Default, Clone, StructOpt, Serialize, Deserialize)]
pub struct Setup {
/// Dump the default configuration file to stdout
Expand All @@ -117,6 +129,9 @@ pub struct Setup {
#[structopt(long)]
pub check: bool,

/// Dump the specified layout file to stdout
#[structopt(long)]
pub dump_layout: Option<String>,
/// Generates completion for the specified shell
#[structopt(long)]
pub generate_completion: Option<String>,
Expand Down Expand Up @@ -144,6 +159,11 @@ impl Setup {
std::process::exit(0);
}

if let Some(layout) = &self.dump_layout {
dump_specified_layout(layout)?;
std::process::exit(0);
}

Ok(())
}

Expand Down

0 comments on commit e2d086d

Please sign in to comment.