Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature attach options #718

Merged
merged 2 commits into from
Sep 13, 2021
Merged

Feature attach options #718

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5c975f
Add `options` subcommand to `attach`
a-kenji Sep 12, 2021
6567f7b
Merge branch 'main' of https://github.com/zellij-org/zellij into feat…
a-kenji Sep 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use std::process;
use zellij_client::{os_input_output::get_client_os_input, start_client, ClientInfo};
use zellij_server::{os_input_output::get_server_os_input, start_server};
use zellij_utils::{
cli::{CliArgs, Command, Sessions},
cli::{CliArgs, Command, SessionCommand, Sessions},
consts::{ZELLIJ_TMP_DIR, ZELLIJ_TMP_LOG_DIR},
logging::*,
setup::{get_default_data_dir, Setup},
Expand Down Expand Up @@ -54,6 +54,7 @@ pub fn main() {
if let Some(Command::Sessions(Sessions::Attach {
mut session_name,
force,
options,
})) = opts.command.clone()
{
if let Some(session) = session_name.as_ref() {
Expand All @@ -62,10 +63,16 @@ pub fn main() {
session_name = Some(get_active_session());
}

let config_options = match options {
Some(SessionCommand::Options(o)) => config_options.merge(o),
None => config_options,
};

start_client(
Box::new(os_input),
opts,
config,
config_options.clone(),
ClientInfo::Attach(session_name.unwrap(), force, config_options),
None,
);
Expand All @@ -85,6 +92,7 @@ pub fn main() {
Box::new(os_input),
opts,
config,
config_options,
ClientInfo::New(session_name),
layout,
);
Expand Down
2 changes: 1 addition & 1 deletion zellij-client/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ pub fn start_client(
mut os_input: Box<dyn ClientOsApi>,
opts: CliArgs,
config: Config,
config_options: Options,
info: ClientInfo,
layout: Option<LayoutFromYaml>,
) {
Expand All @@ -105,7 +106,6 @@ pub fn start_client(
.unwrap();
std::env::set_var(&"ZELLIJ", "0");

let config_options = Options::from_cli(&config.options, opts.command.clone());
let palette = config.themes.clone().map_or_else(
|| os_input.load_palette(),
|t| {
Expand Down
10 changes: 10 additions & 0 deletions zellij-utils/src/cli.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,13 @@ pub enum Command {
Sessions(Sessions),
}

#[derive(Debug, StructOpt, Clone, Serialize, Deserialize)]
pub enum SessionCommand {
/// Change the behaviour of zellij
#[structopt(name = "options")]
Options(Options),
}

#[derive(Debug, StructOpt, Clone, Serialize, Deserialize)]
pub enum Sessions {
/// List active sessions
Expand All @@ -78,5 +85,8 @@ pub enum Sessions {
/// zellij client (if any) and attach to this.
#[structopt(long, short)]
force: bool,
/// Change the behaviour of zellij
#[structopt(subcommand, name = "options")]
options: Option<SessionCommand>,
},
}